# HG changeset patch
# User zipi
# Date 1408304096 -3600
# Node ID 5a6cd79069aeb9d467867225c9a4d792bbcf42d2
# Parent  b054ea5daf45291e4c87abd138e2ff7f0e08a550
project and filter

diff -r b054ea5daf45 -r 5a6cd79069ae Build/Visual Studio 2012/World of Might and Magic.vcxproj
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Sun Aug 17 20:23:06 2014 +0100
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Sun Aug 17 20:34:56 2014 +0100
@@ -104,6 +104,7 @@
     <ClCompile Include="..\..\DecorationList.cpp" />
     <ClCompile Include="..\..\DirectX11.cpp" />
     <ClCompile Include="..\..\Events.cpp" />
+    <ClCompile Include="..\..\FactionTable.cpp" />
     <ClCompile Include="..\..\FrameTableInc.cpp" />
     <ClCompile Include="..\..\Game.cpp" />
     <ClCompile Include="..\..\GammaControl.cpp" />
@@ -186,11 +187,6 @@
     <ClCompile Include="..\..\MapInfo.cpp" />
     <ClCompile Include="..\..\MediaPlayer.cpp" />
     <ClCompile Include="..\..\mm7text_ru.cpp" />
-    <ClCompile Include="..\..\mm7_2.cpp" />
-    <ClCompile Include="..\..\mm7_3.cpp" />
-    <ClCompile Include="..\..\mm7_4.cpp" />
-    <ClCompile Include="..\..\mm7_5.cpp" />
-    <ClCompile Include="..\..\mm7_6.cpp" />
     <ClCompile Include="..\..\mm7_7.cpp" />
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\MMT.cpp" />
@@ -209,6 +205,7 @@
     <ClCompile Include="..\..\ParticleEngine.cpp" />
     <ClCompile Include="..\..\Party.cpp" />
     <ClCompile Include="..\..\Player.cpp" />
+    <ClCompile Include="..\..\PlayerFrameTable.cpp" />
     <ClCompile Include="..\..\Random.cpp" />
     <ClCompile Include="..\..\Registry.cpp" />
     <ClCompile Include="..\..\Render.cpp" />
@@ -219,6 +216,7 @@
     <ClCompile Include="..\..\Sprites.cpp" />
     <ClCompile Include="..\..\StorylineTextTable.cpp" />
     <ClCompile Include="..\..\stru10.cpp" />
+    <ClCompile Include="..\..\stru298.cpp" />
     <ClCompile Include="..\..\stru6.cpp" />
     <ClCompile Include="..\..\stru9.cpp" />
     <ClCompile Include="..\..\texts.cpp" />
@@ -280,7 +278,6 @@
     <ClInclude Include="..\..\IconFrameTable.h" />
     <ClInclude Include="..\..\Indoor.h" />
     <ClInclude Include="..\..\IndoorCameraD3D.h" />
-    <ClInclude Include="..\..\Indoor_stuff.h" />
     <ClInclude Include="..\..\IRender.h" />
     <ClInclude Include="..\..\Items.h" />
     <ClInclude Include="..\..\Keyboard.h" />
@@ -432,10 +429,10 @@
     <ClInclude Include="..\..\Log.h" />
     <ClInclude Include="..\..\LuaVM.h" />
     <ClInclude Include="..\..\MapInfo.h" />
+    <ClInclude Include="..\..\MapsLongTimer.h" />
     <ClInclude Include="..\..\MediaPlayer.h" />
     <ClInclude Include="..\..\MM7.h" />
     <ClInclude Include="..\..\mm7_data.h" />
-    <ClInclude Include="..\..\mm7_unsorted_subs.h" />
     <ClInclude Include="..\..\MMT.h" />
     <ClInclude Include="..\..\Monsters.h" />
     <ClInclude Include="..\..\Mouse.h" />
@@ -450,7 +447,6 @@
     <ClInclude Include="..\..\OSWindow.h" />
     <ClInclude Include="..\..\OurMath.h" />
     <ClInclude Include="..\..\Outdoor.h" />
-    <ClInclude Include="..\..\Outdoor_stuff.h" />
     <ClInclude Include="..\..\Overlays.h" />
     <ClInclude Include="..\..\PaletteManager.h" />
     <ClInclude Include="..\..\ParticleEngine.h" />
