diff --git a/TR5Main/Game/control/box.h b/Common/Game/control/box.h
similarity index 100%
rename from TR5Main/Game/control/box.h
rename to Common/Game/control/box.h
diff --git a/TR5Main/Game/control/lot.h b/Common/Game/control/lot.h
similarity index 100%
rename from TR5Main/Game/control/lot.h
rename to Common/Game/control/lot.h
diff --git a/TR5Main/Specific/setup.h b/Common/Specific/setup.h
similarity index 100%
rename from TR5Main/Specific/setup.h
rename to Common/Specific/setup.h
diff --git a/Scripting/Scripting.vcxproj b/Scripting/Scripting.vcxproj
index 8a092b36f..8f5e863cb 100644
--- a/Scripting/Scripting.vcxproj
+++ b/Scripting/Scripting.vcxproj
@@ -46,6 +46,7 @@
     <ClInclude Include="include\Scripting\GameScriptColor.h" />
     <ClInclude Include="include\Scripting\GameScriptDisplayString.h" />
     <ClInclude Include="include\Scripting\GameScriptInventoryObject.h" />
+    <ClInclude Include="include\Scripting\GameScriptItemInfo.h" />
     <ClInclude Include="include\Scripting\GameScriptLevel.h" />
     <ClInclude Include="include\Scripting\GameScriptMeshInfo.h" />
     <ClInclude Include="include\Scripting\GameScriptMirror.h" />
@@ -78,6 +79,7 @@
     <ClCompile Include="src\GameScriptColor.cpp" />
     <ClCompile Include="src\GameScriptDisplayString.cpp" />
     <ClCompile Include="src\GameScriptInventoryObject.cpp" />
+    <ClCompile Include="src\GameScriptItemInfo.cpp" />
     <ClCompile Include="src\GameScriptLevel.cpp" />
     <ClCompile Include="src\GameScriptMeshInfo.cpp" />
     <ClCompile Include="src\GameScriptMirror.cpp" />
diff --git a/Scripting/Scripting.vcxproj.filters b/Scripting/Scripting.vcxproj.filters
index 4e46f8e35..41de53866 100644
--- a/Scripting/Scripting.vcxproj.filters
+++ b/Scripting/Scripting.vcxproj.filters
@@ -153,6 +153,9 @@
     <ClInclude Include="include\Scripting\ScriptUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Scripting\GameScriptItemInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="frameworkandsol.cpp">
@@ -203,6 +206,9 @@
     <ClCompile Include="src\GameScriptLevel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\GameScriptItemInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/TR5Main/Scripting/GameScriptItemInfo.h b/Scripting/include/Scripting/GameScriptItemInfo.h
similarity index 100%
rename from TR5Main/Scripting/GameScriptItemInfo.h
rename to Scripting/include/Scripting/GameScriptItemInfo.h
diff --git a/TR5Main/Scripting/GameScriptItemInfo.cpp b/Scripting/src/GameScriptItemInfo.cpp
similarity index 100%
rename from TR5Main/Scripting/GameScriptItemInfo.cpp
rename to Scripting/src/GameScriptItemInfo.cpp
diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj
index 12d108c40..e78f4e9af 100644
--- a/TR5Main/TombEngine.vcxproj
+++ b/TR5Main/TombEngine.vcxproj
@@ -242,7 +242,6 @@ CALL gen.bat</Command>
     <ClInclude Include="Objects\TR5\Entity\tr5_laserhead_info.h" />
     <ClInclude Include="Objects\TR5\Object\tr5_pushableblock_info.h" />
     <ClInclude Include="Objects\TR5\Switch\tr5_crowdove_switch.h" />
-    <ClInclude Include="Scripting\GameScriptItemInfo.h" />
     <ClInclude Include="Game\effects\smoke.h" />
     <ClInclude Include="Game\effects\spark.h" />
     <ClInclude Include="Objects\Generic\generic_objects.h" />
@@ -856,10 +855,6 @@ CALL gen.bat</Command>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Scripting\GameScriptItemInfo.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-    </ClCompile>
     <ClCompile Include="Scripting\GameLogicScript.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters
index 43ad19eed..ff27c8a17 100644
--- a/TR5Main/TombEngine.vcxproj.filters
+++ b/TR5Main/TombEngine.vcxproj.filters
@@ -285,7 +285,6 @@
     <ClCompile Include="Renderer\VertexBuffer\VertexBuffer.cpp" />
     <ClCompile Include="Objects\TR5\Object\tr5_expandingplatform.cpp" />
     <ClCompile Include="Scripting\GameFlowScript.cpp" />
-    <ClCompile Include="Scripting\GameScriptItemInfo.cpp" />
     <ClCompile Include="Scripting\GameLogicScript.cpp" />
     <ClCompile Include="Scripting\LuaHandler.cpp" />
     <ClCompile Include="Scripting\ScriptAssert.cpp" />
@@ -385,7 +384,6 @@
     <ClInclude Include="Objects\TR5\Entity\tr5_laserhead_info.h" />
     <ClInclude Include="Objects\TR5\Object\tr5_pushableblock_info.h" />
     <ClInclude Include="Objects\TR5\Switch\tr5_crowdove_switch.h" />
-    <ClInclude Include="Scripting\GameScriptItemInfo.h" />
     <ClInclude Include="Game\effects\smoke.h" />
     <ClInclude Include="Game\effects\spark.h" />
     <ClInclude Include="Objects\Generic\generic_objects.h" />