--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Fri Sep 19 03:00:21 2014 +0600
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Fri Sep 19 04:21:12 2014 +0600
@@ -159,6 +159,26 @@
     <ClCompile Include="..\..\GUIFont.cpp" />
     <ClCompile Include="..\..\GUIProgressBar.cpp" />
     <ClCompile Include="..\..\GUIWindow.cpp" />
+    <ClCompile Include="..\..\GUI\NewUI\Core\UIControlModule_wrap.cxx" />
+    <ClCompile Include="..\..\GUI\NewUI\MainMenu.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\UIMapBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\UINotesBooks.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\UISpellBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIArena.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIBooks.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UICharacter.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UiGame.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIGuilds.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIHouses.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIMainMenu.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIMsgProc.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIOptions.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIPartyCreation.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIPopup.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIRest.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UISaveLoad.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIShops.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UITransition.cpp" />
     <ClCompile Include="..\..\Keyboard.cpp" />
     <ClCompile Include="..\..\lib\libpng\png.c" />
     <ClCompile Include="..\..\lib\libpng\pngerror.c" />
@@ -223,29 +243,9 @@
     <ClCompile Include="..\..\lib\zlib\zutil.c" />
     <ClCompile Include="..\..\MediaPlayer.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="..\..\stru6.cpp" />
-    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp" />
-    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp" />
-    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp" />
-    <ClCompile Include="..\..\UI\UIArena.cpp" />
-    <ClCompile Include="..\..\UI\UIBooks.cpp" />
-    <ClCompile Include="..\..\UI\UICharacter.cpp" />
-    <ClCompile Include="..\..\UI\UiGame.cpp" />
-    <ClCompile Include="..\..\UI\UIGuilds.cpp" />
-    <ClCompile Include="..\..\UI\UIHouses.cpp" />
-    <ClCompile Include="..\..\UI\UIMainMenu.cpp" />
-    <ClCompile Include="..\..\UI\UIMsgProc.cpp" />
-    <ClCompile Include="..\..\UI\UIOptions.cpp" />
-    <ClCompile Include="..\..\UI\UIPartyCreation.cpp" />
-    <ClCompile Include="..\..\UI\UIPopup.cpp" />
-    <ClCompile Include="..\..\UI\UIRest.cpp" />
-    <ClCompile Include="..\..\UI\UISaveLoad.cpp" />
-    <ClCompile Include="..\..\UI\UIShops.cpp" />
-    <ClCompile Include="..\..\UI\UITransition.cpp" />
     <ClCompile Include="..\..\_deleted.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -331,6 +331,26 @@
     <ClInclude Include="..\..\GUIFont.h" />
     <ClInclude Include="..\..\GUIProgressBar.h" />
     <ClInclude Include="..\..\GUIWindow.h" />
+    <ClInclude Include="..\..\GUI\NewUI\Core\UIControl.h" />
+    <ClInclude Include="..\..\GUI\NewUI\MainMenu.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\UIMapBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\UINotesBooks.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\UISpellBook.h" />
+    <ClInclude Include="..\..\GUI\UI\UIArena.h" />
+    <ClInclude Include="..\..\GUI\UI\UIBooks.h" />
+    <ClInclude Include="..\..\GUI\UI\UICharacter.h" />
+    <ClInclude Include="..\..\GUI\UI\UIGame.h" />
+    <ClInclude Include="..\..\GUI\UI\UIGuilds.h" />
+    <ClInclude Include="..\..\GUI\UI\UIHouses.h" />
+    <ClInclude Include="..\..\GUI\UI\UIMainMenu.h" />
+    <ClInclude Include="..\..\GUI\UI\UIMsgProc.h" />
+    <ClInclude Include="..\..\GUI\UI\UIOptions.h" />
+    <ClInclude Include="..\..\GUI\UI\UIPartyCreation.h" />
+    <ClInclude Include="..\..\GUI\UI\UIPopup.h" />
+    <ClInclude Include="..\..\GUI\UI\UIRest.h" />
+    <ClInclude Include="..\..\GUI\UI\UISaveLoad.h" />
+    <ClInclude Include="..\..\GUI\UI\UIShops.h" />
+    <ClInclude Include="..\..\GUI\UI\UITransition.h" />
     <ClInclude Include="..\..\Keyboard.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3d.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h" />
@@ -475,41 +495,16 @@
     <ClInclude Include="..\..\lib\zlib\zutil.h" />
     <ClInclude Include="..\..\MediaPlayer.h" />
     <ClInclude Include="..\..\Mouse.h" />
-    <ClInclude Include="..\..\NewUI\Core\UIControl.h" />
-    <ClInclude Include="..\..\NewUI\MainMenu.h" />
     <ClInclude Include="..\..\OpenALSoundProvider.h" />
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
     <ClInclude Include="..\..\stru6.h" />
-    <ClInclude Include="..\..\UI\Books\UIMapBook.h" />
-    <ClInclude Include="..\..\UI\Books\UINotesBooks.h" />
-    <ClInclude Include="..\..\UI\Books\UISpellBook.h" />
-    <ClInclude Include="..\..\UI\UIArena.h" />
-    <ClInclude Include="..\..\UI\UIBooks.h" />
-    <ClInclude Include="..\..\UI\UICharacter.h" />
-    <ClInclude Include="..\..\UI\UIGame.h" />
-    <ClInclude Include="..\..\UI\UIGuilds.h" />
-    <ClInclude Include="..\..\UI\UIHouses.h" />
-    <ClInclude Include="..\..\UI\UIMainMenu.h" />
-    <ClInclude Include="..\..\UI\UIMsgProc.h" />
-    <ClInclude Include="..\..\UI\UIOptions.h" />
-    <ClInclude Include="..\..\UI\UIPartyCreation.h" />
-    <ClInclude Include="..\..\UI\UIPopup.h" />
-    <ClInclude Include="..\..\UI\UIRest.h" />
-    <ClInclude Include="..\..\UI\UISaveLoad.h" />
-    <ClInclude Include="..\..\UI\UIShops.h" />
-    <ClInclude Include="..\..\UI\UITransition.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Engine\Objects\Player.swig" />
+    <None Include="..\..\GUI\NewUI\Core\UIControlModule.swig" />
     <None Include="..\..\lib\legacy_dx\d3dvec.inl" />
-    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
-      <FileType>Document</FileType>
-      <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>
-    </CustomBuild>
     <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def" />
     <None Include="..\..\lib\OpenAL\lib\x86\avdevice-55.def" />
     <None Include="..\..\lib\OpenAL\lib\x86\avfilter-3.def" />