diff --git a/build/at0.vcxproj b/build/at0.vcxproj
index 90da14fd7..780c3deb2 100644
--- a/build/at0.vcxproj
+++ b/build/at0.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4E407F68-5E64-4239-B1A0-15292AFAFCDE}</ProjectGuid>
     <RootNamespace>at0</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -74,14 +74,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -127,14 +127,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at1.vcxproj b/build/at1.vcxproj
index 46c7cf96f..34443afb1 100644
--- a/build/at1.vcxproj
+++ b/build/at1.vcxproj
@@ -74,14 +74,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -127,7 +127,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,7 +135,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at2.vcxproj b/build/at2.vcxproj
index 54db38a17..411cd3bdc 100644
--- a/build/at2.vcxproj
+++ b/build/at2.vcxproj
@@ -76,14 +76,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -125,14 +125,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at3.vcxproj b/build/at3.vcxproj
index 4f9117aef..4e69f3012 100644
--- a/build/at3.vcxproj
+++ b/build/at3.vcxproj
@@ -74,14 +74,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -127,7 +127,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,7 +135,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at4.vcxproj b/build/at4.vcxproj
index 7b39f1610..89b28d3bd 100644
--- a/build/at4.vcxproj
+++ b/build/at4.vcxproj
@@ -74,14 +74,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -127,7 +127,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,7 +135,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at5.vcxproj b/build/at5.vcxproj
index 9f81a91c4..2eef90c32 100644
--- a/build/at5.vcxproj
+++ b/build/at5.vcxproj
@@ -74,14 +74,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -127,7 +127,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,7 +135,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at6.vcxproj b/build/at6.vcxproj
index 7ad829e76..91aee2350 100644
--- a/build/at6.vcxproj
+++ b/build/at6.vcxproj
@@ -77,7 +77,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -129,7 +129,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/at7.vcxproj b/build/at7.vcxproj
index 4c5996e18..69198d742 100644
--- a/build/at7.vcxproj
+++ b/build/at7.vcxproj
@@ -74,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -127,7 +127,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,7 +135,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../obj/$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at8.vcxproj b/build/at8.vcxproj
index 6656864f2..433123d01 100644
--- a/build/at8.vcxproj
+++ b/build/at8.vcxproj
@@ -76,7 +76,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -84,7 +84,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -126,7 +126,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -326,14 +326,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="avis.rc" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="AgaLib.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="avis.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="CampoRules.targets" />
diff --git a/build/at9.vcxproj b/build/at9.vcxproj
index be2507ce2..bd6b9ec8f 100644
--- a/build/at9.vcxproj
+++ b/build/at9.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2FB5C989-0352-4BB3-9A62-68AA6B5FA3C9}</ProjectGuid>
     <RootNamespace>at9</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -75,7 +75,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -128,14 +128,14 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\..\debug/at9.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at_forms.vcxproj b/build/at_forms.vcxproj
index 127d5430b..944e7b38d 100644
--- a/build/at_forms.vcxproj
+++ b/build/at_forms.vcxproj
@@ -81,7 +81,7 @@
     <Link>
       <OutputFile>D:\Release\avis100/at_forms.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -129,7 +129,7 @@
       <OutputFile>.\..\exed/at_forms.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
diff --git a/build/at_masktab.vcxproj b/build/at_masktab.vcxproj
index 0df5b342d..a935a963e 100644
--- a/build/at_masktab.vcxproj
+++ b/build/at_masktab.vcxproj
@@ -81,7 +81,7 @@
     <Link>
       <OutputFile>D:\Release\avis100/at_masktab.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -129,7 +129,7 @@
       <OutputFile>.\..\exed/at_masktab.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -145,45 +145,45 @@
     </Xdcmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <MskCompiler Include="..\at\atstctd.uml" />
