diff --git a/build/AgaLib01.vcxproj b/build/AgaLib01.vcxproj
index b0f84ae5d..241153f6a 100644
--- a/build/AgaLib01.vcxproj
+++ b/build/AgaLib01.vcxproj
@@ -811,6 +811,24 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\libraries\libb64\base64\VisualStudioProject\base64.vcxproj">
+      <Project>{0b094121-dc64-4d74-afa0-750b83f800d0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="Cb6.vcxproj">
+      <Project>{99683594-420f-4dd9-bb41-7dc48278b931}</Project>
+    </ProjectReference>
+    <ProjectReference Include="gfm.vcxproj">
+      <Project>{37c3ddae-3a63-4c1c-a419-242141b262ed}</Project>
+    </ProjectReference>
+    <ProjectReference Include="pdflibwrap.vcxproj">
+      <Project>{21876c3b-f5a9-4aaa-9d58-f8dddaf6f10c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="pdflib_dll.vcxproj">
+      <Project>{a294c667-27a9-4125-82af-5093447505ec}</Project>
+    </ProjectReference>
+    <ProjectReference Include="Uno.vcxproj">
+      <Project>{8b0477f1-5d74-46c3-97b6-8879e2460a71}</Project>
+    </ProjectReference>
     <ProjectReference Include="xi.vcxproj">
       <Project>{3a5b0119-6dad-4407-9ee1-3b739b0581e8}</Project>
       <Private>true</Private>
@@ -819,13 +837,8 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
       <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
     </ProjectReference>
-    <ProjectReference Include="xvaga.vcxproj">
+    <ProjectReference Include="xvaga01.vcxproj">
       <Project>{4a2fc619-2461-4f58-8f1d-92fa153e39a2}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
     </ProjectReference>
     <ProjectReference Include="xvapp.vcxproj">
       <Project>{153c04b0-1f72-4da9-8ac1-7df76ffacfd2}</Project>
diff --git a/build/Cg010.vcxproj b/build/Cg010.vcxproj
index b8379ea11..854952c49 100644
--- a/build/Cg010.vcxproj
+++ b/build/Cg010.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;../src/cg01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;../src/cg01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -256,13 +256,10 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="vedoc.vcxproj">
+    <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
     </ProjectReference>
-    <ProjectReference Include="vedocext.vcxproj">
+    <ProjectReference Include="vedocext01.vcxproj">
       <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/build/Cg010.vcxproj.filters b/build/Cg010.vcxproj.filters
index de6f64a73..597be6e23 100644
--- a/build/Cg010.vcxproj.filters
+++ b/build/Cg010.vcxproj.filters
@@ -142,7 +142,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="gest.rc" />
+    <ResourceCompile Include="campo.rc" />
   </ItemGroup>
   <ItemGroup>
     <RepCompiler Include="..\src\cg01\cg0800a.rep">
diff --git a/build/Cg011.vcxproj b/build/Cg011.vcxproj
index c71f55cbc..94c3439c8 100644
--- a/build/Cg011.vcxproj
+++ b/build/Cg011.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -115,7 +115,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
diff --git a/build/Cg012.vcxproj b/build/Cg012.vcxproj
index 00e6181a3..6ca4845fb 100644
--- a/build/Cg012.vcxproj
+++ b/build/Cg012.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -116,7 +116,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;..\src\cg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;..\src\xvtdb;..\src\cg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -280,15 +280,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="fplib01.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
     </ProjectReference>
diff --git a/build/Cg013.vcxproj b/build/Cg013.vcxproj
index 45da7e314..3db36e603 100644
--- a/build/Cg013.vcxproj
+++ b/build/Cg013.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -116,7 +116,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
diff --git a/build/Cg013.vcxproj.filters b/build/Cg013.vcxproj.filters
index 425ee5be9..22ca582e6 100644
--- a/build/Cg013.vcxproj.filters
+++ b/build/Cg013.vcxproj.filters
@@ -171,8 +171,6 @@
     </FormCompiler>
   </ItemGroup>
   <ItemGroup>
-    <RepCompiler Include="..\src\cg\cg3900a.rep">
-      <Filter>Reports</Filter>
-    </RepCompiler>
+    <RepCompiler Include="..\src\cg01\cg3900a.rep" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/Cg014.vcxproj b/build/Cg014.vcxproj
index b0b2cf32a..6663d9e1d 100644
--- a/build/Cg014.vcxproj
+++ b/build/Cg014.vcxproj
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -116,7 +116,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
diff --git a/build/Cg014.vcxproj.filters b/build/Cg014.vcxproj.filters
index 2f9788acc..e5ce1308c 100644
--- a/build/Cg014.vcxproj.filters
+++ b/build/Cg014.vcxproj.filters
@@ -219,11 +219,7 @@
     <ResourceCompile Include="campo.rc" />
   </ItemGroup>
   <ItemGroup>
-    <RepCompiler Include="..\src\cg01\cg4b00a.rep">
-      <Filter>Reports</Filter>
-    </RepCompiler>
-    <RepCompiler Include="..\src\cg01\cg4c00a.rep">
-      <Filter>Reports</Filter>
-    </RepCompiler>
+    <RepCompiler Include="..\src\cg\cg4b00a.rep" />
+    <RepCompiler Include="..\src\cg\cg4c00a.rep" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/Cg015.vcxproj b/build/Cg015.vcxproj
index ce831d5d9..9c3de604c 100644
--- a/build/Cg015.vcxproj
+++ b/build/Cg015.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;../src/cg01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -118,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;../src/cg01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;XVT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -311,10 +311,10 @@
     <ResourceCompile Include="campo.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="AgaLib.vcxproj">
+    <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib.vcxproj">
+    <ProjectReference Include="cglib01.vcxproj">
       <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/build/Cg016.vcxproj b/build/Cg016.vcxproj
index 018adee17..44999be87 100644
--- a/build/Cg016.vcxproj
+++ b/build/Cg016.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;DBG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -118,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;XVT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
diff --git a/build/Cg017.vcxproj b/build/Cg017.vcxproj
index dbc73a65f..db7864815 100644
--- a/build/Cg017.vcxproj
+++ b/build/Cg017.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -118,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;XVT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -207,9 +207,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="gest.rc" />
-  </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\cg01\cg7400a.uml">
       <FileType>Document</FileType>
@@ -301,6 +298,9 @@
     <PngCompiler Include="..\src\cg01\cg7h00a.png" />
     <PngCompiler Include="..\src\cg01\cg7h00b.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="campo.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="CampoRules.targets" />
diff --git a/build/Cg017.vcxproj.filters b/build/Cg017.vcxproj.filters
index 3468bc95c..e7299b9fe 100644
--- a/build/Cg017.vcxproj.filters
+++ b/build/Cg017.vcxproj.filters
@@ -91,9 +91,6 @@
       <Extensions>png</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="gest.rc" />
-  </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\cg01\cg7100i.uml">
       <Filter>Mask Files</Filter>
@@ -277,4 +274,7 @@
       <Filter>Sfondi PNG</Filter>
     </PngCompiler>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="campo.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/agalib01.sln b/build/agalib01.sln
index 5a4f91259..341548ca6 100644
--- a/build/agalib01.sln
+++ b/build/agalib01.sln
@@ -17,6 +17,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvslt", "xvslt.vcxproj", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64", "..\libraries\libb64\base64\VisualStudioProject\base64.vcxproj", "{0B094121-DC64-4D74-AFA0-750B83F800D0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfm", "gfm.vcxproj", "{37C3DDAE-3A63-4C1C-A419-242141B262ED}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cb6", "Cb6.vcxproj", "{99683594-420F-4DD9-BB41-7DC48278B931}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflib", "pdflib_dll.vcxproj", "{A294C667-27A9-4125-82AF-5093447505EC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflibwrap", "pdflibwrap.vcxproj", "{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uno", "Uno.vcxproj", "{8B0477F1-5D74-46C3-97B6-8879E2460A71}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -67,6 +77,36 @@ Global
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Release|Win32.ActiveCfg = Release|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Release|Win32.Build.0 = Release|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Release|x64.ActiveCfg = Release|Win32
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED}.Debug|Win32.Build.0 = Debug|Win32
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED}.Debug|x64.ActiveCfg = Debug|Win32
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED}.Release|Win32.ActiveCfg = Release|Win32
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED}.Release|Win32.Build.0 = Release|Win32
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED}.Release|x64.ActiveCfg = Release|Win32
+		{99683594-420F-4DD9-BB41-7DC48278B931}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99683594-420F-4DD9-BB41-7DC48278B931}.Debug|Win32.Build.0 = Debug|Win32
+		{99683594-420F-4DD9-BB41-7DC48278B931}.Debug|x64.ActiveCfg = Debug|Win32
+		{99683594-420F-4DD9-BB41-7DC48278B931}.Release|Win32.ActiveCfg = Release|Win32
+		{99683594-420F-4DD9-BB41-7DC48278B931}.Release|Win32.Build.0 = Release|Win32
+		{99683594-420F-4DD9-BB41-7DC48278B931}.Release|x64.ActiveCfg = Release|Win32
+		{A294C667-27A9-4125-82AF-5093447505EC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A294C667-27A9-4125-82AF-5093447505EC}.Debug|Win32.Build.0 = Debug|Win32
+		{A294C667-27A9-4125-82AF-5093447505EC}.Debug|x64.ActiveCfg = Debug|Win32
+		{A294C667-27A9-4125-82AF-5093447505EC}.Release|Win32.ActiveCfg = Release|Win32
+		{A294C667-27A9-4125-82AF-5093447505EC}.Release|Win32.Build.0 = Release|Win32
+		{A294C667-27A9-4125-82AF-5093447505EC}.Release|x64.ActiveCfg = Release|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Debug|Win32.Build.0 = Debug|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Debug|x64.ActiveCfg = Debug|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|Win32.ActiveCfg = Release|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|Win32.Build.0 = Release|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|x64.ActiveCfg = Release|Win32
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71}.Debug|Win32.Build.0 = Debug|Win32
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71}.Debug|x64.ActiveCfg = Debug|Win32
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71}.Release|Win32.ActiveCfg = Release|Win32
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71}.Release|Win32.Build.0 = Release|Win32
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/cg01.sln b/build/cg01.sln
index 3c3e7b19f..b3be51d38 100644
--- a/build/cg01.sln
+++ b/build/cg01.sln
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg014", "Cg014.vcxproj", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg015", "Cg015.vcxproj", "{4661E972-5AAC-4B3E-92C7-C267D5070793}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg6", "Cg6.vcxproj", "{4FD17D56-D966-4F85-A04A-28EC6E0824CF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cg01_masktab", "cg01_masktab.vcxproj", "{97368DC9-8B0D-4F75-A89F-9A58701226B6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg017", "Cg017.vcxproj", "{95FED395-F24E-4E5B-95B5-227A99CA255F}"
@@ -28,16 +26,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib01", "AgaLib01.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib01", "fplib01.vcxproj", "{A7FD39E9-5F95-471C-8468-49083FED7DC8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc01.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc01", "vedoc01.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga", "xvaga.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib01", "cglib01.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext01", "vedocext01.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg016", "Cg016.vcxproj", "{4FD17D56-D966-4F85-A04A-28EC6E0824CF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib01", "lilib01.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -68,10 +68,6 @@ Global
 		{4661E972-5AAC-4B3E-92C7-C267D5070793}.Debug|Win32.Build.0 = Debug|Win32
 		{4661E972-5AAC-4B3E-92C7-C267D5070793}.Release|Win32.ActiveCfg = Release|Win32
 		{4661E972-5AAC-4B3E-92C7-C267D5070793}.Release|Win32.Build.0 = Release|Win32
-		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Debug|Win32.Build.0 = Debug|Win32
-		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Release|Win32.ActiveCfg = Release|Win32
-		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Release|Win32.Build.0 = Release|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Debug|Win32.Build.0 = Debug|Win32
 		{97368DC9-8B0D-4F75-A89F-9A58701226B6}.Release|Win32.ActiveCfg = Release|Win32
@@ -92,22 +88,26 @@ Global
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
-		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
-		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
-		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
-		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
-		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
-		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.Build.0 = Debug|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.ActiveCfg = Release|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.Build.0 = Release|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
+		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
+		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
+		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
+		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Debug|Win32.Build.0 = Debug|Win32
+		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Release|Win32.ActiveCfg = Release|Win32
+		{4FD17D56-D966-4F85-A04A-28EC6E0824CF}.Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/cglib01.vcxproj b/build/cglib01.vcxproj
index 71bea89d4..fb1368322 100644
--- a/build/cglib01.vcxproj
+++ b/build/cglib01.vcxproj
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -86,7 +86,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -145,7 +145,7 @@
     <ClInclude Include="..\src\cg01\cglib.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="fplib.vcxproj">
+    <ProjectReference Include="fplib01.vcxproj">
       <Project>{a7fd39e9-5f95-471c-8468-49083fed7dc8}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/build/fp01.sln b/build/fp01.sln
index f4260068d..21e8d9e7b 100644
--- a/build/fp01.sln
+++ b/build/fp01.sln
@@ -23,10 +23,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc01", "vedoc01.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext01", "vedocext01.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga01", "xvaga01.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib01", "lilib01.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -61,14 +61,14 @@ Global
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Debug|Win32.Build.0 = Debug|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.ActiveCfg = Release|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/fp010.vcxproj b/build/fp010.vcxproj
index c03161045..9cebf450e 100644
--- a/build/fp010.vcxproj
+++ b/build/fp010.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libraries\SQLAPI\include; ..\src\xvtdb\;..\src\cg01;..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xvtdb\;..\src\cg01;..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -174,15 +174,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="fplib01.vcxproj">
-      <Project>{4237eab6-f619-4c7d-8b39-9961a84f83f2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
     </ProjectReference>
@@ -191,7 +182,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\fe\felib.cpp" />
     <ClCompile Include="..\src\fp01\fp0.cpp" />
     <ClCompile Include="..\src\fp01\fp0100.cpp" />
     <ClCompile Include="..\src\fp01\fp0200.cpp">
@@ -222,9 +212,6 @@
       <FileType>Document</FileType>
     </MskCompiler>
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\lib\fplib.lib" />
-  </ItemGroup>
   <ItemGroup>
     <MenCompiler Include="..\src\fp01\fpmenu.men" />
   </ItemGroup>
diff --git a/build/fp010.vcxproj.filters b/build/fp010.vcxproj.filters
index 3099a77ef..f9177f3f8 100644
--- a/build/fp010.vcxproj.filters
+++ b/build/fp010.vcxproj.filters
@@ -7,9 +7,6 @@
     <Filter Include="Masks">
       <UniqueIdentifier>{aa4d5fac-6242-4e34-8b78-263ec3e4d15f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Libraries">
-      <UniqueIdentifier>{d7227be8-6583-4473-895f-595f8a48a8cb}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Menu">
       <UniqueIdentifier>{022385bd-474b-4d1f-a01c-6d799bae0328}</UniqueIdentifier>
     </Filter>
@@ -27,9 +24,6 @@
     <ClCompile Include="..\src\fp01\fp0100.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\fe\felib.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\fp01\fp0300.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -80,11 +74,6 @@
       <Filter>Masks</Filter>
     </MskCompiler>
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\lib\fplib.lib">
-      <Filter>Libraries</Filter>
-    </Library>
-  </ItemGroup>
   <ItemGroup>
     <MenCompiler Include="..\src\fp01\fpmenu.men">
       <Filter>Menu</Filter>
diff --git a/build/fp011.vcxproj b/build/fp011.vcxproj
index cc787c19e..8e2966d55 100644
--- a/build/fp011.vcxproj
+++ b/build/fp011.vcxproj
@@ -173,18 +173,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="fplib01.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="tflib.vcxproj">
-      <Project>{7bf6939e-dfcd-49ed-b0a8-edb68ddce6d5}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
     </ProjectReference>
diff --git a/build/fp011.vcxproj.filters b/build/fp011.vcxproj.filters
index 50df51146..8c9a1a928 100644
--- a/build/fp011.vcxproj.filters
+++ b/build/fp011.vcxproj.filters
@@ -7,9 +7,6 @@
     <Filter Include="Masks">
       <UniqueIdentifier>{aa4d5fac-6242-4e34-8b78-263ec3e4d15f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Libraries">
-      <UniqueIdentifier>{d7227be8-6583-4473-895f-595f8a48a8cb}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Sources">
       <UniqueIdentifier>{06bc8aeb-f506-4c2e-85fb-bdeb92f2c77e}</UniqueIdentifier>
     </Filter>
diff --git a/build/fplib01.vcxproj b/build/fplib01.vcxproj
index e235238da..0e7d64cf5 100644
--- a/build/fplib01.vcxproj
+++ b/build/fplib01.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libraries\SQLAPI\include;..\src\xvtdb\;..\src\cg01;..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xvtdb\;..\src\cg01;..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
diff --git a/build/ve01.sln b/build/ve01.sln
index b18d6952b..0ac8a126f 100644
--- a/build/ve01.sln
+++ b/build/ve01.sln
@@ -47,20 +47,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xi", "xi.vcxproj", "{3A5B01
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga", "xvaga.vcxproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib01", "cglib01.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib01", "fplib01.vcxproj", "{A7FD39E9-5F95-471C-8468-49083FED7DC8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvslt", "xvslt.vcxproj", "{7ECF3959-40CC-4BAA-A5E1-8699789AC386}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\libraries\wx28X\build\msw\wx_xml.vcxproj", "{D88309C7-99E1-4899-AE46-9A5AD536BB98}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\libraries\wx28X\build\msw\wx_xml.vcxproj", "{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\libraries\wx28X\build\msw\wx_xrc.vcxproj", "{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\libraries\wx28X\build\msw\wx_xrc.vcxproj", "{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64", "..\libraries\libb64\base64\VisualStudioProject\base64.vcxproj", "{0B094121-DC64-4D74-AFA0-750B83F800D0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib01", "lilib01.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -1155,72 +1155,6 @@ Global
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Universal Unicode Release|Win32.Build.0 = Release|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Universal Unicode Release|x64.ActiveCfg = Release|Win32
 		{4A2FC619-2461-4F58-8F1D-92FA153E39A2}.Universal Unicode Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|x64.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|Win32.Build.0 = Debug|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|x64.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|Win32.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|Win32.Build.0 = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|x64.ActiveCfg = Release|Win32
-		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|x64.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1419,108 +1353,110 @@ Global
 		{7ECF3959-40CC-4BAA-A5E1-8699789AC386}.Universal Unicode Release|Win32.Build.0 = Release|Win32
 		{7ECF3959-40CC-4BAA-A5E1-8699789AC386}.Universal Unicode Release|x64.ActiveCfg = Release|Win32
 		{7ECF3959-40CC-4BAA-A5E1-8699789AC386}.Universal Unicode Release|x64.Build.0 = Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Debug|Win32.Build.0 = Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Debug|x64.ActiveCfg = Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Debug|x64.ActiveCfg = DLL Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Release|x64.ActiveCfg = DLL Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Unicode Debug|Win32.ActiveCfg = DLL Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Unicode Debug|Win32.Build.0 = DLL Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Unicode Debug|x64.ActiveCfg = DLL Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Unicode Release|Win32.ActiveCfg = DLL Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Unicode Release|Win32.Build.0 = DLL Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Unicode Release|x64.ActiveCfg = DLL Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Unicode Debug|Win32.ActiveCfg = DLL Universal Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Unicode Debug|Win32.Build.0 = DLL Universal Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Unicode Debug|x64.ActiveCfg = DLL Universal Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Unicode Release|Win32.ActiveCfg = DLL Universal Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Unicode Release|Win32.Build.0 = DLL Universal Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.DLL Universal Unicode Release|x64.ActiveCfg = DLL Universal Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Release|Win32.ActiveCfg = Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Release|Win32.Build.0 = Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Release|x64.ActiveCfg = Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Template|Win32.ActiveCfg = Template|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Template|Win32.Build.0 = Template|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Template|x64.ActiveCfg = Template|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Unicode Debug|x64.ActiveCfg = Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Unicode Release|x64.ActiveCfg = Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Debug|x64.ActiveCfg = Universal Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Release|x64.ActiveCfg = Universal Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Unicode Debug|Win32.ActiveCfg = Universal Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Unicode Debug|Win32.Build.0 = Universal Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Unicode Debug|x64.ActiveCfg = Universal Unicode Debug|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Unicode Release|Win32.ActiveCfg = Universal Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Unicode Release|Win32.Build.0 = Universal Unicode Release|Win32
-		{D88309C7-99E1-4899-AE46-9A5AD536BB98}.Universal Unicode Release|x64.ActiveCfg = Universal Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Debug|Win32.Build.0 = Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Debug|x64.ActiveCfg = Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Debug|x64.ActiveCfg = DLL Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Release|x64.ActiveCfg = DLL Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Unicode Debug|Win32.ActiveCfg = DLL Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Unicode Debug|Win32.Build.0 = DLL Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Unicode Debug|x64.ActiveCfg = DLL Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Unicode Release|Win32.ActiveCfg = DLL Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Unicode Release|Win32.Build.0 = DLL Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Unicode Release|x64.ActiveCfg = DLL Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Unicode Debug|Win32.ActiveCfg = DLL Universal Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Unicode Debug|Win32.Build.0 = DLL Universal Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Unicode Debug|x64.ActiveCfg = DLL Universal Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Unicode Release|Win32.ActiveCfg = DLL Universal Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Unicode Release|Win32.Build.0 = DLL Universal Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.DLL Universal Unicode Release|x64.ActiveCfg = DLL Universal Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Release|Win32.ActiveCfg = Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Release|Win32.Build.0 = Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Release|x64.ActiveCfg = Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Template|Win32.ActiveCfg = Template|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Template|Win32.Build.0 = Template|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Template|x64.ActiveCfg = Template|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Unicode Debug|x64.ActiveCfg = Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Unicode Release|x64.ActiveCfg = Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Debug|x64.ActiveCfg = Universal Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Release|Win32.Build.0 = Universal Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Release|x64.ActiveCfg = Universal Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Unicode Debug|Win32.ActiveCfg = Universal Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Unicode Debug|Win32.Build.0 = Universal Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Unicode Debug|x64.ActiveCfg = Universal Unicode Debug|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Unicode Release|Win32.ActiveCfg = Universal Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Unicode Release|Win32.Build.0 = Universal Unicode Release|Win32
-		{C83ABBEA-C829-4388-B0A1-DF433B4CFBA7}.Universal Unicode Release|x64.ActiveCfg = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Debug|Win32.Build.0 = Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Debug|x64.ActiveCfg = Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Debug|x64.ActiveCfg = DLL Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Release|x64.ActiveCfg = DLL Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Unicode Debug|Win32.ActiveCfg = DLL Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Unicode Debug|Win32.Build.0 = DLL Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Unicode Debug|x64.ActiveCfg = DLL Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Unicode Release|Win32.ActiveCfg = DLL Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Unicode Release|Win32.Build.0 = DLL Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Unicode Release|x64.ActiveCfg = DLL Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Unicode Debug|Win32.ActiveCfg = DLL Universal Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Unicode Debug|Win32.Build.0 = DLL Universal Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Unicode Debug|x64.ActiveCfg = DLL Universal Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Unicode Release|Win32.ActiveCfg = DLL Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Unicode Release|Win32.Build.0 = DLL Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.DLL Universal Unicode Release|x64.ActiveCfg = DLL Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Release|Win32.ActiveCfg = Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Release|Win32.Build.0 = Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Release|x64.ActiveCfg = Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Template|Win32.ActiveCfg = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Template|Win32.Build.0 = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Template|x64.ActiveCfg = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Template|x64.Build.0 = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Unicode Debug|x64.ActiveCfg = Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Unicode Release|x64.ActiveCfg = Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Debug|x64.ActiveCfg = Universal Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Release|x64.ActiveCfg = Universal Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Unicode Debug|Win32.ActiveCfg = Universal Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Unicode Debug|Win32.Build.0 = Universal Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Unicode Debug|x64.ActiveCfg = Universal Unicode Debug|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Unicode Release|Win32.ActiveCfg = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Unicode Release|Win32.Build.0 = Universal Unicode Release|Win32
+		{DD7ABF9B-D6A9-4BC7-9E0C-AC47AF810A20}.Universal Unicode Release|x64.ActiveCfg = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Debug|Win32.Build.0 = Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Debug|x64.ActiveCfg = Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Debug|x64.ActiveCfg = DLL Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Release|x64.ActiveCfg = DLL Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Unicode Debug|Win32.ActiveCfg = DLL Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Unicode Debug|Win32.Build.0 = DLL Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Unicode Debug|x64.ActiveCfg = DLL Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Unicode Release|Win32.ActiveCfg = DLL Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Unicode Release|Win32.Build.0 = DLL Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Unicode Release|x64.ActiveCfg = DLL Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Unicode Debug|Win32.ActiveCfg = DLL Universal Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Unicode Debug|Win32.Build.0 = DLL Universal Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Unicode Debug|x64.ActiveCfg = DLL Universal Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Unicode Release|Win32.ActiveCfg = DLL Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Unicode Release|Win32.Build.0 = DLL Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.DLL Universal Unicode Release|x64.ActiveCfg = DLL Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Release|Win32.ActiveCfg = Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Release|Win32.Build.0 = Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Release|x64.ActiveCfg = Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Template|Win32.ActiveCfg = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Template|Win32.Build.0 = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Template|x64.ActiveCfg = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Template|x64.Build.0 = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Unicode Debug|x64.ActiveCfg = Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Unicode Release|x64.ActiveCfg = Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Debug|x64.ActiveCfg = Universal Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Release|Win32.Build.0 = Universal Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Release|x64.ActiveCfg = Universal Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Unicode Debug|Win32.ActiveCfg = Universal Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Unicode Debug|Win32.Build.0 = Universal Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Unicode Debug|x64.ActiveCfg = Universal Unicode Debug|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Unicode Release|Win32.ActiveCfg = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Unicode Release|Win32.Build.0 = Universal Unicode Release|Win32
+		{C98DF560-79ED-4621-9D69-7FCD2D12C6B9}.Universal Unicode Release|x64.ActiveCfg = Universal Unicode Release|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Debug|Win32.Build.0 = Debug|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1587,6 +1523,72 @@ Global
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Universal Unicode Release|Win32.Build.0 = Release|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Universal Unicode Release|x64.ActiveCfg = Release|Win32
 		{0B094121-DC64-4D74-AFA0-750B83F800D0}.Universal Unicode Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|x64.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Unicode Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.DLL Universal Unicode Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Template|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Unicode Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Release|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|Win32.Build.0 = Debug|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Debug|x64.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|Win32.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|Win32.Build.0 = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|x64.ActiveCfg = Release|Win32
+		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Universal Unicode Release|x64.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/ve010.vcxproj b/build/ve010.vcxproj
index 4bd28297d..5211042f4 100644
--- a/build/ve010.vcxproj
+++ b/build/ve010.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\li;../src/include;../src/xvaga;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\cg01;../src/include01;../src/xvaga;01../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>
       </MinimalRebuild>
@@ -113,7 +113,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\li;../src/include;../src/xvaga;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\cg01;../src/include01;../src/xvaga01;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -220,12 +220,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="fplib01.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/ve011.vcxproj b/build/ve011.vcxproj
index f5d6c745f..423b3c0eb 100644
--- a/build/ve011.vcxproj
+++ b/build/ve011.vcxproj
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -113,7 +113,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -269,12 +269,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/ve012.vcxproj b/build/ve012.vcxproj
index 1393a849f..148eb3018 100644
--- a/build/ve012.vcxproj
+++ b/build/ve012.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -299,9 +299,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
     </ProjectReference>
diff --git a/build/ve013.vcxproj b/build/ve013.vcxproj
index 744a9e698..a8d2be780 100644
--- a/build/ve013.vcxproj
+++ b/build/ve013.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -200,19 +200,12 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="vedocex01t.vcxproj">
+    <ProjectReference Include="vedocext01.vcxproj">
       <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/ve014.vcxproj b/build/ve014.vcxproj
index c3fe8f127..f0ad8d253 100644
--- a/build/ve014.vcxproj
+++ b/build/ve014.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -115,7 +115,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -167,8 +167,6 @@
     </ClCompile>
     <ClCompile Include="..\src\ve01\ve4200.cpp" />
     <ClCompile Include="..\src\ve01\ve4300.cpp" />
-    <ClCompile Include="..\src\ve01\ve4400.cpp" />
-    <ClCompile Include="..\src\ve01\ve4500.cpp" />
   </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\ve01\ve4100.uml" />
@@ -181,12 +179,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/ve014.vcxproj.filters b/build/ve014.vcxproj.filters
index 9ac38fe6f..afcabea45 100644
--- a/build/ve014.vcxproj.filters
+++ b/build/ve014.vcxproj.filters
@@ -27,12 +27,6 @@
     <ClCompile Include="..\src\ve01\ve4300.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\ve01\ve4400.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ve01\ve4500.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\ve01\ve4100.uml">
diff --git a/build/ve015.vcxproj b/build/ve015.vcxproj
index d7e2491f8..c9c5af854 100644
--- a/build/ve015.vcxproj
+++ b/build/ve015.vcxproj
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -114,7 +114,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -221,12 +221,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/ve016.vcxproj b/build/ve016.vcxproj
index c58884b23..1377850f0 100644
--- a/build/ve016.vcxproj
+++ b/build/ve016.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/li;../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/li;../src/include01;../src/xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -114,7 +114,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -267,12 +267,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/ve018.vcxproj b/build/ve018.vcxproj
index bb61481e2..faf1f870d 100644
--- a/build/ve018.vcxproj
+++ b/build/ve018.vcxproj
@@ -64,7 +64,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/include;../src/xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;../src/cg01;..src/ve01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/include01;../src/xvaga01;../src/cg01;..src/ve01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -152,13 +152,6 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\cg\cg2101.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cglib02.cpp" />
-    <ClCompile Include="..\src\cg\cglib03.cpp" />
-    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
     <ClCompile Include="..\src\gv\gvlib.cpp" />
     <ClCompile Include="..\src\ve01\ve8.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -193,12 +186,6 @@
     <ProjectReference Include="AgaLib01.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
-    <ProjectReference Include="cglib01.vcxproj">
-      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
-    </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
-    </ProjectReference>
     <ProjectReference Include="vedoc01.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/ve018.vcxproj.filters b/build/ve018.vcxproj.filters
index 2a67e6105..2a440551a 100644
--- a/build/ve018.vcxproj.filters
+++ b/build/ve018.vcxproj.filters
@@ -19,15 +19,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\cg\cg2101.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cglib02.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cglib03.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\ve01\ve8.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -40,9 +31,6 @@
     <ClCompile Include="..\src\gv\gvlib.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cgsaldac.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\ve01\ve8100.uml">
diff --git a/build/vedoc01.vcxproj b/build/vedoc01.vcxproj
index 1d683c436..91f71ba47 100644
--- a/build/vedoc01.vcxproj
+++ b/build/vedoc01.vcxproj
@@ -58,7 +58,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;../src/xvtdb;..\src\cg%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;../src/xvtdb;..\src\cg01;..\src\ve01%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -86,7 +86,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;../src/xvtdb;..\src\cg%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;../src/xvtdb;..\src\cg01;..\src\ve01%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -211,15 +211,12 @@
     <ClInclude Include="..\src\ve01\vepriv.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="cglib011.vcxproj">
+    <ProjectReference Include="cglib01.vcxproj">
       <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
     </ProjectReference>
     <ProjectReference Include="fplib01.vcxproj">
       <Project>{a7fd39e9-5f95-471c-8468-49083fed7dc8}</Project>
     </ProjectReference>
-    <ProjectReference Include="lilib.vcxproj">
-      <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/vedocext01.vcxproj b/build/vedocext01.vcxproj
index 4c604b5f4..83322c0e3 100644
--- a/build/vedocext01.vcxproj
+++ b/build/vedocext01.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;..\src\cg01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include01;..\src\xvaga01;..\src\cg01;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -157,7 +157,7 @@
     <None Include="ClassDiagram.cd" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="lilib.vcxproj">
+    <ProjectReference Include="lilib01.vcxproj">
       <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
     </ProjectReference>
   </ItemGroup>