diff --git a/src/BoE.vsproj/Common/Common.vcxproj b/src/BoE.vsproj/Common/Common.vcxproj
index 4b3d8aa5..72107ae6 100644
--- a/src/BoE.vsproj/Common/Common.vcxproj
+++ b/src/BoE.vsproj/Common/Common.vcxproj
@@ -10,130 +10,6 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\classes\creatlist.hpp" />
-    <ClInclude Include="..\..\classes\creature.hpp" />
-    <ClInclude Include="..\..\classes\item.hpp" />
-    <ClInclude Include="..\..\classes\living.hpp" />
-    <ClInclude Include="..\..\classes\location.hpp" />
-    <ClInclude Include="..\..\classes\monster.hpp" />
-    <ClInclude Include="..\..\classes\outdoors.hpp" />
-    <ClInclude Include="..\..\classes\party.hpp" />
-    <ClInclude Include="..\..\classes\pc.hpp" />
-    <ClInclude Include="..\..\classes\scenario.hpp" />
-    <ClInclude Include="..\..\classes\shop.hpp" />
-    <ClInclude Include="..\..\classes\simpletypes.hpp" />
-    <ClInclude Include="..\..\classes\special.hpp" />
-    <ClInclude Include="..\..\classes\spell.hpp" />
-    <ClInclude Include="..\..\classes\talking.hpp" />
-    <ClInclude Include="..\..\classes\terrain.hpp" />
-    <ClInclude Include="..\..\classes\town.hpp" />
-    <ClInclude Include="..\..\classes\universe.hpp" />
-    <ClInclude Include="..\..\classes\vehicle.hpp" />
-    <ClInclude Include="..\..\dialogxml\3choice.hpp" />
-    <ClInclude Include="..\..\dialogxml\button.hpp" />
-    <ClInclude Include="..\..\dialogxml\choicedlog.hpp" />
-    <ClInclude Include="..\..\dialogxml\control.hpp" />
-    <ClInclude Include="..\..\dialogxml\dialog.hpp" />
-    <ClInclude Include="..\..\dialogxml\dialog.keys.hpp" />
-    <ClInclude Include="..\..\dialogxml\dlogevt.hpp" />
-    <ClInclude Include="..\..\dialogxml\field.hpp" />
-    <ClInclude Include="..\..\dialogxml\message.hpp" />
-    <ClInclude Include="..\..\dialogxml\pict.hpp" />
-    <ClInclude Include="..\..\dialogxml\pictchoice.hpp" />
-    <ClInclude Include="..\..\dialogxml\scrollbar.hpp" />
-    <ClInclude Include="..\..\dialogxml\scrollpane.hpp" />
-    <ClInclude Include="..\..\dialogxml\stack.hpp" />
-    <ClInclude Include="..\..\dialogxml\strchoice.hpp" />
-    <ClInclude Include="..\..\dialogxml\strdlog.hpp" />
-    <ClInclude Include="..\..\dialogxml\xml-parser\ticpp.h" />
-    <ClInclude Include="..\..\dialogxml\xml-parser\ticpprc.h" />
-    <ClInclude Include="..\..\dialogxml\xml-parser\tinystr.h" />
-    <ClInclude Include="..\..\dialogxml\xml-parser\tinyxml.h" />
-    <ClInclude Include="..\..\dialogxml\xml-parser\tinyprint.h" />
-    <ClInclude Include="..\..\oldstructs.hpp" />
-    <ClInclude Include="..\..\tools\cursors.hpp" />
-    <ClInclude Include="..\..\tools\fileio.hpp" />
-    <ClInclude Include="..\..\tools\graphtool.hpp" />
-    <ClInclude Include="..\..\tools\gzstream\gzstream.h" />
-    <ClInclude Include="..\..\tools\map_parse.hpp" />
-    <ClInclude Include="..\..\tools\mathutil.hpp" />
-    <ClInclude Include="..\..\tools\menu_accel.win.hpp" />
-    <ClInclude Include="..\..\tools\porting.hpp" />
-    <ClInclude Include="..\..\tools\prefs.hpp" />
-    <ClInclude Include="..\..\tools\resmgr\resmgr.hpp" />
-    <ClInclude Include="..\..\tools\resmgr\restypes.hpp" />
-    <ClInclude Include="..\..\tools\soundtool.hpp" />
-    <ClInclude Include="..\..\tools\special_parse.hpp" />
-    <ClInclude Include="..\..\tools\tarball.hpp" />
-    <ClInclude Include="..\..\tools\undo.hpp" />
-    <ClInclude Include="..\..\tools\vector2d.hpp" />
-    <ClInclude Include="..\..\tools\view_dialogs.hpp" />
-    <ClInclude Include="..\..\tools\winutil.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\classes\creatlist.cpp" />
-    <ClCompile Include="..\..\classes\creature.cpp" />
-    <ClCompile Include="..\..\classes\estreams.cpp" />
-    <ClCompile Include="..\..\classes\item.cpp" />
-    <ClCompile Include="..\..\classes\living.cpp" />
-    <ClCompile Include="..\..\classes\location.cpp" />
-    <ClCompile Include="..\..\classes\monster.cpp" />
-    <ClCompile Include="..\..\classes\outdoors.cpp" />
-    <ClCompile Include="..\..\classes\party.cpp" />
-    <ClCompile Include="..\..\classes\pc.cpp" />
-    <ClCompile Include="..\..\classes\scenario.cpp" />
-    <ClCompile Include="..\..\classes\shop.cpp" />
-    <ClCompile Include="..\..\classes\special.cpp" />
-    <ClCompile Include="..\..\classes\spell.cpp" />
-    <ClCompile Include="..\..\classes\talking.cpp" />
-    <ClCompile Include="..\..\classes\terrain.cpp" />
-    <ClCompile Include="..\..\classes\town.cpp" />
-    <ClCompile Include="..\..\classes\universe.cpp" />
-    <ClCompile Include="..\..\classes\vehicle.cpp" />
-    <ClCompile Include="..\..\dialogxml\3choice.cpp" />
-    <ClCompile Include="..\..\dialogxml\basicbtns.cpp" />
-    <ClCompile Include="..\..\dialogxml\button.cpp" />
-    <ClCompile Include="..\..\dialogxml\choicedlog.cpp" />
-    <ClCompile Include="..\..\dialogxml\control.cpp" />
-    <ClCompile Include="..\..\dialogxml\dialog.cpp" />
-    <ClCompile Include="..\..\dialogxml\field.cpp" />
-    <ClCompile Include="..\..\dialogxml\message.cpp" />
-    <ClCompile Include="..\..\dialogxml\pict.cpp" />
-    <ClCompile Include="..\..\dialogxml\pictchoice.cpp" />
-    <ClCompile Include="..\..\dialogxml\scrollbar.cpp" />
-    <ClCompile Include="..\..\dialogxml\scrollpane.cpp" />
-    <ClCompile Include="..\..\dialogxml\stack.cpp" />
-    <ClCompile Include="..\..\dialogxml\strchoice.cpp" />
-    <ClCompile Include="..\..\dialogxml\strdlog.cpp" />
-    <ClCompile Include="..\..\dialogxml\xml-parser\ticpp.cpp" />
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinystr.cpp" />
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyxml.cpp" />
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyprint.cpp" />
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlerror.cpp" />
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlparser.cpp" />
-    <ClCompile Include="..\..\tools\cursors.win.cpp" />
-    <ClCompile Include="..\..\tools\debugout.win.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\fileio.cpp" />
-    <ClCompile Include="..\..\tools\fileio_party.cpp" />
-    <ClCompile Include="..\..\tools\fileio_scen.cpp" />
-    <ClCompile Include="..\..\tools\graphtool.cpp" />
-    <ClCompile Include="..\..\tools\gzstream\gzstream.cpp" />
-    <ClCompile Include="..\..\tools\map_parse.cpp" />
-    <ClCompile Include="..\..\tools\mathutil.cpp" />
-    <ClCompile Include="..\..\tools\menu_accel.win.cpp" />
-    <ClCompile Include="..\..\tools\porting.cpp" />
-    <ClCompile Include="..\..\tools\prefs.win.cpp" />
-    <ClCompile Include="..\..\tools\resmgr\restypes.cpp" />
-    <ClCompile Include="..\..\tools\soundtool.cpp" />
-    <ClCompile Include="..\..\tools\specials_parse.cpp" />
-    <ClCompile Include="..\..\tools\tarball.cpp" />
-    <ClCompile Include="..\..\tools\undo.cpp" />
-    <ClCompile Include="..\..\tools\view_dialogs.cpp" />
-    <ClCompile Include="..\..\tools\winutil.win.cpp" />
-  </ItemGroup>
   <ItemGroup>
     <Xml Include="..\..\..\rsrc\dialogs\1str-lg.xml" />
     <Xml Include="..\..\..\rsrc\dialogs\1str-title-lg.xml" />
@@ -315,6 +191,159 @@
     <Xml Include="..\..\..\rsrc\dialogs\view-sign.xml" />
     <Xml Include="..\..\..\rsrc\dialogs\welcome.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\dialogxml\dialogs\3choice.cpp" />
+    <ClCompile Include="..\..\dialogxml\dialogs\choicedlog.cpp" />
+    <ClCompile Include="..\..\dialogxml\dialogs\dialog.cpp" />
+    <ClCompile Include="..\..\dialogxml\dialogs\pictchoice.cpp" />
+    <ClCompile Include="..\..\dialogxml\dialogs\strchoice.cpp" />
+    <ClCompile Include="..\..\dialogxml\dialogs\strdlog.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\basicbtns.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\button.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\control.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\field.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\message.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\pict.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\scrollbar.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\scrollpane.cpp" />
+    <ClCompile Include="..\..\dialogxml\widgets\stack.cpp" />
+    <ClCompile Include="..\..\fileio\debugout.win.cpp" />
+    <ClCompile Include="..\..\fileio\estreams.cpp" />
+    <ClCompile Include="..\..\fileio\fileio.cpp" />
+    <ClCompile Include="..\..\fileio\fileio_party.cpp" />
+    <ClCompile Include="..\..\fileio\fileio_scen.cpp" />
+    <ClCompile Include="..\..\fileio\gzstream\gzstream.cpp" />
+    <ClCompile Include="..\..\fileio\map_parse.cpp" />
+    <ClCompile Include="..\..\fileio\resmgr\restypes.cpp" />
+    <ClCompile Include="..\..\fileio\special_parse.cpp" />
+    <ClCompile Include="..\..\fileio\tarball.cpp" />
+    <ClCompile Include="..\..\fileio\xml-parser\ticpp.cpp" />
+    <ClCompile Include="..\..\fileio\xml-parser\tinyprint.cpp" />
+    <ClCompile Include="..\..\fileio\xml-parser\tinystr.cpp" />
+    <ClCompile Include="..\..\fileio\xml-parser\tinyxml.cpp" />
+    <ClCompile Include="..\..\fileio\xml-parser\tinyxmlerror.cpp" />
+    <ClCompile Include="..\..\fileio\xml-parser\tinyxmlparser.cpp" />
+    <ClCompile Include="..\..\gfx\gfxsheets.cpp" />
+    <ClCompile Include="..\..\gfx\render_image.cpp" />
+    <ClCompile Include="..\..\gfx\render_shapes.cpp" />
+    <ClCompile Include="..\..\gfx\render_text.cpp" />
+    <ClCompile Include="..\..\gfx\tiling.cpp" />
+    <ClCompile Include="..\..\location.cpp" />
+    <ClCompile Include="..\..\mathutil.cpp" />
+    <ClCompile Include="..\..\oldstructs.cpp" />
+    <ClCompile Include="..\..\porting.cpp" />
+    <ClCompile Include="..\..\scenario\item.cpp" />
+    <ClCompile Include="..\..\scenario\monster.cpp" />
+    <ClCompile Include="..\..\scenario\outdoors.cpp" />
+    <ClCompile Include="..\..\scenario\scenario.cpp" />
+    <ClCompile Include="..\..\scenario\shop.cpp" />
+    <ClCompile Include="..\..\scenario\special.cpp" />
+    <ClCompile Include="..\..\scenario\talking.cpp" />
+    <ClCompile Include="..\..\scenario\terrain.cpp" />
+    <ClCompile Include="..\..\scenario\town.cpp" />
+    <ClCompile Include="..\..\scenario\vehicle.cpp" />
+    <ClCompile Include="..\..\sounds.cpp" />
+    <ClCompile Include="..\..\spell.cpp" />
+    <ClCompile Include="..\..\tools\cursors.win.cpp" />
+    <ClCompile Include="..\..\tools\menu_accel.win.cpp" />
+    <ClCompile Include="..\..\tools\prefs.win.cpp" />
+    <ClCompile Include="..\..\tools\undo.cpp" />
+    <ClCompile Include="..\..\tools\winutil.win.cpp" />
+    <ClCompile Include="..\..\universe\creature.cpp" />
+    <ClCompile Include="..\..\universe\living.cpp" />
+    <ClCompile Include="..\..\universe\party.cpp" />
+    <ClCompile Include="..\..\universe\pc.cpp" />
+    <ClCompile Include="..\..\universe\population.cpp" />
+    <ClCompile Include="..\..\universe\universe.cpp" />
+    <ClCompile Include="..\..\utility.cpp" />
+    <ClCompile Include="..\..\view_dialogs.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\alchemy.hpp" />
+    <ClInclude Include="..\..\damage.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\3choice.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\choicedlog.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\dialog.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\dialog.keys.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\dlogevt.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\pictchoice.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\strchoice.hpp" />
+    <ClInclude Include="..\..\dialogxml\dialogs\strdlog.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\button.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\control.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\field.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\message.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\pict.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\pictypes.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\scrollbar.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\scrollpane.hpp" />
+    <ClInclude Include="..\..\dialogxml\widgets\stack.hpp" />
+    <ClInclude Include="..\..\fields.hpp" />
+    <ClInclude Include="..\..\fileio\fileio.hpp" />
+    <ClInclude Include="..\..\fileio\gzstream\gzstream.h" />
+    <ClInclude Include="..\..\fileio\map_parse.hpp" />
+    <ClInclude Include="..\..\fileio\resmgr\resmgr.hpp" />
+    <ClInclude Include="..\..\fileio\resmgr\res_cursor.hpp" />
+    <ClInclude Include="..\..\fileio\resmgr\res_font.hpp" />
+    <ClInclude Include="..\..\fileio\resmgr\res_image.hpp" />
+    <ClInclude Include="..\..\fileio\resmgr\res_sound.hpp" />
+    <ClInclude Include="..\..\fileio\resmgr\res_strings.hpp" />
+    <ClInclude Include="..\..\fileio\special_parse.hpp" />
+    <ClInclude Include="..\..\fileio\tarball.hpp" />
+    <ClInclude Include="..\..\fileio\xml-parser\ticpp.h" />
+    <ClInclude Include="..\..\fileio\xml-parser\ticpprc.h" />
+    <ClInclude Include="..\..\fileio\xml-parser\tinyprint.h" />
+    <ClInclude Include="..\..\fileio\xml-parser\tinystr.h" />
+    <ClInclude Include="..\..\fileio\xml-parser\tinyxml.h" />
+    <ClInclude Include="..\..\gfx\gfxsheets.hpp" />
+    <ClInclude Include="..\..\gfx\render_image.hpp" />
+    <ClInclude Include="..\..\gfx\render_shapes.hpp" />
+    <ClInclude Include="..\..\gfx\render_text.hpp" />
+    <ClInclude Include="..\..\gfx\tiling.hpp" />
+    <ClInclude Include="..\..\global.hpp" />
+    <ClInclude Include="..\..\location.hpp" />
+    <ClInclude Include="..\..\mathutil.hpp" />
+    <ClInclude Include="..\..\oldstructs.hpp" />
+    <ClInclude Include="..\..\porting.hpp" />
+    <ClInclude Include="..\..\race.hpp" />
+    <ClInclude Include="..\..\scenario\area.hpp" />
+    <ClInclude Include="..\..\scenario\item.hpp" />
+    <ClInclude Include="..\..\scenario\item_abilities.hpp" />
+    <ClInclude Include="..\..\scenario\item_variety.hpp" />
+    <ClInclude Include="..\..\scenario\monster.hpp" />
+    <ClInclude Include="..\..\scenario\monster_abilities.hpp" />
+    <ClInclude Include="..\..\scenario\outdoors.hpp" />
+    <ClInclude Include="..\..\scenario\quest.hpp" />
+    <ClInclude Include="..\..\scenario\scenario.hpp" />
+    <ClInclude Include="..\..\scenario\shop.hpp" />
+    <ClInclude Include="..\..\scenario\special.hpp" />
+    <ClInclude Include="..\..\scenario\talking.hpp" />
+    <ClInclude Include="..\..\scenario\terrain.hpp" />
+    <ClInclude Include="..\..\scenario\terrain_abilities.hpp" />
+    <ClInclude Include="..\..\scenario\town.hpp" />
+    <ClInclude Include="..\..\scenario\vehicle.hpp" />
+    <ClInclude Include="..\..\skills_traits.hpp" />
+    <ClInclude Include="..\..\sounds.hpp" />
+    <ClInclude Include="..\..\spell.hpp" />
+    <ClInclude Include="..\..\tools\cursors.hpp" />
+    <ClInclude Include="..\..\tools\gitrev.hpp" />
+    <ClInclude Include="..\..\tools\menu_accel.win.hpp" />
+    <ClInclude Include="..\..\tools\prefs.hpp" />
+    <ClInclude Include="..\..\tools\undo.hpp" />
+    <ClInclude Include="..\..\tools\vector2d.hpp" />
+    <ClInclude Include="..\..\tools\winutil.hpp" />
+    <ClInclude Include="..\..\universe\creature.hpp" />
+    <ClInclude Include="..\..\universe\living.hpp" />
+    <ClInclude Include="..\..\universe\party.hpp" />
+    <ClInclude Include="..\..\universe\pc.hpp" />
+    <ClInclude Include="..\..\universe\population.hpp" />
+    <ClInclude Include="..\..\universe\universe.hpp" />
+    <ClInclude Include="..\..\utility.hpp" />
+    <ClInclude Include="..\..\view_dialogs.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\scenario\town_import.tpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1347FE79-73BD-4176-9280-0FE39E3534E2}</ProjectGuid>
     <RootNamespace>Common</RootNamespace>
