# HG changeset patch
# User Ritor1
# Date 1408379040 -21600
# Node ID b61ebbb46acebcae7f08ee3e21939280f5ed5de5
# Parent  94cf712fc780c6fb815e8f0b3684b133f875ee20
VS 2010 filters

diff -r 94cf712fc780 -r b61ebbb46ace Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Aug 18 18:28:53 2014 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Aug 18 22:24:00 2014 +0600
@@ -1,287 +1,580 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <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="..\..\IndoorCameraD3D.h" />
-    <ClInclude Include="..\..\Indoor_stuff.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="..\..\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="..\..\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="..\..\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" />
-    <ClInclude Include="..\..\stru298.h" />
-    <ClInclude Include="..\..\stru314.h" />
-    <ClInclude Include="..\..\stru367.h" />
-    <ClInclude Include="..\..\stru6.h" />
-    <ClInclude Include="..\..\stru9.h" />
-    <ClInclude Include="..\..\texts.h" />
-    <ClInclude Include="..\..\Texture.h" />
-    <ClInclude Include="..\..\TileFrameTable.h" />
-    <ClInclude Include="..\..\TurnEngine.h" />
-    <ClInclude Include="..\..\VectorTypes.h" />
-    <ClInclude Include="..\..\Viewport.h" />
-    <ClInclude Include="..\..\Vis.h" />
-    <ClInclude Include="..\..\Weather.h" />
-    <ClInclude Include="..\..\NewUI\MainMenu.h">
-      <Filter>NewUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\NewUI\Core\UIControl.h">
-      <Filter>NewUI\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Level\Decoration.h">
-      <Filter>Level</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3d.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\ddraw.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3drm.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3drmdef.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3drmobj.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3drmwin.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\d3dtypes.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dinput.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dvoice.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dinputd.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmdls.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmerror.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmksctrl.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmplugin.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmusbuff.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmusicc.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmusicf.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmusici.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dmusics.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dsconf.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\dsound.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\multimon.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\legacy_dx\strsafe.h">
-      <Filter>lib\legacy_dx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua.h">
-      <Filter>lib\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lgc.h">
+    <Filter Include="lib">
+      <UniqueIdentifier>{01df770d-32ca-4bfa-8448-de7b6ae4b15c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\legacy_dx">
+      <UniqueIdentifier>{23711e0a-ee63-4da3-9c0d-22d02dd41747}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\lua">
+      <UniqueIdentifier>{9448e73a-c435-43ee-8586-08607774a0d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\zlib">
+      <UniqueIdentifier>{1d2c44d0-de33-46dd-a3bf-dce44afda794}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\lua\lua-5.2.2">
+      <UniqueIdentifier>{501083c0-a7b6-445f-a8fb-fa12cd345924}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\swig">
+      <UniqueIdentifier>{8fcbd31e-9742-48b4-87bf-e632eac8106d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\swig\swigwin-2.0.11">
+      <UniqueIdentifier>{8c52b1ac-9e41-4a16-be04-bdac9a244ac1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\OpenAL">
+      <UniqueIdentifier>{ee28ca77-318b-4477-8c10-1fc75d47b5b3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\OpenAL\lib">
+      <UniqueIdentifier>{9e09d25e-db72-4f51-b0f6-b5def5d61409}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\OpenAL\lib\OpenAL">
+      <UniqueIdentifier>{ccc1aed6-a901-4d62-9a78-319835aecfc4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\OpenAL\lib\x86">
+      <UniqueIdentifier>{23bc5e63-c1ce-4fc8-acb4-ccbdfe47483f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\libavcodec">
+      <UniqueIdentifier>{fe2f566e-4b3a-42e1-a216-30fbd39489a9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\libavformat">
+      <UniqueIdentifier>{4f270f5a-17cd-430b-985b-8384cc0655cb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\libavutil">
+      <UniqueIdentifier>{c972bce6-7e57-47ad-aea8-f5cf33c8bac2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\libswresample">
+      <UniqueIdentifier>{27d1b44b-0562-467b-abad-cb2f4ae78541}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\libswscale">
+      <UniqueIdentifier>{293e30b6-9ded-426f-a0be-425b0a877e93}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\libpng">
+      <UniqueIdentifier>{a768f30d-81a0-4858-a264-dd7120e64106}</UniqueIdentifier>
+    </Filter>
+    <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="..\..\lib\zlib\adler32.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\crc32.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\compress.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\deflate.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\infblock.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\infcodes.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\inffast.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\inflate.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\inftrees.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\infutil.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\trees.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\uncompr.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\zutil.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lapi.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lauxlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbaselib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbitlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcode.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcorolib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lctype.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldblib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldebug.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldo.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldump.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lfunc.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lgc.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\linit.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\liolib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\llex.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmathlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmem.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loadlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lobject.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lopcodes.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loslib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lparser.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstate.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstring.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstrlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltable.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltablib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltm.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lua.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c">
       <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lctype.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldebug.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldo.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lfunc.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lobject.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llex.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llimits.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lmem.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lopcodes.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lparser.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstate.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstring.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltable.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltm.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lua.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\luaconf.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lualib.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lundump.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\OurMath.h" />
-    <ClInclude Include="..\..\lib\zlib\deflate.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\infutil.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\infblock.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\infcodes.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\inffast.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\inffixed.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\inftrees.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\trees.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\zconf.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\zlib.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\lib\zlib\zutil.h">
-      <Filter>lib\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIBooks.h">
-      <Filter>UI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIHouses.h">
-      <Filter>UI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Timer.h" />
-    <ClInclude Include="..\..\LuaVM.h" />
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\png.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngerror.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngget.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngmem.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngpread.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngread.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngrio.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngrtran.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngrutil.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngset.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngtrans.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngwio.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngwrite.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngwtran.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libpng\pngwutil.c">
+      <Filter>lib\libpng</Filter>
+    </ClCompile>
+    <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>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="..\..\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="..\..\lib\libavcodec\avcodec.h">
       <Filter>lib\libavcodec</Filter>
     </ClInclude>
@@ -327,10 +620,10 @@
     <ClInclude Include="..\..\lib\libavutil\attributes.h">
       <Filter>lib\libavutil</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lib\libavutil\audio_fifo.h">
+    <ClInclude Include="..\..\lib\libavutil\audioconvert.h">
       <Filter>lib\libavutil</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lib\libavutil\audioconvert.h">
+    <ClInclude Include="..\..\lib\libavutil\audio_fifo.h">
       <Filter>lib\libavutil</Filter>
     </ClInclude>
     <ClInclude Include="..\..\lib\libavutil\avassert.h">
@@ -498,7 +791,192 @@
     <ClInclude Include="..\..\lib\OpenAL\xram.h">
       <Filter>lib\OpenAL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\mm7_unsorted_subs.h" />
+    <ClInclude Include="..\..\lib\zlib\deflate.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\infblock.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\infcodes.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\inffast.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\inffixed.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\inftrees.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\infutil.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\trees.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\zconf.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\zlib.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\zutil.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua.h">
+      <Filter>lib\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lctype.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldebug.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldo.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lfunc.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lgc.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llex.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llimits.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lmem.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lobject.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lopcodes.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lparser.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstate.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstring.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltable.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltm.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lua.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\luaconf.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lualib.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lundump.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3d.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drm.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drmdef.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drmobj.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drmwin.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3dtypes.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\ddraw.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dinput.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dinputd.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmdls.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmerror.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmksctrl.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmplugin.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusbuff.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusicc.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusicf.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusici.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusics.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dsconf.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dsound.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dvoice.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\multimon.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\strsafe.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\lib\libpng\png.h">
       <Filter>lib\libpng</Filter>
     </ClInclude>
@@ -520,100 +998,335 @@
     <ClInclude Include="..\..\lib\libpng\pngstruct.h">
       <Filter>lib\libpng</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\MMT.h" />
-    <ClInclude Include="..\..\MediaPlayer.h" />
-    <ClInclude Include="..\..\stuff.h" />
-    <ClInclude Include="..\..\OpenALSoundProvider.h" />
-    <ClInclude Include="..\..\ZlibWrapper.h" />
-    <ClInclude Include="..\..\GUIButton.h" />
-    <ClInclude Include="..\..\Registry.h" />
+    <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>UI</Filter>
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIBooks.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UICharacter.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIGame.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIGuilds.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIHouses.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIMainMenu.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIMsgProc.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIOptions.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIPartyCreation.h">
+      <Filter>GUI\UI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\DirectX11.h" />
-    <ClInclude Include="..\..\RenderStruct.h" />
-    <ClInclude Include="..\..\IRender.h" />
-    <ClInclude Include="..\..\RenderD3D11.h" />
+    <ClInclude Include="..\..\UI\UIPopup.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIRest.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UISaveLoad.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIShops.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UITransition.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\Books\UIMapBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\Books\UINotesBooks.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\Books\UISpellBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru9.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru10.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="lib">
-      <UniqueIdentifier>{674d5845-1afa-4bb4-b0f9-e59bdcf6bf46}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\legacy_dx">
-      <UniqueIdentifier>{7f786ac2-aa3f-48a5-81ef-d5bcf2ee57bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\zlib">
-      <UniqueIdentifier>{2c8eede3-bdcb-4411-b5e3-86c1c48e8351}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UI">
-      <UniqueIdentifier>{d3dc8b56-9b77-4b4f-adae-767b4576537d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UI\Books">
-      <UniqueIdentifier>{e97134e5-029e-4065-bcd8-a4a00333b990}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Level">
-      <UniqueIdentifier>{5fd52edd-099a-407a-b897-6a369c82b64f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NewUI">
-      <UniqueIdentifier>{161ab378-81a8-4a60-8b20-691a826dbb7d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NewUI\Core">
-      <UniqueIdentifier>{5905ea57-e631-40d3-9139-94e4ec73c51f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\swig">
-      <UniqueIdentifier>{2b5db0d5-d6c8-4aad-b295-ac2b5df51fb2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\lua">
-      <UniqueIdentifier>{247dd8f2-a9fc-4e53-bc8c-d8bbe255bfe4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\lua\lua-5.2.2">
-      <UniqueIdentifier>{410b9d18-77b5-461d-8b23-ba841039152e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\swig\swigwin-2.0.11">
-      <UniqueIdentifier>{cb1041ae-addb-49d8-9ec1-ffe52d29ae64}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\libavcodec">
-      <UniqueIdentifier>{00ba7ef3-081e-46d7-b651-f41dde1d3ff8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\libavformat">
-      <UniqueIdentifier>{297ce683-6a2f-4d6b-b4ae-10cc59f75ebc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\libavutil">
-      <UniqueIdentifier>{22b53a53-f99c-40ac-82fd-647f5012b96a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\libswresample">
-      <UniqueIdentifier>{1d0988f5-957a-4c5b-b76a-d1f57a7ac8d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\libswscale">
-      <UniqueIdentifier>{10d851fd-bca4-46a3-9377-0a3ae5f6e9df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\OpenAL">
-      <UniqueIdentifier>{afaf8737-a450-48fc-91ad-a5f55625d40a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\OpenAL\lib">
-      <UniqueIdentifier>{bfeab783-b0c1-4ad6-937d-e0914f011587}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\OpenAL\lib\OpenAL">
-      <UniqueIdentifier>{009e95ff-193d-47cc-9e52-e74b803c7aac}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\OpenAL\lib\x86">
-      <UniqueIdentifier>{a28acffc-17d1-41fd-a206-c4c035a4e7b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lib\libpng">
-      <UniqueIdentifier>{5d7a00de-eade-4ace-bfef-35f43bd8516d}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\lib\legacy_dx\d3dvec.inl">
-      <Filter>lib\legacy_dx</Filter>
-    </None>
-    <None Include="..\..\lib\swig.bat">
-      <Filter>lib</Filter>
-    </None>
-    <None Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule.swig">
-      <Filter>lib\swig\swigwin-2.0.11</Filter>
-    </None>
-    <None Include="..\..\Player.swig" />
     <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def">
       <Filter>lib\OpenAL\lib\x86</Filter>
     </None>
@@ -638,337 +1351,18 @@
     <None Include="..\..\lib\OpenAL\lib\x86\swscale-2.def">
       <Filter>lib\OpenAL\lib\x86</Filter>
     </None>
-    <None Include="..\..\README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <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="..\..\mm7text_ru.cpp" />
-    <ClCompile Include="..\..\mm7_7.cpp" />
-    <ClCompile Include="..\..\mm7_data.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="..\..\TurnEngine.cpp" />
-    <ClCompile Include="..\..\VectorTypes.cpp" />
-    <ClCompile Include="..\..\Viewport.cpp" />
-    <ClCompile Include="..\..\Vis.cpp" />
-    <ClCompile Include="..\..\Weather.cpp" />
-    <ClCompile Include="..\..\_deleted.cpp" />
-    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx">
-      <Filter>NewUI\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\NewUI\MainMenu.cpp">
-      <Filter>NewUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Level\Decoration.cpp">
-      <Filter>Level</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lapi.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lauxlib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbaselib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbitlib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcode.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcorolib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lctype.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldblib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldebug.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldo.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldump.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lfunc.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lgc.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\linit.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\liolib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\llex.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmathlib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmem.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loadlib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lobject.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lopcodes.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loslib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lparser.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstate.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstring.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstrlib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltable.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltablib.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltm.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lua.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c">
-      <Filter>lib\lua\lua-5.2.2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\adler32.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\compress.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\crc32.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\deflate.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\infblock.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\infcodes.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\inffast.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\inflate.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\inftrees.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\infutil.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\trees.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\uncompr.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\zlib\zutil.c">
-      <Filter>lib\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIBooks.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UITransition.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\Books\UIMapBook.cpp">
-      <Filter>UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp">
-      <Filter>UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp">
-      <Filter>UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Timer.cpp" />
-    <ClCompile Include="..\..\LuaVM.cpp" />
-    <ClCompile Include="..\..\Player_wrap.cxx" />
-    <ClCompile Include="..\..\MapInfo.cpp" />
-    <ClCompile Include="..\..\lib\libpng\png.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngerror.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngget.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngmem.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngpread.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngread.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngrio.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngrtran.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngrutil.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngset.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngtrans.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngwio.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngwrite.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngwtran.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\lib\libpng\pngwutil.c">
-      <Filter>lib\libpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\MMT.cpp" />
-    <ClCompile Include="..\..\MediaPlayer.cpp" />
-    <ClCompile Include="..\..\ZlibWrapper.cpp" />
-    <ClCompile Include="..\..\OurMath.cpp" />
-    <ClCompile Include="..\..\Registry.cpp" />
-    <ClCompile Include="..\..\UI\UIArena.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DirectX11.cpp" />
-    <ClCompile Include="..\..\RenderD3D11.cpp" />
-    <ClCompile Include="..\..\PlayerFrameTable.cpp" />
-    <ClCompile Include="..\..\stru298.cpp" />
-    <ClCompile Include="..\..\FactionTable.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
-      <Filter>NewUI\Core</Filter>
-    </CustomBuild>
+    <None Include="..\..\lib\legacy_dx\d3dvec.inl">
+      <Filter>lib\legacy_dx</Filter>
+    </None>
+    <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>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\lib\OpenAL\lib\OpenAL\OpenAL32.lib">
diff -r 94cf712fc780 -r b61ebbb46ace Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Mon Aug 18 18:28:53 2014 +0600
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Mon Aug 18 22:24:00 2014 +0600
@@ -1363,9 +1363,6 @@
     <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">