diff --git a/build/Ba1.vcxproj b/build/Ba1.vcxproj
index 3b3c36192..7961e9ebf 100644
--- a/build/Ba1.vcxproj
+++ b/build/Ba1.vcxproj
@@ -71,7 +71,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>
diff --git a/build/Ba2.vcxproj b/build/Ba2.vcxproj
index cef081841..3ea8bd59d 100644
--- a/build/Ba2.vcxproj
+++ b/build/Ba2.vcxproj
@@ -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>
diff --git a/build/Ba2.vcxproj.filters b/build/Ba2.vcxproj.filters
index 51a818c35..ed6ab395d 100644
--- a/build/Ba2.vcxproj.filters
+++ b/build/Ba2.vcxproj.filters
@@ -45,6 +45,9 @@
     <ClCompile Include="..\src\ba\baformed.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\ba\ba2900.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\ba\ba2100a.uml">
@@ -152,6 +155,9 @@
     <MskCompiler Include="..\src\ba\ba2800a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
+    <MskCompiler Include="..\src\ba\ba2900a.uml">
+      <Filter>Masks</Filter>
+    </MskCompiler>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\ba\ba2.h">
@@ -190,6 +196,9 @@
     <ClInclude Include="..\src\ba\ba2800a.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\ba\ba2900.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
diff --git a/build/Ba4.vcxproj b/build/Ba4.vcxproj
index b107f2625..2048af01c 100644
--- a/build/Ba4.vcxproj
+++ b/build/Ba4.vcxproj
@@ -121,7 +121,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>
diff --git a/build/Ba5.vcxproj b/build/Ba5.vcxproj
index a9329fd5d..a45c404c2 100644
--- a/build/Ba5.vcxproj
+++ b/build/Ba5.vcxproj
@@ -74,7 +74,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>
diff --git a/build/Ba6.vcxproj b/build/Ba6.vcxproj
index 56da1c71b..471a83f5b 100644
--- a/build/Ba6.vcxproj
+++ b/build/Ba6.vcxproj
@@ -73,7 +73,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>
diff --git a/build/Ba7.vcxproj b/build/Ba7.vcxproj
index a730d7c3a..14a7e74b3 100644
--- a/build/Ba7.vcxproj
+++ b/build/Ba7.vcxproj
@@ -74,7 +74,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>
diff --git a/build/Bacnv.vcxproj b/build/Bacnv.vcxproj
index 0c9058279..f56ba95a2 100644
--- a/build/Bacnv.vcxproj
+++ b/build/Bacnv.vcxproj
@@ -124,7 +124,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>
diff --git a/build/Bainst.vcxproj b/build/Bainst.vcxproj
index 7671dc61f..0ec6a822a 100644
--- a/build/Bainst.vcxproj
+++ b/build/Bainst.vcxproj
@@ -75,7 +75,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>
diff --git a/build/Or1.vcxproj b/build/Or1.vcxproj
index 86e79359c..65c6cd5f1 100644
--- a/build/Or1.vcxproj
+++ b/build/Or1.vcxproj
@@ -126,7 +126,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/ba0.vcxproj b/build/ba0.vcxproj
index 1931c35fe..d8b51d4bd 100644
--- a/build/ba0.vcxproj
+++ b/build/ba0.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>%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/ba8.vcxproj b/build/ba8.vcxproj
index 9f8921bf8..54bce2fdd 100644
--- a/build/ba8.vcxproj
+++ b/build/ba8.vcxproj
@@ -125,7 +125,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>
diff --git a/build/ba9.vcxproj b/build/ba9.vcxproj
index 43e6ea117..45d49bfe3 100644
--- a/build/ba9.vcxproj
+++ b/build/ba9.vcxproj
@@ -125,7 +125,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>
diff --git a/build/ce0.vcxproj b/build/ce0.vcxproj
index b6518ed76..d360e6631 100644
--- a/build/ce0.vcxproj
+++ b/build/ce0.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>
diff --git a/build/ce1.vcxproj b/build/ce1.vcxproj
index 080926a22..f0470635b 100644
--- a/build/ce1.vcxproj
+++ b/build/ce1.vcxproj
@@ -128,7 +128,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>
diff --git a/build/ce2.vcxproj b/build/ce2.vcxproj
index 71fccf9cc..98fc0813c 100644
--- a/build/ce2.vcxproj
+++ b/build/ce2.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>
diff --git a/build/ce3.vcxproj b/build/ce3.vcxproj
index b2eba6374..05bec8447 100644
--- a/build/ce3.vcxproj
+++ b/build/ce3.vcxproj
@@ -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>
diff --git a/build/ce4.vcxproj b/build/ce4.vcxproj
index e745bac5d..d17557dfa 100644
--- a/build/ce4.vcxproj
+++ b/build/ce4.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>