diff --git a/Scripting/Scripting.vcxproj b/Scripting/Scripting.vcxproj
index df10bf395..619b8e0c2 100644
--- a/Scripting/Scripting.vcxproj
+++ b/Scripting/Scripting.vcxproj
@@ -77,6 +77,7 @@
     <ClInclude Include="include\ScriptInterfaceLevel.h" />
     <ClInclude Include="include\ScriptUtil.h" />
     <ClInclude Include="src\AudioTracks.h" />
+    <ClInclude Include="src\Entity\Static\GameScriptMeshInfo.h" />
     <ClInclude Include="src\GameFlowScript.h" />
     <ClInclude Include="src\GameLogicScript.h" />
     <ClInclude Include="src\GameScriptAIObject.h" />
@@ -89,7 +90,6 @@
     <ClInclude Include="src\GameScriptInventoryObject.h" />
     <ClInclude Include="src\GameScriptItemInfo.h" />
     <ClInclude Include="src\GameScriptLevel.h" />
-    <ClInclude Include="src\GameScriptMeshInfo.h" />
     <ClInclude Include="src\GameScriptMirror.h" />
     <ClInclude Include="src\GameScriptNamedBase.h" />
     <ClInclude Include="src\GameScriptPosition.h" />
@@ -113,6 +113,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="src\Entity\Static\GameScriptMeshInfo.cpp" />
     <ClCompile Include="src\GameFlowScript.cpp" />
     <ClCompile Include="src\ScriptInterfaceState.cpp" />
     <ClCompile Include="src\GameLogicScript.cpp" />
@@ -126,7 +127,6 @@
     <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" />
     <ClCompile Include="src\GameScriptPosition.cpp" />
     <ClCompile Include="src\GameScriptRotation.cpp" />
@@ -218,7 +218,7 @@
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>frameworkandsol.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)Common;$(SolutionDir)Common\Game;$(SolutionDir)Common\Game\pickup;$(SolutionDir)Common\Scripting;$(SolutionDir)Scripting;$(SolutionDir)Scripting\include;$(SolutionDir)Scripting\include\Scripting</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Common;$(SolutionDir)Common\Game;$(SolutionDir)Common\Game\pickup;$(SolutionDir)Common\Scripting;$(SolutionDir)Scripting;$(SolutionDir)Scripting\include;$(SolutionDir)Scripting\include\Scripting;$(SolutionDir)Scripting\src</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -240,7 +240,7 @@
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>frameworkandsol.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)Common;$(SolutionDir)Common\Game;$(SolutionDir)Common\Game\pickup;$(SolutionDir)Common\Scripting;$(SolutionDir)Scripting;$(SolutionDir)Scripting\include;$(SolutionDir)Scripting\include\Scripting</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Common;$(SolutionDir)Common\Game;$(SolutionDir)Common\Game\pickup;$(SolutionDir)Common\Scripting;$(SolutionDir)Scripting;$(SolutionDir)Scripting\include;$(SolutionDir)Scripting\include\Scripting;$(SolutionDir)Scripting\src</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -300,4 +300,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.XAudio2.Redist.1.2.8\build\native\Microsoft.XAudio2.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.XAudio2.Redist.1.2.8\build\native\Microsoft.XAudio2.Redist.targets'))" />
     <Error Condition="!Exists('..\packages\directxtk_desktop_2017.2021.11.8.1\build\native\directxtk_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2017.2021.11.8.1\build\native\directxtk_desktop_2017.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Scripting/Scripting.vcxproj.filters b/Scripting/Scripting.vcxproj.filters
index 2af3dba9b..4c3442a1a 100644
--- a/Scripting/Scripting.vcxproj.filters
+++ b/Scripting/Scripting.vcxproj.filters
@@ -225,9 +225,6 @@
     <ClInclude Include="src\GameScriptLevel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\GameScriptMeshInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\GameScriptMirror.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -276,6 +273,9 @@
     <ClInclude Include="src\ScriptUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\Entity\Static\GameScriptMeshInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="frameworkandsol.cpp">
@@ -302,9 +302,6 @@
     <ClCompile Include="src\GameScriptAudioTrack.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\GameScriptMeshInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\GameScriptSkyLayer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -350,8 +347,11 @@
     <ClCompile Include="src\ScriptInterfaceState.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Entity\Static\GameScriptMeshInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Scripting/src/GameScriptMeshInfo.cpp b/Scripting/src/Entity/Static/GameScriptMeshInfo.cpp
similarity index 100%
rename from Scripting/src/GameScriptMeshInfo.cpp
rename to Scripting/src/Entity/Static/GameScriptMeshInfo.cpp
diff --git a/Scripting/src/GameScriptMeshInfo.h b/Scripting/src/Entity/Static/GameScriptMeshInfo.h
similarity index 100%
rename from Scripting/src/GameScriptMeshInfo.h
rename to Scripting/src/Entity/Static/GameScriptMeshInfo.h
diff --git a/Scripting/src/GameLogicScript.h b/Scripting/src/GameLogicScript.h
index 411523609..676500318 100644
--- a/Scripting/src/GameLogicScript.h
+++ b/Scripting/src/GameLogicScript.h
@@ -9,7 +9,7 @@
 #include "GameScriptPosition.h"
 #include "GameScriptRotation.h"
 #include "GameScriptItemInfo.h"
-#include "GameScriptMeshInfo.h"
+#include "Entity/Static/GameScriptMeshInfo.h"
 #include "GameScriptSinkInfo.h"
 #include "GameScriptAIObject.h"
 #include "GameScriptSoundSourceInfo.h"