@@ -462,6 +458,7 @@
     <ClInclude Include="..\..\Render.h" />
     <ClInclude Include="..\..\RenderD3D11.h" />
     <ClInclude Include="..\..\RenderStruct.h" />
+    <ClInclude Include="..\..\resource.h" />
     <ClInclude Include="..\..\SaveLoad.h" />
     <ClInclude Include="..\..\Spells.h" />
     <ClInclude Include="..\..\SpriteObject.h" />
@@ -471,14 +468,12 @@
     <ClInclude Include="..\..\stru123.h" />
     <ClInclude Include="..\..\stru159.h" />
     <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\MapsLongTimer.h" />
     <ClInclude Include="..\..\stru298.h" />
     <ClInclude Include="..\..\stru314.h" />
     <ClInclude Include="..\..\stru367.h" />
     <ClInclude Include="..\..\stru6.h" />
     <ClInclude Include="..\..\stru9.h" />
     <ClInclude Include="..\..\stuff.h" />
-    <ClInclude Include="..\..\TestClass.h" />
     <ClInclude Include="..\..\texts.h" />
     <ClInclude Include="..\..\Texture.h" />
     <ClInclude Include="..\..\TileFrameTable.h" />
diff -r b054ea5daf45 -r 5a6cd79069ae Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Sun Aug 17 20:23:06 2014 +0100
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Sun Aug 17 20:34:56 2014 +0100
@@ -4,9 +4,6 @@
     <Filter Include="lib">
       <UniqueIdentifier>{01df770d-32ca-4bfa-8448-de7b6ae4b15c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Level">
-      <UniqueIdentifier>{e6df15ec-967c-40ca-b954-c78fe66daed1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="lib\legacy_dx">
       <UniqueIdentifier>{23711e0a-ee63-4da3-9c0d-22d02dd41747}</UniqueIdentifier>
     </Filter>
@@ -19,18 +16,6 @@
     <Filter Include="lib\lua\lua-5.2.2">
       <UniqueIdentifier>{501083c0-a7b6-445f-a8fb-fa12cd345924}</UniqueIdentifier>
     </Filter>
-    <Filter Include="UI">
-      <UniqueIdentifier>{6fea8cb0-1887-4477-a64d-16e64b5de807}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NewUI">
-      <UniqueIdentifier>{8f45576f-cc60-4d3a-837e-deb373a67f8a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NewUI\Core">
-      <UniqueIdentifier>{d61aec30-ad58-4a9f-8f0a-e129f1947429}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UI\Books">
-      <UniqueIdentifier>{c0b8b696-9a12-4b22-b8c1-0262d7fbb306}</UniqueIdentifier>
-    </Filter>
     <Filter Include="lib\swig">
       <UniqueIdentifier>{8fcbd31e-9742-48b4-87bf-e632eac8106d}</UniqueIdentifier>
     </Filter>
@@ -67,82 +52,59 @@
     <Filter Include="lib\libpng">
       <UniqueIdentifier>{a768f30d-81a0-4858-a264-dd7120e64106}</UniqueIdentifier>
     </Filter>
-    <Filter Include="lib\legacy_dx\lib">
-      <UniqueIdentifier>{3ac65d22-cae8-44c1-883f-59679a50f2f6}</UniqueIdentifier>
+    <Filter Include="Arcomage">
+      <UniqueIdentifier>{2cf3b968-ac0f-4f3f-ab51-8e340423e5ae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine">
+      <UniqueIdentifier>{5a27c7b7-d75e-4c98-bf2e-0e7c0a45c3dc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IO">
+      <UniqueIdentifier>{94db387b-d373-4c79-bd98-6c481311f6fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Media">
+      <UniqueIdentifier>{d835447a-1d18-4222-8602-f64255a8a5e6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Media\Audio">
+      <UniqueIdentifier>{a6cca40d-7b3a-479d-85ed-3b588f7ac28d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Media\Video">
+      <UniqueIdentifier>{d560cdfc-2d5b-4419-adaf-f569bff0ed4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\Graphics">
+      <UniqueIdentifier>{5aa47db6-59dc-455b-80d7-10b2a6424759}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\Objects">
+      <UniqueIdentifier>{b6545db5-c854-4c4d-8fe3-0a38cee6d0c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\Spells">
+      <UniqueIdentifier>{1d160ebc-6c28-41d8-97fd-567240205b53}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\Tables">
+      <UniqueIdentifier>{4f4916f8-1801-4aa8-93dd-dcf210ee1119}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\TurnEngine">
+      <UniqueIdentifier>{b3a485b4-447f-438c-900e-7669bba0c0a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Engine\Graphics\Level">
+      <UniqueIdentifier>{99b7962c-8e2d-4cfc-b2f8-a27131e4fc36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI">
+      <UniqueIdentifier>{77818892-a5fa-411b-b899-d6139c8454d5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\UI">
+      <UniqueIdentifier>{a87cf473-9ff4-4280-b388-230b3a6971f1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\UI\Books">
+      <UniqueIdentifier>{a80dd654-44b5-44d5-bec0-e9cf09ea9b22}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\NewUI">
+      <UniqueIdentifier>{d5299bd5-cbfb-4182-af47-745b6a08830f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\NewUI\Core">
+      <UniqueIdentifier>{80539c98-aa5a-44ca-ad0e-68f50d81de6c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Level\Decoration.cpp" />
-    <ClCompile Include="..\..\_deleted.cpp" />
-    <ClCompile Include="..\..\Actor.cpp" />
-    <ClCompile Include="..\..\AIL.cpp" />
-    <ClCompile Include="..\..\Arcomage.cpp" />
-    <ClCompile Include="..\..\ArcomageCards.cpp" />
-    <ClCompile Include="..\..\AudioPlayer.cpp" />
-    <ClCompile Include="..\..\Bink_Smacker.cpp" />
-    <ClCompile Include="..\..\BSPModel.cpp" />
-    <ClCompile Include="..\..\CastSpellInfo.cpp" />
-    <ClCompile Include="..\..\Chest.cpp" />
-    <ClCompile Include="..\..\Conditions.cpp" />
-    <ClCompile Include="..\..\DecalBuilder.cpp" />
-    <ClCompile Include="..\..\DecorationList.cpp" />
-    <ClCompile Include="..\..\Events.cpp" />
-    <ClCompile Include="..\..\FrameTableInc.cpp" />
-    <ClCompile Include="..\..\Game.cpp" />
-    <ClCompile Include="..\..\GammaControl.cpp" />
-    <ClCompile Include="..\..\GUIButton.cpp" />
-    <ClCompile Include="..\..\GUIFont.cpp" />
-    <ClCompile Include="..\..\GUIProgressBar.cpp" />
-    <ClCompile Include="..\..\GUIWindow.cpp" />
-    <ClCompile Include="..\..\IconFrameTable.cpp" />
-    <ClCompile Include="..\..\Indoor.cpp" />
-    <ClCompile Include="..\..\IndoorCameraD3D.cpp" />
-    <ClCompile Include="..\..\Items.cpp" />
-    <ClCompile Include="..\..\Keyboard.cpp" />
-    <ClCompile Include="..\..\LightmapBuilder.cpp" />
-    <ClCompile Include="..\..\LightsStack.cpp" />
-    <ClCompile Include="..\..\LOD.cpp" />
-    <ClCompile Include="..\..\Log.cpp" />
-    <ClCompile Include="..\..\LuaVM.cpp" />
-    <ClCompile Include="..\..\mm7_2.cpp" />
-    <ClCompile Include="..\..\mm7_3.cpp" />
-    <ClCompile Include="..\..\mm7_4.cpp" />
-    <ClCompile Include="..\..\mm7_5.cpp" />
-    <ClCompile Include="..\..\mm7_6.cpp" />
-    <ClCompile Include="..\..\mm7_7.cpp" />
-    <ClCompile Include="..\..\mm7_data.cpp" />
-    <ClCompile Include="..\..\mm7text_ru.cpp" />
-    <ClCompile Include="..\..\Monsters.cpp" />
-    <ClCompile Include="..\..\Mouse.cpp" />
-    <ClCompile Include="..\..\NPC.cpp" />
-    <ClCompile Include="..\..\ObjectList.cpp" />
-    <ClCompile Include="..\..\OSAPI.cpp" />
-    <ClCompile Include="..\..\OSWindow.cpp" />
-    <ClCompile Include="..\..\Outdoor.cpp" />
-    <ClCompile Include="..\..\Overlays.cpp" />
-    <ClCompile Include="..\..\PaletteManager.cpp" />
-    <ClCompile Include="..\..\ParticleEngine.cpp" />
-    <ClCompile Include="..\..\Party.cpp" />
-    <ClCompile Include="..\..\Player.cpp" />
-    <ClCompile Include="..\..\Random.cpp" />
-    <ClCompile Include="..\..\Render.cpp" />
-    <ClCompile Include="..\..\SaveLoad.cpp" />
-    <ClCompile Include="..\..\Spells.cpp" />
-    <ClCompile Include="..\..\SpriteObject.cpp" />
-    <ClCompile Include="..\..\Sprites.cpp" />
-    <ClCompile Include="..\..\StorylineTextTable.cpp" />
-    <ClCompile Include="..\..\stru10.cpp" />
-    <ClCompile Include="..\..\stru6.cpp" />
-    <ClCompile Include="..\..\stru9.cpp" />
-    <ClCompile Include="..\..\texts.cpp" />
-    <ClCompile Include="..\..\Texture.cpp" />
-    <ClCompile Include="..\..\TileTable.cpp" />
-    <ClCompile Include="..\..\Timer.cpp" />
-    <ClCompile Include="..\..\TurnEngine.cpp" />
-    <ClCompile Include="..\..\VectorTypes.cpp" />
-    <ClCompile Include="..\..\Viewport.cpp" />
-    <ClCompile Include="..\..\Vis.cpp" />
-    <ClCompile Include="..\..\Weather.cpp" />
     <ClCompile Include="..\..\lib\zlib\adler32.c">
       <Filter>lib\zlib</Filter>
     </ClCompile>
@@ -281,65 +243,6 @@
     <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c">
       <Filter>lib\lua\lua-5.2.2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\NewUI\MainMenu.cpp">
-      <Filter>NewUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx">
-      <Filter>NewUI\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIBooks.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UICharacter.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UiGame.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIGuilds.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIHouses.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIMainMenu.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIMsgProc.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIOptions.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIPartyCreation.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIPopup.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIRest.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UISaveLoad.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIShops.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UITransition.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp">
-      <Filter>UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp">
-      <Filter>UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp">
-      <Filter>UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\MapInfo.cpp" />
-    <ClCompile Include="..\..\MMT.cpp" />
     <ClCompile Include="..\..\lib\libpng\png.c">
       <Filter>lib\libpng</Filter>
     </ClCompile>
@@ -385,98 +288,293 @@
     <ClCompile Include="..\..\lib\libpng\pngwutil.c">
       <Filter>lib\libpng</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\MediaPlayer.cpp" />
-    <ClCompile Include="..\..\OurMath.cpp" />
-    <ClCompile Include="..\..\Registry.cpp" />
-    <ClCompile Include="..\..\ZlibWrapper.cpp" />
+    <ClCompile Include="..\..\_deleted.cpp" />
+    <ClCompile Include="..\..\OSAPI.cpp" />
+    <ClCompile Include="..\..\OSWindow.cpp" />
+    <ClCompile Include="..\..\Arcomage.cpp">
+      <Filter>Arcomage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ArcomageCards.cpp">
+      <Filter>Arcomage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Level\Decoration.cpp">
+      <Filter>Engine\Graphics\Level</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\BSPModel.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DecalBuilder.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DecorationList.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DirectX11.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GammaControl.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Indoor.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IndoorCameraD3D.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LightmapBuilder.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LightsStack.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Outdoor.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Overlays.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PaletteManager.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ParticleEngine.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Render.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RenderD3D11.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Sprites.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Texture.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Viewport.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Vis.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Weather.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TurnEngine.cpp">
+      <Filter>Engine\TurnEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FactionTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FrameTableInc.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IconFrameTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PlayerFrameTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StorylineTextTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TileTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CastSpellInfo.cpp">
+      <Filter>Engine\Spells</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Spells.cpp">
+      <Filter>Engine\Spells</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Actor.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Chest.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Items.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Monsters.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NPC.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectList.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Player.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SpriteObject.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Conditions.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Events.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Game.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LOD.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Log.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LuaVM.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MapInfo.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mm7_7.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mm7_data.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mm7text_ru.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MMT.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OurMath.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Party.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Random.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Registry.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SaveLoad.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\stru298.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\stru6.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\texts.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\VectorTypes.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZlibWrapper.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Keyboard.cpp">
+      <Filter>IO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Mouse.cpp">
+      <Filter>IO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AIL.cpp">
+      <Filter>Media\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AudioPlayer.cpp">
+      <Filter>Media\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Bink_Smacker.cpp">
+      <Filter>Media\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MediaPlayer.cpp">
+      <Filter>Media</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUIButton.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUIFont.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUIProgressBar.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUIWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NewUI\MainMenu.cpp">
+      <Filter>GUI\NewUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx">
+      <Filter>GUI\NewUI\Core</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\UI\UIArena.cpp">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIBooks.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UICharacter.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UiGame.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIGuilds.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIHouses.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIMainMenu.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIMsgProc.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIOptions.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIPartyCreation.cpp">
+      <Filter>GUI\UI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\DirectX11.cpp" />
-    <ClCompile Include="..\..\RenderD3D11.cpp" />
+    <ClCompile Include="..\..\UI\UIPopup.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIRest.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UISaveLoad.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIShops.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UITransition.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\stru9.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\stru10.cpp">
+      <Filter>Engine\Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Level\Decoration.h" />
-    <ClInclude Include="..\..\Actor.h" />
-    <ClInclude Include="..\..\AIL.h" />
-    <ClInclude Include="..\..\Arcomage.h" />
-    <ClInclude Include="..\..\AudioPlayer.h" />
-    <ClInclude Include="..\..\Autonotes.h" />
-    <ClInclude Include="..\..\Awards.h" />
-    <ClInclude Include="..\..\Bink_Smacker.h" />
-    <ClInclude Include="..\..\BSPModel.h" />
-    <ClInclude Include="..\..\CastSpellInfo.h" />
-    <ClInclude Include="..\..\Chest.h" />
-    <ClInclude Include="..\..\Conditions.h" />
-    <ClInclude Include="..\..\DecalBuilder.h" />
-    <ClInclude Include="..\..\DecorationList.h" />
-    <ClInclude Include="..\..\ErrorHandling.h" />
-    <ClInclude Include="..\..\Events.h" />
-    <ClInclude Include="..\..\Events2D.h" />
-    <ClInclude Include="..\..\FactionTable.h" />
-    <ClInclude Include="..\..\FrameTableInc.h" />
-    <ClInclude Include="..\..\Game.h" />
-    <ClInclude Include="..\..\GammaControl.h" />
-    <ClInclude Include="..\..\GUIFont.h" />
-    <ClInclude Include="..\..\GUIProgressBar.h" />
-    <ClInclude Include="..\..\GUIWindow.h" />
-    <ClInclude Include="..\..\IconFrameTable.h" />
-    <ClInclude Include="..\..\Indoor.h" />
-    <ClInclude Include="..\..\Indoor_stuff.h" />
-    <ClInclude Include="..\..\IndoorCameraD3D.h" />
-    <ClInclude Include="..\..\Items.h" />
-    <ClInclude Include="..\..\Keyboard.h" />
-    <ClInclude Include="..\..\LightmapBuilder.h" />
-    <ClInclude Include="..\..\Lights.h" />
-    <ClInclude Include="..\..\LOD.h" />
-    <ClInclude Include="..\..\Log.h" />
-    <ClInclude Include="..\..\LuaVM.h" />
-    <ClInclude Include="..\..\MapInfo.h" />
-    <ClInclude Include="..\..\MM7.h" />
-    <ClInclude Include="..\..\mm7_data.h" />
-    <ClInclude Include="..\..\Monsters.h" />
-    <ClInclude Include="..\..\Mouse.h" />
-    <ClInclude Include="..\..\NPC.h" />
-    <ClInclude Include="..\..\NZIArray.h" />
-    <ClInclude Include="..\..\ObjectList.h" />
-    <ClInclude Include="..\..\OSAPI.h" />
-    <ClInclude Include="..\..\OSInfo.h" />
-    <ClInclude Include="..\..\OSWindow.h" />
-    <ClInclude Include="..\..\OurMath.h" />
-    <ClInclude Include="..\..\Outdoor.h" />
-    <ClInclude Include="..\..\Outdoor_stuff.h" />
-    <ClInclude Include="..\..\Overlays.h" />
-    <ClInclude Include="..\..\PaletteManager.h" />
-    <ClInclude Include="..\..\ParticleEngine.h" />
-    <ClInclude Include="..\..\Party.h" />
-    <ClInclude Include="..\..\Player.h" />
-    <ClInclude Include="..\..\PlayerFrameTable.h" />
-    <ClInclude Include="..\..\Random.h" />
-    <ClInclude Include="..\..\Render.h" />
-    <ClInclude Include="..\..\SaveLoad.h" />
-    <ClInclude Include="..\..\Spells.h" />
-    <ClInclude Include="..\..\SpriteObject.h" />
-    <ClInclude Include="..\..\Sprites.h" />
-    <ClInclude Include="..\..\StorylineTextTable.h" />
-    <ClInclude Include="..\..\stru10.h" />
-    <ClInclude Include="..\..\stru123.h" />
-    <ClInclude Include="..\..\stru159.h" />
-    <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\stru298.h" />
-    <ClInclude Include="..\..\stru314.h" />
-    <ClInclude Include="..\..\stru367.h" />
-    <ClInclude Include="..\..\stru6.h" />
-    <ClInclude Include="..\..\stru9.h" />
-    <ClInclude Include="..\..\TestClass.h" />
-    <ClInclude Include="..\..\texts.h" />
-    <ClInclude Include="..\..\Texture.h" />
-    <ClInclude Include="..\..\TileFrameTable.h" />
-    <ClInclude Include="..\..\Timer.h" />
-    <ClInclude Include="..\..\TurnEngine.h" />
-    <ClInclude Include="..\..\VectorTypes.h" />
-    <ClInclude Include="..\..\Viewport.h" />
-    <ClInclude Include="..\..\Vis.h" />
-    <ClInclude Include="..\..\Weather.h" />
     <ClInclude Include="..\..\lib\libavcodec\avcodec.h">
       <Filter>lib\libavcodec</Filter>
     </ClInclude>
@@ -879,20 +977,6 @@
     <ClInclude Include="..\..\lib\legacy_dx\strsafe.h">
       <Filter>lib\legacy_dx</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\NewUI\Core\UIControl.h">
-      <Filter>NewUI\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\NewUI\MainMenu.h">
-      <Filter>NewUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIBooks.h">
-      <Filter>UI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIHouses.h">
-      <Filter>UI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\mm7_unsorted_subs.h" />
-    <ClInclude Include="..\..\MMT.h" />
     <ClInclude Include="..\..\lib\libpng\png.h">
       <Filter>lib\libpng</Filter>
     </ClInclude>
@@ -914,68 +998,335 @@
     <ClInclude Include="..\..\lib\libpng\pngstruct.h">
       <Filter>lib\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\MediaPlayer.h" />
-    <ClInclude Include="..\..\OpenALSoundProvider.h" />
-    <ClInclude Include="..\..\stuff.h" />
-    <ClInclude Include="..\..\Registry.h" />
-    <ClInclude Include="..\..\UI\UIGame.h">
-      <Filter>UI</Filter>
+    <ClInclude Include="..\..\OSAPI.h" />
+    <ClInclude Include="..\..\OSInfo.h" />
+    <ClInclude Include="..\..\OSWindow.h" />
+    <ClInclude Include="..\..\Arcomage.h">
+      <Filter>Arcomage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Level\Decoration.h">
+      <Filter>Engine\Graphics\Level</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\BSPModel.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\DecalBuilder.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\DecorationList.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\DirectX11.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GammaControl.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Indoor.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\IndoorCameraD3D.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\IRender.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LightmapBuilder.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Lights.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Outdoor.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Overlays.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\PaletteManager.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ParticleEngine.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Render.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\RenderD3D11.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\RenderStruct.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Sprites.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Texture.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Viewport.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Vis.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Weather.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TurnEngine.h">
+      <Filter>Engine\TurnEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\FactionTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\FrameTableInc.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\IconFrameTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\PlayerFrameTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\StorylineTextTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TileFrameTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\CastSpellInfo.h">
+      <Filter>Engine\Spells</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Spells.h">
+      <Filter>Engine\Spells</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Actor.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Chest.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Items.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Monsters.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\NPC.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ObjectList.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Player.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SpriteObject.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Autonotes.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Awards.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Conditions.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ErrorHandling.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Events.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Events2D.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Game.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LOD.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Log.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LuaVM.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\MapInfo.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\MapsLongTimer.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\MM7.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\mm7_data.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\MMT.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\NZIArray.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\OurMath.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Party.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Random.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Registry.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\resource.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SaveLoad.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru123.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru159.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru160.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru298.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru314.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru367.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru6.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stuff.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\texts.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Timer.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\VectorTypes.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZlibWrapper.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Keyboard.h">
+      <Filter>IO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Mouse.h">
+      <Filter>IO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\AIL.h">
+      <Filter>Media\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\AudioPlayer.h">
+      <Filter>Media\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\OpenALSoundProvider.h">
+      <Filter>Media\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Bink_Smacker.h">
+      <Filter>Media\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\MediaPlayer.h">
+      <Filter>Media</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUIButton.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUIFont.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUIProgressBar.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUIWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\NewUI\MainMenu.h">
+      <Filter>GUI\NewUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\NewUI\Core\UIControl.h">
+      <Filter>GUI\NewUI\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIArena.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIBooks.h">
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UICharacter.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIGame.h">
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIGuilds.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIHouses.h">
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIMainMenu.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIMsgProc.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIOptions.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIPartyCreation.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIPopup.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIRest.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UISaveLoad.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UIShops.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\UITransition.h">
-      <Filter>UI</Filter>
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\Books\UIMapBook.h">
+      <Filter>GUI\UI\Books</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\Books\UINotesBooks.h">
-      <Filter>UI\Books</Filter>
+      <Filter>GUI\UI\Books</Filter>
     </ClInclude>
     <ClInclude Include="..\..\UI\Books\UISpellBook.h">
-      <Filter>UI\Books</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\Books\UIMapBook.h">
-      <Filter>UI\Books</Filter>
+      <Filter>GUI\UI\Books</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\GUIButton.h" />
-    <ClInclude Include="..\..\ZlibWrapper.h" />
-    <ClInclude Include="..\..\UI\UIArena.h">
-      <Filter>UI</Filter>
+    <ClInclude Include="..\..\stru9.h">
+      <Filter>Engine\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\MapsLongTimer.h" />
-    <ClInclude Include="..\..\DirectX11.h" />
-    <ClInclude Include="..\..\RenderStruct.h" />
-    <ClInclude Include="..\..\IRender.h" />
-    <ClInclude Include="..\..\RenderD3D11.h" />
+    <ClInclude Include="..\..\stru10.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Player.swig" />
     <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def">
       <Filter>lib\OpenAL\lib\x86</Filter>
     </None>
@@ -1006,6 +1357,15 @@
     <None Include="..\..\lib\swig.bat">
       <Filter>lib</Filter>
     </None>
+    <None Include="..\..\Player.swig">
+      <Filter>Engine\Objects</Filter>
+    </None>
+    <None Include="..\..\NewUI\Core\UIControlModule.swig">
+      <Filter>GUI\NewUI\Core</Filter>
+    </None>
+    <None Include="..\..\UI\UIArena.cpp.orig">
+      <Filter>GUI\UI</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\lib\OpenAL\lib\OpenAL\OpenAL32.lib">
@@ -1035,25 +1395,5 @@
     <Library Include="..\..\lib\OpenAL\lib\x86\swscale.lib">
       <Filter>lib\OpenAL\lib\x86</Filter>
     </Library>
-    <Library Include="..\..\lib\legacy_dx\lib\dxguid.lib">
-      <Filter>lib\legacy_dx\lib</Filter>
-    </Library>
-    <Library Include="..\..\lib\legacy_dx\lib\dinput8.lib">
-      <Filter>lib\legacy_dx\lib</Filter>
-    </Library>
-    <Library Include="..\..\lib\legacy_dx\lib\dinput.lib">
-      <Filter>lib\legacy_dx\lib</Filter>
-    </Library>
-    <Library Include="..\..\lib\legacy_dx\lib\ddraw.lib">
-      <Filter>lib\legacy_dx\lib</Filter>
-    </Library>
-    <Library Include="..\..\lib\legacy_dx\lib\d3dxof.lib">
-      <Filter>lib\legacy_dx\lib</Filter>
-    </Library>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
-      <Filter>NewUI\Core</Filter>
-    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file