diff --git a/TR5Main/Game/lara.cpp b/TR5Main/Game/Lara/lara.cpp
similarity index 100%
rename from TR5Main/Game/lara.cpp
rename to TR5Main/Game/Lara/lara.cpp
diff --git a/TR5Main/Game/lara.h b/TR5Main/Game/Lara/lara.h
similarity index 100%
rename from TR5Main/Game/lara.h
rename to TR5Main/Game/Lara/lara.h
diff --git a/TR5Main/Game/lara1gun.cpp b/TR5Main/Game/Lara/lara1gun.cpp
similarity index 100%
rename from TR5Main/Game/lara1gun.cpp
rename to TR5Main/Game/Lara/lara1gun.cpp
diff --git a/TR5Main/Game/lara1gun.h b/TR5Main/Game/Lara/lara1gun.h
similarity index 100%
rename from TR5Main/Game/lara1gun.h
rename to TR5Main/Game/Lara/lara1gun.h
diff --git a/TR5Main/Game/lara2gun.cpp b/TR5Main/Game/Lara/lara2gun.cpp
similarity index 100%
rename from TR5Main/Game/lara2gun.cpp
rename to TR5Main/Game/Lara/lara2gun.cpp
diff --git a/TR5Main/Game/lara2gun.h b/TR5Main/Game/Lara/lara2gun.h
similarity index 100%
rename from TR5Main/Game/lara2gun.h
rename to TR5Main/Game/Lara/lara2gun.h
diff --git a/TR5Main/Game/lara_struct.h b/TR5Main/Game/Lara/lara_struct.h
similarity index 100%
rename from TR5Main/Game/lara_struct.h
rename to TR5Main/Game/Lara/lara_struct.h
diff --git a/TR5Main/Game/laraclmb.cpp b/TR5Main/Game/Lara/laraclmb.cpp
similarity index 100%
rename from TR5Main/Game/laraclmb.cpp
rename to TR5Main/Game/Lara/laraclmb.cpp
diff --git a/TR5Main/Game/laraclmb.h b/TR5Main/Game/Lara/laraclmb.h
similarity index 100%
rename from TR5Main/Game/laraclmb.h
rename to TR5Main/Game/Lara/laraclmb.h
diff --git a/TR5Main/Game/larafire.cpp b/TR5Main/Game/Lara/larafire.cpp
similarity index 100%
rename from TR5Main/Game/larafire.cpp
rename to TR5Main/Game/Lara/larafire.cpp
diff --git a/TR5Main/Game/larafire.h b/TR5Main/Game/Lara/larafire.h
similarity index 100%
rename from TR5Main/Game/larafire.h
rename to TR5Main/Game/Lara/larafire.h
diff --git a/TR5Main/Game/laraflar.cpp b/TR5Main/Game/Lara/laraflar.cpp
similarity index 100%
rename from TR5Main/Game/laraflar.cpp
rename to TR5Main/Game/Lara/laraflar.cpp
diff --git a/TR5Main/Game/laraflar.h b/TR5Main/Game/Lara/laraflar.h
similarity index 100%
rename from TR5Main/Game/laraflar.h
rename to TR5Main/Game/Lara/laraflar.h
diff --git a/TR5Main/Game/laramisc.cpp b/TR5Main/Game/Lara/laramisc.cpp
similarity index 100%
rename from TR5Main/Game/laramisc.cpp
rename to TR5Main/Game/Lara/laramisc.cpp
diff --git a/TR5Main/Game/laramisc.h b/TR5Main/Game/Lara/laramisc.h
similarity index 100%
rename from TR5Main/Game/laramisc.h
rename to TR5Main/Game/Lara/laramisc.h
diff --git a/TR5Main/Game/larasurf.cpp b/TR5Main/Game/Lara/larasurf.cpp
similarity index 100%
rename from TR5Main/Game/larasurf.cpp
rename to TR5Main/Game/Lara/larasurf.cpp
diff --git a/TR5Main/Game/larasurf.h b/TR5Main/Game/Lara/larasurf.h
similarity index 100%
rename from TR5Main/Game/larasurf.h
rename to TR5Main/Game/Lara/larasurf.h
diff --git a/TR5Main/Game/laraswim.cpp b/TR5Main/Game/Lara/laraswim.cpp
similarity index 100%
rename from TR5Main/Game/laraswim.cpp
rename to TR5Main/Game/Lara/laraswim.cpp
diff --git a/TR5Main/Game/laraswim.h b/TR5Main/Game/Lara/laraswim.h
similarity index 100%
rename from TR5Main/Game/laraswim.h
rename to TR5Main/Game/Lara/laraswim.h
diff --git a/TR5Main/TR5Main.vcxproj b/TR5Main/TR5Main.vcxproj
index 5a6689fa0..4906aeeba 100644
--- a/TR5Main/TR5Main.vcxproj
+++ b/TR5Main/TR5Main.vcxproj
@@ -135,7 +135,7 @@ xcopy /Y "$(ProjectDir)Scripting\Scripts\*.lua" "$(TargetDir)\Scripts"</Command>
     <ClInclude Include="Game\explosion.h" />
     <ClInclude Include="Game\footprint.h" />
     <ClInclude Include="Game\groundfx.h" />
-    <ClInclude Include="Game\lara_struct.h" />
+    <ClInclude Include="Game\Lara\lara_struct.h" />
     <ClInclude Include="Game\memory\linearPool.h" />
     <ClInclude Include="Game\memory\MemoryPoolAllocator.h" />
     <ClInclude Include="Game\memory\pool.h" />
