diff --git a/Scripting/Scripting.vcxproj b/Scripting/Scripting.vcxproj
index f1ba60648..762b2f134 100644
--- a/Scripting/Scripting.vcxproj
+++ b/Scripting/Scripting.vcxproj
@@ -27,9 +27,12 @@
     <ClInclude Include="include\GameScriptColor.h" />
     <ClInclude Include="include\GameScriptInventoryObject.h" />
     <ClInclude Include="include\GameScriptMeshInfo.h" />
+    <ClInclude Include="include\GameScriptMirror.h" />
     <ClInclude Include="include\GameScriptNamedBase.h" />
     <ClInclude Include="include\GameScriptPosition.h" />
     <ClInclude Include="include\GameScriptRotation.h" />
+    <ClInclude Include="include\GameScriptSinkInfo.h" />
+    <ClInclude Include="include\GameScriptSkyLayer.h" />
     <ClInclude Include="include\ItemEnumPair.h" />
     <ClInclude Include="include\ScriptAssert.h" />
     <ClInclude Include="include\ScriptUtil.h" />
@@ -46,8 +49,11 @@
     <ClCompile Include="src\GameScriptColor.cpp" />
     <ClCompile Include="src\GameScriptInventoryObject.cpp" />
     <ClCompile Include="src\GameScriptMeshInfo.cpp" />
+    <ClCompile Include="src\GameScriptMirror.cpp" />
     <ClCompile Include="src\GameScriptPosition.cpp" />
     <ClCompile Include="src\GameScriptRotation.cpp" />
+    <ClCompile Include="src\GameScriptSinkInfo.cpp" />
+    <ClCompile Include="src\GameScriptSkyLayer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/Scripting/Scripting.vcxproj.filters b/Scripting/Scripting.vcxproj.filters
index af035c1e8..a05d42abd 100644
--- a/Scripting/Scripting.vcxproj.filters
+++ b/Scripting/Scripting.vcxproj.filters
@@ -57,6 +57,15 @@
     <ClInclude Include="include\GameScriptMeshInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\GameScriptSkyLayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\GameScriptSinkInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\GameScriptMirror.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="frameworkandsol.cpp">
@@ -86,6 +95,15 @@
     <ClCompile Include="src\GameScriptMeshInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\GameScriptSkyLayer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\GameScriptSinkInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\GameScriptMirror.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/TR5Main/Scripting/GameScriptMirror.h b/Scripting/include/GameScriptMirror.h
similarity index 100%
rename from TR5Main/Scripting/GameScriptMirror.h
rename to Scripting/include/GameScriptMirror.h
diff --git a/TR5Main/Scripting/GameScriptSinkInfo.h b/Scripting/include/GameScriptSinkInfo.h
similarity index 100%
rename from TR5Main/Scripting/GameScriptSinkInfo.h
rename to Scripting/include/GameScriptSinkInfo.h
diff --git a/TR5Main/Scripting/GameScriptSkyLayer.h b/Scripting/include/GameScriptSkyLayer.h
similarity index 100%
rename from TR5Main/Scripting/GameScriptSkyLayer.h
rename to Scripting/include/GameScriptSkyLayer.h
diff --git a/TR5Main/Scripting/GameScriptMirror.cpp b/Scripting/src/GameScriptMirror.cpp
similarity index 100%
rename from TR5Main/Scripting/GameScriptMirror.cpp
rename to Scripting/src/GameScriptMirror.cpp
diff --git a/TR5Main/Scripting/GameScriptSinkInfo.cpp b/Scripting/src/GameScriptSinkInfo.cpp
similarity index 100%
rename from TR5Main/Scripting/GameScriptSinkInfo.cpp
rename to Scripting/src/GameScriptSinkInfo.cpp
diff --git a/TR5Main/Scripting/GameScriptSkyLayer.cpp b/Scripting/src/GameScriptSkyLayer.cpp
similarity index 100%
rename from TR5Main/Scripting/GameScriptSkyLayer.cpp
rename to Scripting/src/GameScriptSkyLayer.cpp
diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj
index 213c9617b..de849d2bd 100644
--- a/TR5Main/TombEngine.vcxproj
+++ b/TR5Main/TombEngine.vcxproj
@@ -868,22 +868,10 @@ 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\GameScriptMirror.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-    </ClCompile>
     <ClCompile Include="Scripting\GameScriptSettings.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Scripting\GameScriptSinkInfo.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="Scripting\GameScriptSkyLayer.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-    </ClCompile>
     <ClCompile Include="Scripting\GameScriptSoundSourceInfo.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>