diff --git a/projectfiles/VC10/wesnoth.vcxproj b/projectfiles/VC10/wesnoth.vcxproj
index ae4bec821c0..9c4849d2af6 100644
--- a/projectfiles/VC10/wesnoth.vcxproj
+++ b/projectfiles/VC10/wesnoth.vcxproj
@@ -58,6 +58,8 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">true</LinkIncremental>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <BuildLog>
@@ -414,6 +416,11 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Editor\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Editor\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\folder_create.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\gui\widgets\button.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Widgets\</ObjectFileName>
@@ -1122,6 +1129,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Storyscreen\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Storyscreen\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\tools\schema\tag.cpp" />
     <ClCompile Include="..\..\src\whiteboard\action.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
@@ -1142,10 +1150,8 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\whiteboard\mapbuilder_visitor.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
+    <ClCompile Include="..\..\src\whiteboard\mapbuilder.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\whiteboard\move.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
@@ -1174,11 +1180,6 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\whiteboard\visitor.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Whiteboard\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\src\widgets\button.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">$(IntDir)Widgets\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Widgets\</ObjectFileName>
@@ -1441,6 +1442,7 @@
     <ClInclude Include="..\..\src\editor\map_context.hpp" />
     <ClInclude Include="..\..\src\editor\map_fragment.hpp" />
     <ClInclude Include="..\..\src\editor\mouse_action.hpp" />
+    <ClInclude Include="..\..\src\gui\dialogs\folder_create.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\button.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\container.hpp" />
     <ClInclude Include="..\..\src\gui\widgets\control.hpp" />
@@ -1601,11 +1603,12 @@
     <ClInclude Include="..\..\src\storyscreen\interface.hpp" />
     <ClInclude Include="..\..\src\storyscreen\part.hpp" />
     <ClInclude Include="..\..\src\storyscreen\render.hpp" />
+    <ClInclude Include="..\..\src\tools\schema\tag.hpp" />
     <ClInclude Include="..\..\src\whiteboard\action.hpp" />
     <ClInclude Include="..\..\src\whiteboard\attack.hpp" />
     <ClInclude Include="..\..\src\whiteboard\highlight_visitor.hpp" />
     <ClInclude Include="..\..\src\whiteboard\manager.hpp" />
-    <ClInclude Include="..\..\src\whiteboard\mapbuilder_visitor.hpp" />
+    <ClInclude Include="..\..\src\whiteboard\mapbuilder.hpp" />
     <ClInclude Include="..\..\src\whiteboard\move.hpp" />
     <ClInclude Include="..\..\src\whiteboard\recall.hpp" />
     <ClInclude Include="..\..\src\whiteboard\recruit.hpp" />
@@ -1614,7 +1617,6 @@
     <ClInclude Include="..\..\src\whiteboard\typedefs.hpp" />
     <ClInclude Include="..\..\src\whiteboard\utility.hpp" />
     <ClInclude Include="..\..\src\whiteboard\validate_visitor.hpp" />
-    <ClInclude Include="..\..\src\whiteboard\visitor.hpp" />
     <ClInclude Include="..\..\src\widgets\combo.hpp" />
     <ClInclude Include="..\..\src\widgets\file_menu.hpp" />
     <ClInclude Include="..\..\src\widgets\menu.hpp" />