@@ -363,15 +363,15 @@ xcopy /Y "$(ProjectDir)Scripting\Scripts\*.lua" "$(TargetDir)\Scripts"</Command>
     <ClInclude Include="Game\health.h" />
     <ClInclude Include="Game\inventory.h" />
     <ClInclude Include="Game\items.h" />
-    <ClInclude Include="Game\lara.h" />
-    <ClInclude Include="Game\lara1gun.h" />
-    <ClInclude Include="Game\lara2gun.h" />
-    <ClInclude Include="Game\laraclmb.h" />
-    <ClInclude Include="Game\larafire.h" />
-    <ClInclude Include="Game\laraflar.h" />
-    <ClInclude Include="Game\laramisc.h" />
-    <ClInclude Include="Game\larasurf.h" />
-    <ClInclude Include="Game\laraswim.h" />
+    <ClInclude Include="Game\Lara\lara.h" />
+    <ClInclude Include="Game\Lara\lara1gun.h" />
+    <ClInclude Include="Game\Lara\lara2gun.h" />
+    <ClInclude Include="Game\Lara\laraclmb.h" />
+    <ClInclude Include="Game\Lara\larafire.h" />
+    <ClInclude Include="Game\Lara\laraflar.h" />
+    <ClInclude Include="Game\Lara\laramisc.h" />
+    <ClInclude Include="Game\Lara\larasurf.h" />
+    <ClInclude Include="Game\Lara\laraswim.h" />
     <ClInclude Include="Game\lot.h" />
     <ClInclude Include="Game\misc.h" />
     <ClInclude Include="Game\missile.h" />
@@ -598,15 +598,15 @@ xcopy /Y "$(ProjectDir)Scripting\Scripts\*.lua" "$(TargetDir)\Scripts"</Command>
     <ClCompile Include="Game\health.cpp" />
     <ClCompile Include="Game\inventory.cpp" />
     <ClCompile Include="Game\items.cpp" />
-    <ClCompile Include="Game\lara.cpp" />
-    <ClCompile Include="Game\lara1gun.cpp" />
-    <ClCompile Include="Game\lara2gun.cpp" />
-    <ClCompile Include="Game\laraclmb.cpp" />
-    <ClCompile Include="Game\larafire.cpp" />
-    <ClCompile Include="Game\laraflar.cpp" />
-    <ClCompile Include="Game\laramisc.cpp" />
-    <ClCompile Include="Game\larasurf.cpp" />
-    <ClCompile Include="Game\laraswim.cpp" />
+    <ClCompile Include="Game\Lara\lara.cpp" />
+    <ClCompile Include="Game\Lara\lara1gun.cpp" />
+    <ClCompile Include="Game\Lara\lara2gun.cpp" />
+    <ClCompile Include="Game\Lara\laraclmb.cpp" />
+    <ClCompile Include="Game\Lara\larafire.cpp" />
+    <ClCompile Include="Game\Lara\laraflar.cpp" />
+    <ClCompile Include="Game\Lara\laramisc.cpp" />
+    <ClCompile Include="Game\Lara\larasurf.cpp" />
+    <ClCompile Include="Game\Lara\laraswim.cpp" />
     <ClCompile Include="Game\lot.cpp" />
     <ClCompile Include="Game\missile.cpp" />
     <ClCompile Include="Game\newinv2.cpp" />
diff --git a/TR5Main/TR5Main.vcxproj.filters b/TR5Main/TR5Main.vcxproj.filters
index d7d6ae475..512fb38ab 100644
--- a/TR5Main/TR5Main.vcxproj.filters
+++ b/TR5Main/TR5Main.vcxproj.filters
@@ -51,33 +51,6 @@
     <ClInclude Include="Game\items.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="Game\lara.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\lara1gun.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\lara2gun.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\laraclmb.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\larafire.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\laraflar.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\laramisc.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\larasurf.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
-    <ClInclude Include="Game\laraswim.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="Game\lot.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
@@ -693,9 +666,6 @@
     <ClInclude Include="Game\trmath.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="Game\lara_struct.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="Specific\newtypes.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
@@ -849,6 +819,36 @@
     <ClInclude Include="Game\debug\debug.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
+    <ClInclude Include="Game\Lara\lara.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\lara_struct.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\lara1gun.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\lara2gun.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\laraclmb.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\larafire.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\laraflar.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\laramisc.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\larasurf.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="Game\Lara\laraswim.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Game\box.cpp">
@@ -887,33 +887,6 @@
     <ClCompile Include="Game\items.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
-    <ClCompile Include="Game\lara.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\lara1gun.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\lara2gun.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\laraclmb.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\larafire.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\laraflar.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\laramisc.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\larasurf.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
-    <ClCompile Include="Game\laraswim.cpp">
-      <Filter>File di origine</Filter>
-    </ClCompile>
     <ClCompile Include="Game\lot.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
@@ -1547,6 +1520,33 @@
     <ClCompile Include="Game\memory\malloc.cpp">
       <Filter>File di origine</Filter>
     </ClCompile>
+    <ClCompile Include="Game\Lara\lara.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\lara1gun.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\lara2gun.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\laraclmb.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\larafire.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\laraflar.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\laramisc.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\larasurf.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
+    <ClCompile Include="Game\Lara\laraswim.cpp">
+      <Filter>File di origine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />