--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Thu Sep 18 17:38:54 2014 +0600
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Thu Sep 18 23:59:29 2014 +0600
@@ -90,33 +90,51 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Actor.cpp" />
     <ClCompile Include="..\..\AIL.cpp" />
-    <ClCompile Include="..\..\Arcomage.cpp" />
-    <ClCompile Include="..\..\ArcomageCards.cpp" />
+    <ClCompile Include="..\..\Arcomage\Arcomage.cpp" />
+    <ClCompile Include="..\..\Arcomage\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="..\..\Engine\Graphics\BSPModel.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\DecalBuilder.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\DecorationList.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\GammaControl.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Indoor.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\IndoorCameraD3D.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Level\Decoration.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\LightmapBuilder.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\LightsStack.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Outdoor.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Overlays.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\PaletteManager.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\ParticleEngine.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Render.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\RenderD3D11.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Sprites.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\stru10.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\stru9.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Texture.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Viewport.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Vis.cpp" />
+    <ClCompile Include="..\..\Engine\Graphics\Weather.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Actor.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Chest.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Items.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Monsters.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\NPC.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\ObjectList.cpp" />
     <ClCompile Include="..\..\Events.cpp" />
     <ClCompile Include="..\..\FactionTable.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="..\..\Level\Decoration.cpp" />
     <ClCompile Include="..\..\lib\libpng\png.c" />
     <ClCompile Include="..\..\lib\libpng\pngerror.c" />
     <ClCompile Include="..\..\lib\libpng\pngget.c" />
@@ -178,8 +196,6 @@
     <ClCompile Include="..\..\lib\zlib\trees.c" />
     <ClCompile Include="..\..\lib\zlib\uncompr.c" />
     <ClCompile Include="..\..\lib\zlib\zutil.c" />
-    <ClCompile Include="..\..\LightmapBuilder.cpp" />
-    <ClCompile Include="..\..\LightsStack.cpp" />
     <ClCompile Include="..\..\LOD.cpp" />
     <ClCompile Include="..\..\Log.cpp" />
     <ClCompile Include="..\..\LuaVM.cpp" />
@@ -189,37 +205,24 @@
     <ClCompile Include="..\..\mm7_7.cpp" />
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\MMT.cpp" />
-    <ClCompile Include="..\..\Monsters.cpp" />
     <ClCompile Include="..\..\Mouse.cpp" />
     <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx" />
     <ClCompile Include="..\..\NewUI\MainMenu.cpp" />
-    <ClCompile Include="..\..\NPC.cpp" />
-    <ClCompile Include="..\..\ObjectList.cpp" />
     <ClCompile Include="..\..\OSAPI.cpp" />
     <ClCompile Include="..\..\OSWindow.cpp" />
     <ClCompile Include="..\..\OurMath.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="..\..\PlayerFrameTable.cpp" />
     <ClCompile Include="..\..\Random.cpp" />
     <ClCompile Include="..\..\Registry.cpp" />
-    <ClCompile Include="..\..\Render.cpp" />
-    <ClCompile Include="..\..\RenderD3D11.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="..\..\stru298.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" />
@@ -242,44 +245,60 @@
     <ClCompile Include="..\..\UI\UIShops.cpp" />
     <ClCompile Include="..\..\UI\UITransition.cpp" />
     <ClCompile Include="..\..\VectorTypes.cpp" />
-    <ClCompile Include="..\..\Viewport.cpp" />
-    <ClCompile Include="..\..\Vis.cpp" />
-    <ClCompile Include="..\..\Weather.cpp" />
     <ClCompile Include="..\..\ZlibWrapper.cpp" />
     <ClCompile Include="..\..\_deleted.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Actor.h" />
     <ClInclude Include="..\..\AIL.h" />
-    <ClInclude Include="..\..\Arcomage.h" />
+    <ClInclude Include="..\..\Arcomage\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="..\..\Engine\Graphics\BSPModel.h" />
+    <ClInclude Include="..\..\Engine\Graphics\DecalBuilder.h" />
+    <ClInclude Include="..\..\Engine\Graphics\DecorationList.h" />
+    <ClInclude Include="..\..\Engine\Graphics\GammaControl.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Indoor.h" />
+    <ClInclude Include="..\..\Engine\Graphics\IndoorCameraD3D.h" />
+    <ClInclude Include="..\..\Engine\Graphics\IRender.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Level\Decoration.h" />
+    <ClInclude Include="..\..\Engine\Graphics\LightmapBuilder.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Lights.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Outdoor.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Overlays.h" />
+    <ClInclude Include="..\..\Engine\Graphics\PaletteManager.h" />
+    <ClInclude Include="..\..\Engine\Graphics\ParticleEngine.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Render.h" />
+    <ClInclude Include="..\..\Engine\Graphics\RenderD3D11.h" />
+    <ClInclude Include="..\..\Engine\Graphics\RenderStruct.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Sprites.h" />
+    <ClInclude Include="..\..\Engine\Graphics\stru10.h" />
+    <ClInclude Include="..\..\Engine\Graphics\stru9.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Texture.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Viewport.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Vis.h" />
+    <ClInclude Include="..\..\Engine\Graphics\Weather.h" />
+    <ClInclude Include="..\..\Engine\Objects\Actor.h" />
+    <ClInclude Include="..\..\Engine\Objects\Chest.h" />
+    <ClInclude Include="..\..\Engine\Objects\Items.h" />
+    <ClInclude Include="..\..\Engine\Objects\Monsters.h" />
+    <ClInclude Include="..\..\Engine\Objects\NPC.h" />
+    <ClInclude Include="..\..\Engine\Objects\ObjectList.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="..\..\GUIButton.h" />
     <ClInclude Include="..\..\GUIFont.h" />
     <ClInclude Include="..\..\GUIProgressBar.h" />
     <ClInclude Include="..\..\GUIWindow.h" />
     <ClInclude Include="..\..\IconFrameTable.h" />
-    <ClInclude Include="..\..\Indoor.h" />
-    <ClInclude Include="..\..\IndoorCameraD3D.h" />
-    <ClInclude Include="..\..\IRender.h" />
-    <ClInclude Include="..\..\Items.h" />
     <ClInclude Include="..\..\Keyboard.h" />
-    <ClInclude Include="..\..\Level\Decoration.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3d.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3drm.h" />
@@ -421,8 +440,6 @@
     <ClInclude Include="..\..\lib\zlib\zconf.h" />
     <ClInclude Include="..\..\lib\zlib\zlib.h" />
     <ClInclude Include="..\..\lib\zlib\zutil.h" />
-    <ClInclude Include="..\..\LightmapBuilder.h" />
-    <ClInclude Include="..\..\Lights.h" />
     <ClInclude Include="..\..\LOD.h" />
     <ClInclude Include="..\..\Log.h" />
     <ClInclude Include="..\..\LuaVM.h" />
@@ -432,37 +449,25 @@
     <ClInclude Include="..\..\MM7.h" />
     <ClInclude Include="..\..\mm7_data.h" />
     <ClInclude Include="..\..\MMT.h" />
-    <ClInclude Include="..\..\Monsters.h" />
     <ClInclude Include="..\..\Mouse.h" />
     <ClInclude Include="..\..\NewUI\Core\UIControl.h" />
     <ClInclude Include="..\..\NewUI\MainMenu.h" />
-    <ClInclude Include="..\..\NPC.h" />
     <ClInclude Include="..\..\NZIArray.h" />
-    <ClInclude Include="..\..\ObjectList.h" />
     <ClInclude Include="..\..\OpenALSoundProvider.h" />
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
     <ClInclude Include="..\..\OurMath.h" />
-    <ClInclude Include="..\..\Outdoor.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="..\..\Registry.h" />
-    <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" />
-    <ClInclude Include="..\..\Sprites.h" />
     <ClInclude Include="..\..\StorylineTextTable.h" />
-    <ClInclude Include="..\..\stru10.h" />
     <ClInclude Include="..\..\stru123.h" />
     <ClInclude Include="..\..\stru159.h" />
     <ClInclude Include="..\..\stru160.h" />
@@ -470,10 +475,8 @@
     <ClInclude Include="..\..\stru314.h" />
     <ClInclude Include="..\..\stru367.h" />
     <ClInclude Include="..\..\stru6.h" />
-    <ClInclude Include="..\..\stru9.h" />
     <ClInclude Include="..\..\stuff.h" />
     <ClInclude Include="..\..\texts.h" />
-    <ClInclude Include="..\..\Texture.h" />
     <ClInclude Include="..\..\TileFrameTable.h" />
     <ClInclude Include="..\..\Timer.h" />
     <ClInclude Include="..\..\TurnEngine.h" />
@@ -496,9 +499,6 @@
     <ClInclude Include="..\..\UI\UIShops.h" />
     <ClInclude Include="..\..\UI\UITransition.h" />
     <ClInclude Include="..\..\VectorTypes.h" />
-    <ClInclude Include="..\..\Viewport.h" />
-    <ClInclude Include="..\..\Vis.h" />
-    <ClInclude Include="..\..\Weather.h" />
     <ClInclude Include="..\..\ZlibWrapper.h" />
   </ItemGroup>
   <ItemGroup>