--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Fri Sep 19 00:03:04 2014 +0600
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Fri Sep 19 02:57:42 2014 +0600
@@ -95,8 +95,9 @@
     <ClCompile Include="..\..\Arcomage\ArcomageCards.cpp" />
     <ClCompile Include="..\..\AudioPlayer.cpp" />
     <ClCompile Include="..\..\Bink_Smacker.cpp" />
-    <ClCompile Include="..\..\CastSpellInfo.cpp" />
-    <ClCompile Include="..\..\Conditions.cpp" />
+    <ClCompile Include="..\..\Engine\Conditions.cpp" />
+    <ClCompile Include="..\..\Engine\Events.cpp" />
+    <ClCompile Include="..\..\Engine\Game.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\BSPModel.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\DecalBuilder.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\DecorationList.cpp" />
@@ -119,21 +120,45 @@
     <ClCompile Include="..\..\Engine\Graphics\Viewport.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\Vis.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\Weather.cpp" />
+    <ClCompile Include="..\..\Engine\LOD.cpp" />
+    <ClCompile Include="..\..\Engine\Log.cpp" />
+    <ClCompile Include="..\..\Engine\LuaVM.cpp" />
+    <ClCompile Include="..\..\Engine\MapInfo.cpp" />
+    <ClCompile Include="..\..\Engine\mm7text_ru.cpp" />
+    <ClCompile Include="..\..\Engine\mm7_7.cpp" />
+    <ClCompile Include="..\..\Engine\mm7_data.cpp" />
+    <ClCompile Include="..\..\Engine\MMT.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="..\..\Engine\Objects\Player.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\SpriteObject.cpp" />
+    <ClCompile Include="..\..\Engine\OurMath.cpp" />
+    <ClCompile Include="..\..\Engine\Party.cpp" />
+    <ClCompile Include="..\..\Engine\Random.cpp" />
+    <ClCompile Include="..\..\Engine\Registry.cpp" />
+    <ClCompile Include="..\..\Engine\SaveLoad.cpp" />
+    <ClCompile Include="..\..\Engine\Spells\CastSpellInfo.cpp" />
+    <ClCompile Include="..\..\Engine\Spells\Spells.cpp" />
+    <ClCompile Include="..\..\Engine\stru298.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\FactionTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\FrameTableInc.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\IconFrameTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\PlayerFrameTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\StorylineTextTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\TileTable.cpp" />
+    <ClCompile Include="..\..\Engine\texts.cpp" />
+    <ClCompile Include="..\..\Engine\Timer.cpp" />
+    <ClCompile Include="..\..\Engine\TurnEngine\TurnEngine.cpp" />
+    <ClCompile Include="..\..\Engine\VectorTypes.cpp" />
+    <ClCompile Include="..\..\Engine\ZlibWrapper.cpp" />
     <ClCompile Include="..\..\GUIButton.cpp" />
     <ClCompile Include="..\..\GUIFont.cpp" />
     <ClCompile Include="..\..\GUIProgressBar.cpp" />
     <ClCompile Include="..\..\GUIWindow.cpp" />
-    <ClCompile Include="..\..\IconFrameTable.cpp" />
     <ClCompile Include="..\..\Keyboard.cpp" />
     <ClCompile Include="..\..\lib\libpng\png.c" />
     <ClCompile Include="..\..\lib\libpng\pngerror.c" />
@@ -196,36 +221,13 @@
     <ClCompile Include="..\..\lib\zlib\trees.c" />
     <ClCompile Include="..\..\lib\zlib\uncompr.c" />
     <ClCompile Include="..\..\lib\zlib\zutil.c" />
-    <ClCompile Include="..\..\LOD.cpp" />
-    <ClCompile Include="..\..\Log.cpp" />
-    <ClCompile Include="..\..\LuaVM.cpp" />
-    <ClCompile Include="..\..\MapInfo.cpp" />
     <ClCompile Include="..\..\MediaPlayer.cpp" />
-    <ClCompile Include="..\..\mm7text_ru.cpp" />
-    <ClCompile Include="..\..\mm7_7.cpp" />
-    <ClCompile Include="..\..\mm7_data.cpp" />
-    <ClCompile Include="..\..\MMT.cpp" />
     <ClCompile Include="..\..\Mouse.cpp" />
     <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx" />
     <ClCompile Include="..\..\NewUI\MainMenu.cpp" />
     <ClCompile Include="..\..\OSAPI.cpp" />
     <ClCompile Include="..\..\OSWindow.cpp" />
-    <ClCompile Include="..\..\OurMath.cpp" />
-    <ClCompile Include="..\..\Party.cpp" />
-    <ClCompile Include="..\..\Player.cpp" />
-    <ClCompile Include="..\..\PlayerFrameTable.cpp" />
-    <ClCompile Include="..\..\Random.cpp" />
-    <ClCompile Include="..\..\Registry.cpp" />
-    <ClCompile Include="..\..\SaveLoad.cpp" />
-    <ClCompile Include="..\..\Spells.cpp" />
-    <ClCompile Include="..\..\SpriteObject.cpp" />
-    <ClCompile Include="..\..\StorylineTextTable.cpp" />
-    <ClCompile Include="..\..\stru298.cpp" />
     <ClCompile Include="..\..\stru6.cpp" />
-    <ClCompile Include="..\..\texts.cpp" />
-    <ClCompile Include="..\..\TileTable.cpp" />
-    <ClCompile Include="..\..\Timer.cpp" />
-    <ClCompile Include="..\..\TurnEngine.cpp" />
     <ClCompile Include="..\..\UI\Books\UIMapBook.cpp" />
     <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp" />
     <ClCompile Include="..\..\UI\Books\UISpellBook.cpp" />
@@ -244,19 +246,20 @@
     <ClCompile Include="..\..\UI\UISaveLoad.cpp" />
     <ClCompile Include="..\..\UI\UIShops.cpp" />
     <ClCompile Include="..\..\UI\UITransition.cpp" />
-    <ClCompile Include="..\..\VectorTypes.cpp" />
-    <ClCompile Include="..\..\ZlibWrapper.cpp" />
     <ClCompile Include="..\..\_deleted.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\AIL.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="..\..\CastSpellInfo.h" />
-    <ClInclude Include="..\..\Conditions.h" />
+    <ClInclude Include="..\..\Engine\Autonotes.h" />
+    <ClInclude Include="..\..\Engine\Awards.h" />
+    <ClInclude Include="..\..\Engine\Conditions.h" />
+    <ClInclude Include="..\..\Engine\ErrorHandling.h" />
+    <ClInclude Include="..\..\Engine\Events.h" />
+    <ClInclude Include="..\..\Engine\Events2D.h" />
+    <ClInclude Include="..\..\Engine\Game.h" />
     <ClInclude Include="..\..\Engine\Graphics\BSPModel.h" />
     <ClInclude Include="..\..\Engine\Graphics\DecalBuilder.h" />
     <ClInclude Include="..\..\Engine\Graphics\DecorationList.h" />
@@ -281,23 +284,53 @@
     <ClInclude Include="..\..\Engine\Graphics\Viewport.h" />
     <ClInclude Include="..\..\Engine\Graphics\Vis.h" />
     <ClInclude Include="..\..\Engine\Graphics\Weather.h" />
+    <ClInclude Include="..\..\Engine\LOD.h" />
+    <ClInclude Include="..\..\Engine\Log.h" />
+    <ClInclude Include="..\..\Engine\LuaVM.h" />
+    <ClInclude Include="..\..\Engine\MapInfo.h" />
+    <ClInclude Include="..\..\Engine\MapsLongTimer.h" />
+    <ClInclude Include="..\..\Engine\MM7.h" />
+    <ClInclude Include="..\..\Engine\mm7_data.h" />
+    <ClInclude Include="..\..\Engine\MMT.h" />
+    <ClInclude Include="..\..\Engine\NZIArray.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="..\..\Engine\Objects\Player.h" />
+    <ClInclude Include="..\..\Engine\Objects\SpriteObject.h" />
+    <ClInclude Include="..\..\Engine\OurMath.h" />
+    <ClInclude Include="..\..\Engine\Party.h" />
+    <ClInclude Include="..\..\Engine\Random.h" />
+    <ClInclude Include="..\..\Engine\Registry.h" />
+    <ClInclude Include="..\..\Engine\resource.h" />
+    <ClInclude Include="..\..\Engine\SaveLoad.h" />
+    <ClInclude Include="..\..\Engine\Spells\CastSpellInfo.h" />
+    <ClInclude Include="..\..\Engine\Spells\Spells.h" />
+    <ClInclude Include="..\..\Engine\stru123.h" />
+    <ClInclude Include="..\..\Engine\stru159.h" />
+    <ClInclude Include="..\..\Engine\stru160.h" />
+    <ClInclude Include="..\..\Engine\stru298.h" />
+    <ClInclude Include="..\..\Engine\stru314.h" />
+    <ClInclude Include="..\..\Engine\stru367.h" />
+    <ClInclude Include="..\..\Engine\stuff.h" />
+    <ClInclude Include="..\..\Engine\Tables\FactionTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\FrameTableInc.h" />
+    <ClInclude Include="..\..\Engine\Tables\IconFrameTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\PlayerFrameTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\StorylineTextTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\TileFrameTable.h" />
+    <ClInclude Include="..\..\Engine\texts.h" />
+    <ClInclude Include="..\..\Engine\Timer.h" />
+    <ClInclude Include="..\..\Engine\TurnEngine\TurnEngine.h" />
+    <ClInclude Include="..\..\Engine\VectorTypes.h" />
+    <ClInclude Include="..\..\Engine\ZlibWrapper.h" />
     <ClInclude Include="..\..\GUIButton.h" />
     <ClInclude Include="..\..\GUIFont.h" />
     <ClInclude Include="..\..\GUIProgressBar.h" />
     <ClInclude Include="..\..\GUIWindow.h" />