diff --git a/projectfiles/VC10/wesnoth.vcxproj.filters b/projectfiles/VC10/wesnoth.vcxproj.filters
index ecd59adf192..b7df8f78529 100644
--- a/projectfiles/VC10/wesnoth.vcxproj.filters
+++ b/projectfiles/VC10/wesnoth.vcxproj.filters
@@ -77,6 +77,12 @@
     <Filter Include="Whiteboard">
       <UniqueIdentifier>{e86f750d-6466-4226-a737-8ed73eee5bc8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="tools">
+      <UniqueIdentifier>{ebf53609-f1d2-4592-9713-082ebdd65dd9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="tools\schema">
+      <UniqueIdentifier>{24fa9dff-1e37-435e-9c30-50571ff65b5e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\packaging\windows\wesnoth.rc">
@@ -695,9 +701,6 @@
     <ClCompile Include="..\..\src\whiteboard\manager.cpp">
       <Filter>Whiteboard</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\whiteboard\mapbuilder_visitor.cpp">
-      <Filter>Whiteboard</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\whiteboard\move.cpp">
       <Filter>Whiteboard</Filter>
     </ClCompile>
@@ -719,9 +722,6 @@
     <ClCompile Include="..\..\src\whiteboard\validate_visitor.cpp">
       <Filter>Whiteboard</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\whiteboard\visitor.cpp">
-      <Filter>Whiteboard</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\widgets\button.cpp">
       <Filter>Gui\Widgets</Filter>
     </ClCompile>
@@ -895,6 +895,15 @@
     <ClCompile Include="..\..\src\wml_exception.cpp" />
     <ClCompile Include="..\..\src\joystick.cpp" />
     <ClCompile Include="..\..\src\network.cpp" />
+    <ClCompile Include="..\..\src\whiteboard\mapbuilder.cpp">
+      <Filter>Whiteboard</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tools\schema\tag.cpp">
+      <Filter>tools\schema</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\folder_create.cpp">
+      <Filter>Gui\Dialogs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\manager.hpp">
@@ -1551,9 +1560,6 @@
     <ClInclude Include="..\..\src\whiteboard\manager.hpp">
       <Filter>Whiteboard</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\whiteboard\mapbuilder_visitor.hpp">
-      <Filter>Whiteboard</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\whiteboard\move.hpp">
       <Filter>Whiteboard</Filter>
     </ClInclude>
@@ -1578,9 +1584,6 @@
     <ClInclude Include="..\..\src\whiteboard\validate_visitor.hpp">
       <Filter>Whiteboard</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\whiteboard\visitor.hpp">
-      <Filter>Whiteboard</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\widgets\combo.hpp">
       <Filter>Gui\Widgets</Filter>
     </ClInclude>
@@ -1747,5 +1750,14 @@
     <ClInclude Include="..\..\src\wml_exception.hpp" />
     <ClInclude Include="..\..\src\wml_separators.hpp" />
     <ClInclude Include="..\..\src\joystick.hpp" />
+    <ClInclude Include="..\..\src\whiteboard\mapbuilder.hpp">
+      <Filter>Whiteboard</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\tools\schema\tag.hpp">
+      <Filter>tools\schema</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\gui\dialogs\folder_create.hpp">
+      <Filter>Gui\Dialogs</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projectfiles/VC10/wesnoth.vcxproj.user b/projectfiles/VC10/wesnoth.vcxproj.user
index c1dee9df4d8..404e26af24e 100644
--- a/projectfiles/VC10/wesnoth.vcxproj.user
+++ b/projectfiles/VC10/wesnoth.vcxproj.user
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">
-    <LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>--debug --log-debug=scripting/lua</LocalDebuggerCommandArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (fast)|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/projectfiles/VC10/wesnothlib.vcxproj b/projectfiles/VC10/wesnothlib.vcxproj
index 82a715e1c4c..edb4cf8430f 100644
--- a/projectfiles/VC10/wesnothlib.vcxproj
+++ b/projectfiles/VC10/wesnothlib.vcxproj
@@ -1,120 +1,125 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4A16638B-127B-4AE8-8E0B-4B211B96F976}</ProjectGuid>
-    <RootNamespace>wesnothlib</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\wesnothlib\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <BuildLog>
-      <Path>$(IntDir)BuildLog.htm</Path>
-    </BuildLog>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>$(IntDir)BuildLog-wesnothlib.htm</Path>
-    </BuildLog>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\serialization\binary_or_text.cpp" />
-    <ClCompile Include="..\..\src\serialization\parser.cpp" />
-    <ClCompile Include="..\..\src\serialization\preprocessor.cpp" />
-    <ClCompile Include="..\..\src\serialization\string_utils.cpp" />
-    <ClCompile Include="..\..\src\serialization\tokenizer.cpp" />
-    <ClCompile Include="..\..\src\color_range.cpp" />
-    <ClCompile Include="..\..\src\config.cpp" />
-    <ClCompile Include="..\..\src\filesystem.cpp" />
-    <ClCompile Include="..\..\src\game_config.cpp" />
-    <ClCompile Include="..\..\src\gettext.cpp" />
-    <ClCompile Include="..\..\src\log.cpp" />
-    <ClCompile Include="..\..\src\network.cpp" />
-    <ClCompile Include="..\..\src\network_worker.cpp" />
-    <ClCompile Include="..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\src\tstring.cpp" />
-    <ClCompile Include="..\..\src\util.cpp" />
-    <ClCompile Include="..\..\src\version.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\serialization\binary_or_text.hpp" />
-    <ClInclude Include="..\..\src\serialization\parser.hpp" />
-    <ClInclude Include="..\..\src\serialization\preprocessor.hpp" />
-    <ClInclude Include="..\..\src\serialization\string_utils.hpp" />
-    <ClInclude Include="..\..\src\serialization\tokenizer.hpp" />
-    <ClInclude Include="..\..\src\about.hpp" />
-    <ClInclude Include="..\..\src\config.hpp" />
-    <ClInclude Include="..\..\src\filesystem.hpp" />
-    <ClInclude Include="..\..\src\game_config.hpp" />
-    <ClInclude Include="..\..\src\gettext.hpp" />
-    <ClInclude Include="..\..\src\global.hpp" />
-    <ClInclude Include="..\..\src\log.hpp" />
-    <ClInclude Include="..\..\src\map.hpp" />
-    <ClInclude Include="..\..\src\network.hpp" />
-    <ClInclude Include="..\..\src\network_worker.hpp" />
-    <ClInclude Include="..\..\src\scoped_resource.hpp" />
-    <ClInclude Include="..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\src\tstring.hpp" />
-    <ClInclude Include="..\..\src\util.hpp" />
-    <ClInclude Include="..\..\src\version.hpp" />
-    <ClInclude Include="..\..\src\wesconfig.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4A16638B-127B-4AE8-8E0B-4B211B96F976}</ProjectGuid>
+    <RootNamespace>wesnothlib</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\wesnothlib\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-wesnothlib.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\serialization\binary_or_text.cpp" />
+    <ClCompile Include="..\..\src\serialization\parser.cpp" />
+    <ClCompile Include="..\..\src\serialization\preprocessor.cpp" />
+    <ClCompile Include="..\..\src\serialization\schema_validator.cpp" />
+    <ClCompile Include="..\..\src\serialization\string_utils.cpp" />
+    <ClCompile Include="..\..\src\serialization\tokenizer.cpp" />
+    <ClCompile Include="..\..\src\color_range.cpp" />
+    <ClCompile Include="..\..\src\config.cpp" />
+    <ClCompile Include="..\..\src\filesystem.cpp" />
+    <ClCompile Include="..\..\src\game_config.cpp" />
+    <ClCompile Include="..\..\src\gettext.cpp" />
+    <ClCompile Include="..\..\src\log.cpp" />
+    <ClCompile Include="..\..\src\network.cpp" />
+    <ClCompile Include="..\..\src\network_worker.cpp" />
+    <ClCompile Include="..\..\src\serialization\validator.cpp" />
+    <ClCompile Include="..\..\src\thread.cpp" />
+    <ClCompile Include="..\..\src\tstring.cpp" />
+    <ClCompile Include="..\..\src\util.cpp" />
+    <ClCompile Include="..\..\src\version.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\serialization\binary_or_text.hpp" />
+    <ClInclude Include="..\..\src\serialization\parser.hpp" />
+    <ClInclude Include="..\..\src\serialization\preprocessor.hpp" />
+    <ClInclude Include="..\..\src\serialization\schema_validator.hpp" />
+    <ClInclude Include="..\..\src\serialization\string_utils.hpp" />
+    <ClInclude Include="..\..\src\serialization\tokenizer.hpp" />
+    <ClInclude Include="..\..\src\about.hpp" />
+    <ClInclude Include="..\..\src\config.hpp" />
+    <ClInclude Include="..\..\src\filesystem.hpp" />
+    <ClInclude Include="..\..\src\game_config.hpp" />
+    <ClInclude Include="..\..\src\gettext.hpp" />
+    <ClInclude Include="..\..\src\global.hpp" />
+    <ClInclude Include="..\..\src\log.hpp" />
+    <ClInclude Include="..\..\src\map.hpp" />
+    <ClInclude Include="..\..\src\network.hpp" />
+    <ClInclude Include="..\..\src\network_worker.hpp" />
+    <ClInclude Include="..\..\src\scoped_resource.hpp" />
+    <ClInclude Include="..\..\src\serialization\validator.hpp" />
+    <ClInclude Include="..\..\src\thread.hpp" />
+    <ClInclude Include="..\..\src\tstring.hpp" />
+    <ClInclude Include="..\..\src\util.hpp" />
+    <ClInclude Include="..\..\src\version.hpp" />
+    <ClInclude Include="..\..\src\wesconfig.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/projectfiles/VC10/wesnothlib.vcxproj.filters b/projectfiles/VC10/wesnothlib.vcxproj.filters
index e44b711ea03..71651fdfddd 100644
--- a/projectfiles/VC10/wesnothlib.vcxproj.filters
+++ b/projectfiles/VC10/wesnothlib.vcxproj.filters
@@ -1,74 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <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</Extensions>
-    </Filter>
-    <Filter Include="Serialization">
-      <UniqueIdentifier>{cdc7f323-509b-419a-8b40-00ca39a7922c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\serialization\binary_or_text.cpp">
-      <Filter>Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\serialization\parser.cpp">
-      <Filter>Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\serialization\preprocessor.cpp">
-      <Filter>Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\serialization\string_utils.cpp">
-      <Filter>Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\serialization\tokenizer.cpp">
-      <Filter>Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\color_range.cpp" />
-    <ClCompile Include="..\..\src\config.cpp" />
-    <ClCompile Include="..\..\src\filesystem.cpp" />
-    <ClCompile Include="..\..\src\game_config.cpp" />
-    <ClCompile Include="..\..\src\gettext.cpp" />
-    <ClCompile Include="..\..\src\log.cpp" />
-    <ClCompile Include="..\..\src\network.cpp" />
-    <ClCompile Include="..\..\src\network_worker.cpp" />
-    <ClCompile Include="..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\src\tstring.cpp" />
-    <ClCompile Include="..\..\src\util.cpp" />
-    <ClCompile Include="..\..\src\version.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\serialization\binary_or_text.hpp">
-      <Filter>Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\serialization\parser.hpp">
-      <Filter>Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\serialization\preprocessor.hpp">
-      <Filter>Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\serialization\string_utils.hpp">
-      <Filter>Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\serialization\tokenizer.hpp">
-      <Filter>Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\about.hpp" />
-    <ClInclude Include="..\..\src\config.hpp" />
-    <ClInclude Include="..\..\src\filesystem.hpp" />
-    <ClInclude Include="..\..\src\game_config.hpp" />
-    <ClInclude Include="..\..\src\gettext.hpp" />
-    <ClInclude Include="..\..\src\global.hpp" />
-    <ClInclude Include="..\..\src\log.hpp" />
-    <ClInclude Include="..\..\src\map.hpp" />
-    <ClInclude Include="..\..\src\network.hpp" />
-    <ClInclude Include="..\..\src\network_worker.hpp" />
-    <ClInclude Include="..\..\src\scoped_resource.hpp" />
-    <ClInclude Include="..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\src\tstring.hpp" />
-    <ClInclude Include="..\..\src\util.hpp" />
-    <ClInclude Include="..\..\src\version.hpp" />
-    <ClInclude Include="..\..\src\wesconfig.h" />
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <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</Extensions>
+    </Filter>
+    <Filter Include="Serialization">
+      <UniqueIdentifier>{cdc7f323-509b-419a-8b40-00ca39a7922c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\serialization\binary_or_text.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\serialization\parser.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\serialization\preprocessor.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\serialization\string_utils.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\serialization\tokenizer.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\color_range.cpp" />
+    <ClCompile Include="..\..\src\config.cpp" />
+    <ClCompile Include="..\..\src\filesystem.cpp" />
+    <ClCompile Include="..\..\src\game_config.cpp" />
+    <ClCompile Include="..\..\src\gettext.cpp" />
+    <ClCompile Include="..\..\src\log.cpp" />
+    <ClCompile Include="..\..\src\network.cpp" />
+    <ClCompile Include="..\..\src\network_worker.cpp" />
+    <ClCompile Include="..\..\src\thread.cpp" />
+    <ClCompile Include="..\..\src\tstring.cpp" />
+    <ClCompile Include="..\..\src\util.cpp" />
+    <ClCompile Include="..\..\src\version.cpp" />
+    <ClCompile Include="..\..\src\serialization\schema_validator.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\serialization\validator.cpp">
+      <Filter>Serialization</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\serialization\binary_or_text.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\serialization\parser.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\serialization\preprocessor.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\serialization\string_utils.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\serialization\tokenizer.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\about.hpp" />
+    <ClInclude Include="..\..\src\config.hpp" />
+    <ClInclude Include="..\..\src\filesystem.hpp" />
+    <ClInclude Include="..\..\src\game_config.hpp" />
+    <ClInclude Include="..\..\src\gettext.hpp" />
+    <ClInclude Include="..\..\src\global.hpp" />
+    <ClInclude Include="..\..\src\log.hpp" />
+    <ClInclude Include="..\..\src\map.hpp" />
+    <ClInclude Include="..\..\src\network.hpp" />
+    <ClInclude Include="..\..\src\network_worker.hpp" />
+    <ClInclude Include="..\..\src\scoped_resource.hpp" />
+    <ClInclude Include="..\..\src\thread.hpp" />
+    <ClInclude Include="..\..\src\tstring.hpp" />
+    <ClInclude Include="..\..\src\util.hpp" />
+    <ClInclude Include="..\..\src\version.hpp" />
+    <ClInclude Include="..\..\src\wesconfig.h" />
+    <ClInclude Include="..\..\src\serialization\schema_validator.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\serialization\validator.hpp">
+      <Filter>Serialization</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file