-    <MskCompiler Include="..\at\atstctn.uml" />
-    <MskCompiler Include="..\at\atstgaz.uml" />
-    <MskCompiler Include="..\at\atstlcp.uml" />
-    <MskCompiler Include="..\at\atstldl.uml" />
-    <MskCompiler Include="..\at\atstldn.uml" />
-    <MskCompiler Include="..\at\atstmtc.uml" />
-    <MskCompiler Include="..\at\atstprf.uml" />
-    <MskCompiler Include="..\at\atstscs.uml" />
-    <MskCompiler Include="..\at\atsttcs.uml" />
-    <MskCompiler Include="..\at\attbbnz.uml" />
-    <MskCompiler Include="..\at\attbctd.uml" />
-    <MskCompiler Include="..\at\attbctn.uml" />
-    <MskCompiler Include="..\at\attbgaz.uml" />
-    <MskCompiler Include="..\at\attbido.uml" />
-    <MskCompiler Include="..\at\attblcp.uml" />
-    <MskCompiler Include="..\at\attbldl.uml" />
-    <MskCompiler Include="..\at\attbldn.uml" />
-    <MskCompiler Include="..\at\attbmed.uml" />
-    <MskCompiler Include="..\at\attbmtc.uml" />
-    <MskCompiler Include="..\at\attbpr1.uml" />
-    <MskCompiler Include="..\at\attbpr2.uml" />
-    <MskCompiler Include="..\at\attbprf.uml" />
-    <MskCompiler Include="..\at\attbscs.uml" />
-    <MskCompiler Include="..\at\attbsez.uml" />
-    <MskCompiler Include="..\at\attbtcs.uml" />
-    <MskCompiler Include="..\at\attbtdn.uml" />
+    <MskCompiler Include="..\src\at\atstctd.uml" />
+    <MskCompiler Include="..\src\at\atstctn.uml" />
+    <MskCompiler Include="..\src\at\atstgaz.uml" />
+    <MskCompiler Include="..\src\at\atstlcp.uml" />
+    <MskCompiler Include="..\src\at\atstldl.uml" />
+    <MskCompiler Include="..\src\at\atstldn.uml" />
+    <MskCompiler Include="..\src\at\atstmtc.uml" />
+    <MskCompiler Include="..\src\at\atstprf.uml" />
+    <MskCompiler Include="..\src\at\atstscs.uml" />
+    <MskCompiler Include="..\src\at\atsttcs.uml" />
+    <MskCompiler Include="..\src\at\attbbnz.uml" />
+    <MskCompiler Include="..\src\at\attbctd.uml" />
+    <MskCompiler Include="..\src\at\attbctn.uml" />
+    <MskCompiler Include="..\src\at\attbgaz.uml" />
+    <MskCompiler Include="..\src\at\attbido.uml" />
+    <MskCompiler Include="..\src\at\attblcp.uml" />
+    <MskCompiler Include="..\src\at\attbldl.uml" />
+    <MskCompiler Include="..\src\at\attbldn.uml" />
+    <MskCompiler Include="..\src\at\attbmed.uml" />
+    <MskCompiler Include="..\src\at\attbmtc.uml" />
+    <MskCompiler Include="..\src\at\attbpr1.uml" />
+    <MskCompiler Include="..\src\at\attbpr2.uml" />
+    <MskCompiler Include="..\src\at\attbprf.uml" />
+    <MskCompiler Include="..\src\at\attbscs.uml" />
+    <MskCompiler Include="..\src\at\attbsez.uml" />
+    <MskCompiler Include="..\src\at\attbtcs.uml" />
+    <MskCompiler Include="..\src\at\attbtdn.uml" />
   </ItemGroup>
   <ItemGroup>
-    <RepCompiler Include="..\at\atstctd.rep" />
-    <RepCompiler Include="..\at\atstctn.rep" />
-    <RepCompiler Include="..\at\atstgaz.rep" />
-    <RepCompiler Include="..\at\atstlcp.rep" />
-    <RepCompiler Include="..\at\atstldl.rep" />
-    <RepCompiler Include="..\at\atstldn.rep" />
-    <RepCompiler Include="..\at\atstmtc.rep" />
-    <RepCompiler Include="..\at\atstprf.rep" />
-    <RepCompiler Include="..\at\atstscs.rep" />
-    <RepCompiler Include="..\at\atsttcs.rep" />
+    <RepCompiler Include="..\src\at\atstctd.rep" />
+    <RepCompiler Include="..\src\at\atstctn.rep" />
+    <RepCompiler Include="..\src\at\atstgaz.rep" />
+    <RepCompiler Include="..\src\at\atstlcp.rep" />
+    <RepCompiler Include="..\src\at\atstldl.rep" />
+    <RepCompiler Include="..\src\at\atstldn.rep" />
+    <RepCompiler Include="..\src\at\atstmtc.rep" />
+    <RepCompiler Include="..\src\at\atstprf.rep" />
+    <RepCompiler Include="..\src\at\atstscs.rep" />
+    <RepCompiler Include="..\src\at\atsttcs.rep" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/at_masktab.vcxproj.filters b/build/at_masktab.vcxproj.filters
index 66e61c75b..71cfa9cc2 100644
--- a/build/at_masktab.vcxproj.filters
+++ b/build/at_masktab.vcxproj.filters
@@ -10,118 +10,98 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <MskCompiler Include="..\at\atstctd.uml">
+    <MskCompiler Include="..\src\at\atstctd.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstctn.uml">
+    <MskCompiler Include="..\src\at\atstctn.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstgaz.uml">
+    <MskCompiler Include="..\src\at\atstgaz.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstlcp.uml">
+    <MskCompiler Include="..\src\at\atstlcp.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstldl.uml">
+    <MskCompiler Include="..\src\at\atstldl.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstldn.uml">
+    <MskCompiler Include="..\src\at\atstldn.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstmtc.uml">
+    <MskCompiler Include="..\src\at\atstmtc.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstprf.uml">
+    <MskCompiler Include="..\src\at\atstprf.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atstscs.uml">
+    <MskCompiler Include="..\src\at\atstscs.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\atsttcs.uml">
+    <MskCompiler Include="..\src\at\atsttcs.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbbnz.uml">
+    <MskCompiler Include="..\src\at\attbbnz.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbctd.uml">
+    <MskCompiler Include="..\src\at\attbctd.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbctn.uml">
+    <MskCompiler Include="..\src\at\attbctn.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbgaz.uml">
+    <MskCompiler Include="..\src\at\attbgaz.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbido.uml">
+    <MskCompiler Include="..\src\at\attbido.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attblcp.uml">
+    <MskCompiler Include="..\src\at\attblcp.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbldl.uml">
+    <MskCompiler Include="..\src\at\attbldl.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbldn.uml">
+    <MskCompiler Include="..\src\at\attbldn.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbmed.uml">
+    <MskCompiler Include="..\src\at\attbmed.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbmtc.uml">
+    <MskCompiler Include="..\src\at\attbmtc.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbpr1.uml">
+    <MskCompiler Include="..\src\at\attbpr1.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbpr2.uml">
+    <MskCompiler Include="..\src\at\attbpr2.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbprf.uml">
+    <MskCompiler Include="..\src\at\attbprf.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbscs.uml">
+    <MskCompiler Include="..\src\at\attbscs.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbsez.uml">
+    <MskCompiler Include="..\src\at\attbsez.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbtcs.uml">
+    <MskCompiler Include="..\src\at\attbtcs.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\at\attbtdn.uml">
+    <MskCompiler Include="..\src\at\attbtdn.uml">
       <Filter>Mask</Filter>
     </MskCompiler>
   </ItemGroup>
   <ItemGroup>
-    <RepCompiler Include="..\at\atstctd.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstctn.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstgaz.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstlcp.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstldl.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstldn.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstmtc.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstprf.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atstscs.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\at\atsttcs.rep">
-      <Filter>Rep</Filter>
-    </RepCompiler>
+    <RepCompiler Include="..\src\at\atstctd.rep" />
+    <RepCompiler Include="..\src\at\atstctn.rep" />
+    <RepCompiler Include="..\src\at\atstgaz.rep" />
+    <RepCompiler Include="..\src\at\atstlcp.rep" />
+    <RepCompiler Include="..\src\at\atstldl.rep" />
+    <RepCompiler Include="..\src\at\atstldn.rep" />
+    <RepCompiler Include="..\src\at\atstmtc.rep" />
+    <RepCompiler Include="..\src\at\atstprf.rep" />
+    <RepCompiler Include="..\src\at\atstscs.rep" />
+    <RepCompiler Include="..\src\at\atsttcs.rep" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/avis.rc b/build/avis.rc
index 60df9c9a2..611562700 100644
--- a/build/avis.rc
+++ b/build/avis.rc
@@ -2,3 +2,18 @@
 
 rcinclude wx/msw/wx.rc
 
+VS_VERSION_INFO VERSIONINFO
+PRODUCTVERSION 2015,0,12,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",      "Sirio Informatica e Sistemi S.p.A."
+            VALUE "FileDescription",  "AVIS Enterprise"
+            VALUE "ProductName",      "AVIS"
+            VALUE "ProductVersion",   "12.0"
+        END
+    END
+END
+