diff --git a/src/platform/win/OpenLara.vcxproj b/src/platform/win/OpenLara.vcxproj
index 77edb68f..d70ea621 100644
--- a/src/platform/win/OpenLara.vcxproj
+++ b/src/platform/win/OpenLara.vcxproj
@@ -200,17 +200,17 @@
     <ClInclude Include="..\..\controller.h" />
     <ClInclude Include="..\..\core.h" />
     <ClInclude Include="..\..\format.h" />
-    <ClInclude Include="..\..\gapi_c3d.h" />
-    <ClInclude Include="..\..\gapi_d3d9.h" />
-    <ClInclude Include="..\..\gapi_gl.h" />
-    <ClInclude Include="..\..\gapi_gu.h" />
-    <ClInclude Include="..\..\gapi_gxm.h" />
-    <ClInclude Include="..\..\gapi_vk.h" />
     <ClInclude Include="..\..\debug.h" />
     <ClInclude Include="..\..\enemy.h" />
     <ClInclude Include="..\..\frustum.h" />
     <ClInclude Include="..\..\game.h" />
     <ClInclude Include="..\..\gameflow.h" />
+    <ClInclude Include="..\..\gapi\c3d.h" />
+    <ClInclude Include="..\..\gapi\d3d9.h" />
+    <ClInclude Include="..\..\gapi\gl.h" />
+    <ClInclude Include="..\..\gapi\gu.h" />
+    <ClInclude Include="..\..\gapi\gxm.h" />
+    <ClInclude Include="..\..\gapi\vk.h" />
     <ClInclude Include="..\..\lang.h" />
     <ClInclude Include="..\..\lang\de.h" />
     <ClInclude Include="..\..\lang\en.h" />
@@ -239,7 +239,7 @@
     <ClInclude Include="..\..\sound.h" />
     <ClInclude Include="..\..\sprite.h" />
     <ClInclude Include="..\..\texture.h" />
-    <ClInclude Include="..\..\trigger.h" />
+    <ClInclude Include="..\..\objects.h" />
     <ClInclude Include="..\..\utils.h" />
     <ClInclude Include="..\..\ui.h" />
     <ClInclude Include="..\..\video.h" />
diff --git a/src/platform/win/OpenLara.vcxproj.filters b/src/platform/win/OpenLara.vcxproj.filters
index 4a39c862..c187e877 100644
--- a/src/platform/win/OpenLara.vcxproj.filters
+++ b/src/platform/win/OpenLara.vcxproj.filters
@@ -35,12 +35,7 @@
     <ClInclude Include="..\..\sprite.h" />
     <ClInclude Include="..\..\texture.h" />
     <ClInclude Include="..\..\format.h" />
-    <ClInclude Include="..\..\trigger.h" />
     <ClInclude Include="..\..\utils.h" />
-    <ClInclude Include="..\..\gapi_gl.h" />
-    <ClInclude Include="..\..\gapi_gu.h" />
-    <ClInclude Include="..\..\gapi_vk.h" />
-    <ClInclude Include="..\..\gapi_d3d9.h" />
     <ClInclude Include="..\..\libs\minimp3\minimp3.h">
       <Filter>libs\minimp3</Filter>
     </ClInclude>
@@ -56,7 +51,6 @@
     <ClInclude Include="..\..\network.h" />
     <ClInclude Include="..\..\napi_socket.h" />
     <ClInclude Include="..\..\napi_dummy.h" />
-    <ClInclude Include="..\..\gapi_gxm.h" />
     <ClInclude Include="..\..\lang.h" />
     <ClInclude Include="..\..\lang\es.h">
       <Filter>lang</Filter>
@@ -91,7 +85,25 @@
     <ClInclude Include="..\..\lang\glyph_jap.h">
       <Filter>lang</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gapi_c3d.h" />
+    <ClInclude Include="..\..\objects.h" />
+    <ClInclude Include="..\..\gapi\c3d.h">
+      <Filter>gapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gapi\d3d9.h">
+      <Filter>gapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gapi\gl.h">
+      <Filter>gapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gapi\gu.h">
+      <Filter>gapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gapi\gxm.h">
+      <Filter>gapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gapi\vk.h">
+      <Filter>gapi</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\shaders\filter.glsl">
@@ -135,6 +147,9 @@
     <Filter Include="lang">
       <UniqueIdentifier>{2aaeadd4-47e5-4826-a82a-3adc5ff45978}</UniqueIdentifier>
     </Filter>
+    <Filter Include="gapi">
+      <UniqueIdentifier>{1cbd1ed7-2d29-45a4-b242-5b3ad71cc62e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="OpenLara.rc" />