@@ -376,10 +405,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\universe;..\..\tools;..\..\scenario;..\..\gfx;..\..\fileio\resmgr;..\..\fileio\xml-parser;..\..\fileio\gzstream;..\..\fileio;..\..\dialogxml\widgets;..\..\dialogxml\dialogs;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
+      <ForcedIncludeFiles>global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/BoE.vsproj/Common/Common.vcxproj.filters b/src/BoE.vsproj/Common/Common.vcxproj.filters
index acd4e09f..048f0c72 100644
--- a/src/BoE.vsproj/Common/Common.vcxproj.filters
+++ b/src/BoE.vsproj/Common/Common.vcxproj.filters
@@ -5,403 +5,42 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="DialogXML">
-      <UniqueIdentifier>{243e7be1-5ae2-447e-a151-1f024281fc3e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tools">
-      <UniqueIdentifier>{e57ca16d-7be8-4847-8a66-2255b728c9ac}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{f35d1cde-8f80-49ab-8f96-3fa8a44ce491}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes\Source Files">
-      <UniqueIdentifier>{606f67f8-5f1e-4b19-b417-0757fa8544ef}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="DialogXML\Source Files">
-      <UniqueIdentifier>{71426284-8f6d-42cb-8685-4d92d8e96879}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Tools\Source Files">
-      <UniqueIdentifier>{f41285d1-bf7b-4650-b2e5-0f816e52bac2}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Classes\Header Files">
-      <UniqueIdentifier>{28d415a1-e037-4a8b-bbdb-a6553b192bc3}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="DialogXML\Header Files">
-      <UniqueIdentifier>{17e8463f-156d-44db-9607-b2b5b0c426bb}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Tools\Header Files">
-      <UniqueIdentifier>{a6d8701d-a0e3-4429-8eec-3d0bad13c3f5}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="DialogXML\TinyXML">
-      <UniqueIdentifier>{b705522f-daf8-4db2-9cec-f5ae249e595e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files\dialogs">
       <UniqueIdentifier>{5d335c3d-6ae4-4d05-b007-69721325a967}</UniqueIdentifier>
     </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\classes\creatlist.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\item.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\location.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\monster.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\outdoors.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\party.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\pc.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\scenario.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\shop.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\simpletypes.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\special.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\spell.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\talking.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\terrain.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\town.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\universe.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\vehicle.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\xml-parser\ticpp.h">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\xml-parser\ticpprc.h">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\xml-parser\tinystr.h">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\xml-parser\tinyxml.h">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\xml-parser\tinyprint.h">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\button.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\control.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\dialog.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\dialog.keys.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\dlogevt.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\field.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\message.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\pict.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\scrollbar.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\scrollpane.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\stack.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\cursors.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\fileio.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\graphtool.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\map_parse.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\mathutil.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\porting.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\prefs.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\soundtool.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\special_parse.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\tarball.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\undo.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\vector2d.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\winutil.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\resmgr\resmgr.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\resmgr\restypes.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\gzstream\gzstream.h">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\oldstructs.hpp">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\creature.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\classes\living.hpp">
-      <Filter>Classes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\menu_accel.win.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\pictchoice.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\strchoice.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\strdlog.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\3choice.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dialogxml\choicedlog.hpp">
-      <Filter>DialogXML\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools\view_dialogs.hpp">
-      <Filter>Tools\Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\classes\creatlist.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\estreams.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\item.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\location.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\monster.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\outdoors.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\party.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\pc.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\scenario.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\shop.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\special.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\spell.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\talking.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\terrain.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\town.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\universe.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\vehicle.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\xml-parser\ticpp.cpp">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinystr.cpp">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyxml.cpp">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyprint.cpp">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlerror.cpp">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlparser.cpp">
-      <Filter>DialogXML\TinyXML</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\button.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\control.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\dialog.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\field.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\message.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\pict.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\scrollbar.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\scrollpane.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\stack.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\gzstream\gzstream.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\fileio.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\graphtool.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\map_parse.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\mathutil.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\porting.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\resmgr\restypes.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\soundtool.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\specials_parse.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\tarball.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\undo.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\cursors.win.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\prefs.win.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\winutil.win.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\debugout.win.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\fileio_party.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\fileio_scen.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\creature.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\classes\living.cpp">
-      <Filter>Classes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\menu_accel.win.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\3choice.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\basicbtns.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\choicedlog.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\pictchoice.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\strchoice.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dialogxml\strdlog.cpp">
-      <Filter>DialogXML\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\tools\view_dialogs.cpp">
-      <Filter>Tools\Source Files</Filter>
-    </ClCompile>
+    <Filter Include="DialogXML">
+      <UniqueIdentifier>{c78081e9-5fcc-42b4-83e6-e97f255c7c69}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FileIO">
+      <UniqueIdentifier>{9cf330f0-f1c7-4eff-83b2-0b7253c81e40}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Gfx">
+      <UniqueIdentifier>{25408791-aa64-420c-82db-c08d15a65c8e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Scenario">
+      <UniqueIdentifier>{7ddcd53c-6f86-42a9-bfbb-3c18ba379af2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tools">
+      <UniqueIdentifier>{e99762eb-c38d-463e-a2c1-27bfa23b93fa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Universe">
+      <UniqueIdentifier>{f8858365-92f5-45d5-9c3a-6b2e9e2a0bf9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FileIO\TinyXML">
+      <UniqueIdentifier>{e676530f-5465-4969-96a2-b85db36da228}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FileIO\ResMgr">
+      <UniqueIdentifier>{4b48df9b-6971-4ad6-91db-a78325f5ab74}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FileIO\GZStream">
+      <UniqueIdentifier>{c7414c7f-ccee-4571-8ed3-2d2c6e0d24f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DialogXML\Dialogs">
+      <UniqueIdentifier>{824a5f91-f8e5-4e7e-99c9-f1f05c28b7c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DialogXML\Widgets">
+      <UniqueIdentifier>{a468bac4-397d-45da-bfcd-281b8b5f55c0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="..\..\..\rsrc\dialogs\1str.xml">
@@ -942,4 +581,407 @@
       <Filter>Resource Files\dialogs</Filter>
     </Xml>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\utility.cpp" />
+    <ClCompile Include="..\..\view_dialogs.cpp" />
+    <ClCompile Include="..\..\location.cpp" />
+    <ClCompile Include="..\..\mathutil.cpp" />
+    <ClCompile Include="..\..\porting.cpp" />
+    <ClCompile Include="..\..\sounds.cpp" />
+    <ClCompile Include="..\..\spell.cpp" />
+    <ClCompile Include="..\..\universe\creature.cpp">
+      <Filter>Universe</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\universe\living.cpp">
+      <Filter>Universe</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\universe\party.cpp">
+      <Filter>Universe</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\universe\pc.cpp">
+      <Filter>Universe</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\universe\population.cpp">
+      <Filter>Universe</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\universe\universe.cpp">
+      <Filter>Universe</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tools\winutil.win.cpp">
+      <Filter>Tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tools\cursors.win.cpp">
+      <Filter>Tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tools\menu_accel.win.cpp">
+      <Filter>Tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tools\prefs.win.cpp">
+      <Filter>Tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tools\undo.cpp">
+      <Filter>Tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\special.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\talking.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\terrain.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\town.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\vehicle.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\item.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\monster.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\outdoors.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\scenario.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scenario\shop.cpp">
+      <Filter>Scenario</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\render_image.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\render_shapes.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\render_text.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\tiling.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\gfxsheets.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\debugout.win.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\estreams.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\fileio.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\fileio_party.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\fileio_scen.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\map_parse.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\special_parse.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\tarball.cpp">
+      <Filter>FileIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\xml-parser\tinystr.cpp">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\xml-parser\tinyxml.cpp">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\xml-parser\tinyxmlerror.cpp">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\xml-parser\tinyxmlparser.cpp">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\xml-parser\ticpp.cpp">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\xml-parser\tinyprint.cpp">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\gzstream\gzstream.cpp">
+      <Filter>FileIO\GZStream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fileio\resmgr\restypes.cpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\dialogs\pictchoice.cpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\dialogs\strchoice.cpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\dialogs\strdlog.cpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\dialogs\3choice.cpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\dialogs\choicedlog.cpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\dialogs\dialog.cpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\message.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\pict.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\scrollbar.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\scrollpane.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\stack.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\basicbtns.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\button.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\control.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dialogxml\widgets\field.cpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\oldstructs.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\utility.hpp" />
+    <ClInclude Include="..\..\view_dialogs.hpp" />
+    <ClInclude Include="..\..\alchemy.hpp" />
+    <ClInclude Include="..\..\damage.hpp" />
+    <ClInclude Include="..\..\fields.hpp" />
+    <ClInclude Include="..\..\global.hpp" />
+    <ClInclude Include="..\..\location.hpp" />
+    <ClInclude Include="..\..\mathutil.hpp" />
+    <ClInclude Include="..\..\oldstructs.hpp" />
+    <ClInclude Include="..\..\porting.hpp" />
+    <ClInclude Include="..\..\race.hpp" />
+    <ClInclude Include="..\..\skills_traits.hpp" />
+    <ClInclude Include="..\..\sounds.hpp" />
+    <ClInclude Include="..\..\spell.hpp" />
+    <ClInclude Include="..\..\universe\universe.hpp">
+      <Filter>Universe</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\universe\creature.hpp">
+      <Filter>Universe</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\universe\living.hpp">
+      <Filter>Universe</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\universe\party.hpp">
+      <Filter>Universe</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\universe\pc.hpp">
+      <Filter>Universe</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\universe\population.hpp">
+      <Filter>Universe</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\winutil.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\cursors.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\gitrev.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\menu_accel.win.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\prefs.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\undo.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tools\vector2d.hpp">
+      <Filter>Tools</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\shop.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\special.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\talking.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\terrain.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\terrain_abilities.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\town.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\vehicle.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\area.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\item.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\item_abilities.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\item_variety.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\monster.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\monster_abilities.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\outdoors.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\quest.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\scenario\scenario.hpp">
+      <Filter>Scenario</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\gfxsheets.hpp">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\render_image.hpp">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\render_shapes.hpp">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\render_text.hpp">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\tiling.hpp">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\fileio.hpp">
+      <Filter>FileIO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\map_parse.hpp">
+      <Filter>FileIO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\special_parse.hpp">
+      <Filter>FileIO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\tarball.hpp">
+      <Filter>FileIO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\xml-parser\tinystr.h">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\xml-parser\tinyxml.h">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\xml-parser\ticpp.h">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\xml-parser\ticpprc.h">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\xml-parser\tinyprint.h">
+      <Filter>FileIO\TinyXML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\gzstream\gzstream.h">
+      <Filter>FileIO\GZStream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\resmgr\res_image.hpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\resmgr\res_sound.hpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\resmgr\res_strings.hpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\resmgr\resmgr.hpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\resmgr\res_cursor.hpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fileio\resmgr\res_font.hpp">
+      <Filter>FileIO\ResMgr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\pictchoice.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\strchoice.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\strdlog.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\3choice.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\choicedlog.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\dialog.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\dialog.keys.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\dialogs\dlogevt.hpp">
+      <Filter>DialogXML\Dialogs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\message.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\pict.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\pictypes.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\scrollbar.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\scrollpane.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\stack.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\button.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\control.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\dialogxml\widgets\field.hpp">
+      <Filter>DialogXML\Widgets</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\scenario\town_import.tpp">
+      <Filter>Scenario</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/BoE.vsproj/Game/Blades of Exile.vcxproj b/src/BoE.vsproj/Game/Blades of Exile.vcxproj
index 4f83e470..1b80a3b3 100644
--- a/src/BoE.vsproj/Game/Blades of Exile.vcxproj	
+++ b/src/BoE.vsproj/Game/Blades of Exile.vcxproj	
@@ -74,10 +74,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\rsrc\menus;..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\rsrc\menus\;..\..\game;..\..\universe;..\..\tools;..\..\scenario;..\..\gfx;..\..\fileio\resmgr;..\..\fileio\xml-parser;..\..\fileio\gzstream;..\..\fileio;..\..\dialogxml\widgets;..\..\dialogxml\dialogs;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
+      <ForcedIncludeFiles>global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -95,53 +96,51 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\boe.actions.hpp" />
-    <ClInclude Include="..\..\boe.combat.hpp" />
-    <ClInclude Include="..\..\boe.consts.hpp" />
-    <ClInclude Include="..\..\boe.dlgutil.hpp" />
-    <ClInclude Include="..\..\boe.fileio.hpp" />
-    <ClInclude Include="..\..\boe.global.hpp" />
-    <ClInclude Include="..\..\boe.graphics.hpp" />
-    <ClInclude Include="..\..\boe.graphutil.hpp" />
-    <ClInclude Include="..\..\boe.infodlg.hpp" />
-    <ClInclude Include="..\..\boe.items.hpp" />
-    <ClInclude Include="..\..\boe.locutils.hpp" />
-    <ClInclude Include="..\..\boe.main.hpp" />
-    <ClInclude Include="..\..\boe.menus.hpp" />
-    <ClInclude Include="..\..\boe.monster.hpp" />
-    <ClInclude Include="..\..\boe.newgraph.hpp" />
-    <ClInclude Include="..\..\boe.party.hpp" />
-    <ClInclude Include="..\..\boe.specials.hpp" />
-    <ClInclude Include="..\..\boe.startup.hpp" />
-    <ClInclude Include="..\..\boe.text.hpp" />
-    <ClInclude Include="..\..\boe.town.hpp" />
-    <ClInclude Include="..\..\boe.townspec.hpp" />
+    <ClInclude Include="..\..\game\boe.actions.hpp" />
+    <ClInclude Include="..\..\game\boe.combat.hpp" />
+    <ClInclude Include="..\..\game\boe.consts.hpp" />
+    <ClInclude Include="..\..\game\boe.dlgutil.hpp" />
+    <ClInclude Include="..\..\game\boe.fileio.hpp" />
+    <ClInclude Include="..\..\game\boe.global.hpp" />
+    <ClInclude Include="..\..\game\boe.graphics.hpp" />
+    <ClInclude Include="..\..\game\boe.graphutil.hpp" />
+    <ClInclude Include="..\..\game\boe.infodlg.hpp" />
+    <ClInclude Include="..\..\game\boe.items.hpp" />
+    <ClInclude Include="..\..\game\boe.locutils.hpp" />
+    <ClInclude Include="..\..\game\boe.main.hpp" />
+    <ClInclude Include="..\..\game\boe.menus.hpp" />
+    <ClInclude Include="..\..\game\boe.monster.hpp" />
+    <ClInclude Include="..\..\game\boe.newgraph.hpp" />
+    <ClInclude Include="..\..\game\boe.party.hpp" />
+    <ClInclude Include="..\..\game\boe.specials.hpp" />
+    <ClInclude Include="..\..\game\boe.text.hpp" />
+    <ClInclude Include="..\..\game\boe.town.hpp" />
+    <ClInclude Include="..\..\game\boe.townspec.hpp" />
     <ClInclude Include="..\..\..\rsrc\menus\boeresource.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\rsrc\menus\BladesOfExile.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\boe.actions.cpp" />
-    <ClCompile Include="..\..\boe.combat.cpp" />
-    <ClCompile Include="..\..\boe.dlgutil.cpp" />
-    <ClCompile Include="..\..\boe.fileio.cpp" />
-    <ClCompile Include="..\..\boe.graphics.cpp" />
-    <ClCompile Include="..\..\boe.graphutil.cpp" />
-    <ClCompile Include="..\..\boe.infodlg.cpp" />
-    <ClCompile Include="..\..\boe.items.cpp" />
-    <ClCompile Include="..\..\boe.locutils.cpp" />
-    <ClCompile Include="..\..\boe.main.cpp" />
-    <ClCompile Include="..\..\boe.menus.win.cpp" />
-    <ClCompile Include="..\..\boe.monster.cpp" />
-    <ClCompile Include="..\..\boe.newgraph.cpp" />
-    <ClCompile Include="..\..\boe.party.cpp" />
-    <ClCompile Include="..\..\boe.specials.cpp" />
-    <ClCompile Include="..\..\boe.startup.cpp" />
-    <ClCompile Include="..\..\boe.text.cpp" />
-    <ClCompile Include="..\..\boe.town.cpp" />
-    <ClCompile Include="..\..\boe.townspec.cpp" />
-    <ClCompile Include="..\..\oldstructs.cpp" />
+    <ClCompile Include="..\..\game\boe.actions.cpp" />
+    <ClCompile Include="..\..\game\boe.combat.cpp" />
+    <ClCompile Include="..\..\game\boe.dlgutil.cpp" />
+    <ClCompile Include="..\..\game\boe.fileio.cpp" />
+    <ClCompile Include="..\..\game\boe.graphics.cpp" />
+    <ClCompile Include="..\..\game\boe.graphutil.cpp" />
+    <ClCompile Include="..\..\game\boe.infodlg.cpp" />
+    <ClCompile Include="..\..\game\boe.items.cpp" />
+    <ClCompile Include="..\..\game\boe.locutils.cpp" />
+    <ClCompile Include="..\..\game\boe.main.cpp" />
+    <ClCompile Include="..\..\game\boe.menus.win.cpp" />
+    <ClCompile Include="..\..\game\boe.monster.cpp" />
+    <ClCompile Include="..\..\game\boe.newgraph.cpp" />
+    <ClCompile Include="..\..\game\boe.party.cpp" />
+    <ClCompile Include="..\..\game\boe.specials.cpp" />
+    <ClCompile Include="..\..\game\boe.startup.cpp" />
+    <ClCompile Include="..\..\game\boe.text.cpp" />
+    <ClCompile Include="..\..\game\boe.town.cpp" />
+    <ClCompile Include="..\..\game\boe.townspec.cpp" />
     <ClCompile Include="..\..\pcedit\pc.editors.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters b/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters
index b85a89c0..58351bc9 100644
--- a/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters	
+++ b/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters	
@@ -18,135 +18,129 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\boe.actions.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.combat.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.consts.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.dlgutil.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.fileio.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.global.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.graphics.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.graphutil.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.infodlg.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.items.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.locutils.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.main.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.menus.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.monster.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.newgraph.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.party.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.specials.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.startup.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.text.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.town.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\boe.townspec.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\rsrc\menus\boeresource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\game\boe.actions.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.combat.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.consts.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.dlgutil.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.fileio.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.global.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.graphics.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.graphutil.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.infodlg.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.items.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.locutils.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.main.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.menus.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.monster.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.newgraph.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.party.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.specials.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.text.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.town.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\game\boe.townspec.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\boe.actions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.combat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.dlgutil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.fileio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.graphics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.graphutil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.infodlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.items.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.locutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.monster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.newgraph.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.party.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.specials.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.startup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.text.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.town.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\boe.townspec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\pcedit\pc.editors.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\boe.menus.win.cpp">
+    <ClCompile Include="..\..\game\boe.actions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\oldstructs.cpp">
+    <ClCompile Include="..\..\game\boe.combat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.dlgutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.fileio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.graphics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.graphutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.infodlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.items.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.locutils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.menus.win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.monster.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.newgraph.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.party.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.specials.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.startup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.text.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.town.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\game\boe.townspec.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/src/BoE.vsproj/PcEdit/Char Editor.vcxproj b/src/BoE.vsproj/PcEdit/Char Editor.vcxproj
index 573e47de..aadc7cce 100644
--- a/src/BoE.vsproj/PcEdit/Char Editor.vcxproj	
+++ b/src/BoE.vsproj/PcEdit/Char Editor.vcxproj	
@@ -78,10 +78,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\rsrc\menus;..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\rsrc\menus\;..\..\pcedit;..\..\universe;..\..\tools;..\..\scenario;..\..\gfx;..\..\fileio\resmgr;..\..\fileio\xml-parser;..\..\fileio\gzstream;..\..\fileio;..\..\dialogxml\widgets;..\..\dialogxml\dialogs;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
+      <ForcedIncludeFiles>global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/BoE.vsproj/ScenEdit/Scen Editor.vcxproj b/src/BoE.vsproj/ScenEdit/Scen Editor.vcxproj
index 95606e6f..929c4ecd 100644
--- a/src/BoE.vsproj/ScenEdit/Scen Editor.vcxproj	
+++ b/src/BoE.vsproj/ScenEdit/Scen Editor.vcxproj	
@@ -78,10 +78,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\rsrc\menus;..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\rsrc\menus\;..\..\scenedit;..\..\universe;..\..\tools;..\..\scenario;..\..\gfx;..\..\fileio\resmgr;..\..\fileio\xml-parser;..\..\fileio\gzstream;..\..\fileio;..\..\dialogxml\widgets;..\..\dialogxml\dialogs;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
+      <ForcedIncludeFiles>global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/tools/debugout.win.cpp b/src/fileio/debugout.win.cpp
similarity index 100%
rename from src/tools/debugout.win.cpp
rename to src/fileio/debugout.win.cpp
diff --git a/src/gfx/gfxsheets.hpp b/src/gfx/gfxsheets.hpp
index 5f675230..c347f554 100644
--- a/src/gfx/gfxsheets.hpp
+++ b/src/gfx/gfxsheets.hpp
@@ -11,6 +11,7 @@
 
 #include <utility>
 #include <vector>
+#include <memory>
 #include <SFML/Graphics/Texture.hpp>
 #include "location.hpp"
 
diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp
index 6279383a..64d5a6ef 100644
--- a/src/pcedit/pc.main.cpp
+++ b/src/pcedit/pc.main.cpp
@@ -11,7 +11,6 @@
 #include "render_image.hpp"
 #include "tiling.hpp"
 #include "utility.hpp"
-#include "boe.consts.hpp"
 #include "dialog.hpp"
 #include "control.hpp"
 #include "strdlog.hpp"
diff --git a/src/scenario/item.cpp b/src/scenario/item.cpp
index 5217a982..24e0f30d 100644
--- a/src/scenario/item.cpp
+++ b/src/scenario/item.cpp
@@ -15,7 +15,6 @@
 #include <sstream>
 #include <boost/lexical_cast.hpp>
 
-#include "boe.consts.hpp" // TODO: If this is needed here, maybe it shouldn't be in the "boe" namespace
 #include "oldstructs.hpp"
 #include "utility.hpp"
 #include "fileio.hpp"
diff --git a/src/scenario/terrain.cpp b/src/scenario/terrain.cpp
index 502b3342..503170e3 100644
--- a/src/scenario/terrain.cpp
+++ b/src/scenario/terrain.cpp
@@ -12,10 +12,10 @@
 #include <vector>
 #include <map>
 #include <sstream>
+#include <set>
 
 #include "oldstructs.hpp"
 #include "gfxsheets.hpp" // for NO_PIC
-#include "boe.consts.hpp" // TODO: Put these constants in a global file
 #include "damage.hpp"
 
 void cTerrain::import_legacy(legacy::terrain_type_type& old){
diff --git a/src/scenedit/scen.graphics.cpp b/src/scenedit/scen.graphics.cpp
index f8c1fb24..980ac8d0 100644
--- a/src/scenedit/scen.graphics.cpp
+++ b/src/scenedit/scen.graphics.cpp
@@ -14,7 +14,6 @@
 #include "scen.keydlgs.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "boe.consts.hpp" // TODO: Put these constants in a global file
 #include "cursors.hpp"
 
 #include "dialog.hpp"
diff --git a/src/tools/cursors.win.cpp b/src/tools/cursors.win.cpp
index 5d6d8854..3428b6f9 100644
--- a/src/tools/cursors.win.cpp
+++ b/src/tools/cursors.win.cpp
@@ -3,9 +3,8 @@
 #include <windows.h>
 #include <exception>
 #include <SFML/Graphics/RenderWindow.hpp>
-#include "restypes.hpp"
+#include "res_cursor.hpp"
 
-extern cursor_type current_cursor;
 extern sf::RenderWindow mainPtr;
 
 // This function adapted from <http://www.codeproject.com/Articles/5220/Creating-a-color-cursor-from-a-bitmap>
@@ -92,7 +91,7 @@ void obscureCursor() {
 
 void set_cursor(cursor_type which_c) {
 	if(which_c != watch_curs)
-		current_cursor = which_c;
+		Cursor::current = which_c;
 	if(which_c == text_curs) {
 		SetCursor(LoadCursor(NULL, IDC_IBEAM));
 	} else {
@@ -102,5 +101,5 @@ void set_cursor(cursor_type which_c) {
 }
 
 void restore_cursor() {
-	set_cursor(current_cursor);
+	set_cursor(Cursor::current);
 }
diff --git a/src/universe/pc.hpp b/src/universe/pc.hpp
index c2665678..33e574b5 100644
--- a/src/universe/pc.hpp
+++ b/src/universe/pc.hpp
@@ -14,6 +14,7 @@
 #include <iosfwd>
 #include <array>
 #include <bitset>
+#include <cstdint>
 
 #include "item.hpp"
 #include "pictypes.hpp"