-    <ClInclude Include="..\..\IconFrameTable.h" />
     <ClInclude Include="..\..\Keyboard.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3d.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h" />
@@ -440,46 +473,14 @@
     <ClInclude Include="..\..\lib\zlib\zconf.h" />
     <ClInclude Include="..\..\lib\zlib\zlib.h" />
     <ClInclude Include="..\..\lib\zlib\zutil.h" />
-    <ClInclude Include="..\..\LOD.h" />
-    <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="..\..\MMT.h" />
     <ClInclude Include="..\..\Mouse.h" />
     <ClInclude Include="..\..\NewUI\Core\UIControl.h" />
     <ClInclude Include="..\..\NewUI\MainMenu.h" />
-    <ClInclude Include="..\..\NZIArray.h" />
     <ClInclude Include="..\..\OpenALSoundProvider.h" />
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
-    <ClInclude Include="..\..\OurMath.h" />
-    <ClInclude Include="..\..\Party.h" />
-    <ClInclude Include="..\..\Player.h" />
-    <ClInclude Include="..\..\PlayerFrameTable.h" />
-    <ClInclude Include="..\..\Random.h" />
-    <ClInclude Include="..\..\Registry.h" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\SaveLoad.h" />
-    <ClInclude Include="..\..\Spells.h" />
-    <ClInclude Include="..\..\SpriteObject.h" />
-    <ClInclude Include="..\..\StorylineTextTable.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="..\..\stuff.h" />
-    <ClInclude Include="..\..\texts.h" />
-    <ClInclude Include="..\..\TileFrameTable.h" />
-    <ClInclude Include="..\..\Timer.h" />
-    <ClInclude Include="..\..\TurnEngine.h" />
     <ClInclude Include="..\..\UI\Books\UIMapBook.h" />
     <ClInclude Include="..\..\UI\Books\UINotesBooks.h" />
     <ClInclude Include="..\..\UI\Books\UISpellBook.h" />
@@ -498,10 +499,9 @@
     <ClInclude Include="..\..\UI\UISaveLoad.h" />
     <ClInclude Include="..\..\UI\UIShops.h" />
     <ClInclude Include="..\..\UI\UITransition.h" />
-    <ClInclude Include="..\..\VectorTypes.h" />
-    <ClInclude Include="..\..\ZlibWrapper.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\Engine\Objects\Player.swig" />
     <None Include="..\..\lib\legacy_dx\d3dvec.inl" />
     <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
       <FileType>Document</FileType>
@@ -518,11 +518,6 @@
     <None Include="..\..\lib\OpenAL\lib\x86\swresample-0.def" />
     <None Include="..\..\lib\OpenAL\lib\x86\swscale-2.def" />
     <None Include="..\..\lib\swig.bat" />
-    <None Include="..\..\Player.swig">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call "../../lib/swig" "%(FileName)" %(RelativeDir) "%(FileName)%(Extension)" "%(FullPath)" "$(SolutionDir)" %(Filename)_wrap.cxx</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)_wrap.cxx</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).swig</Message>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\lib\legacy_dx\lib\d3dxof.lib" />