remove header copying from pre-build (done by build script)

2026-01-04 20:43:17 +01:00 · 2015-04-25 17:16:07 -05:00
parent 9fe19d1402
commit ca3cabf064
51 changed files with 530 additions and 686 deletions
--- a/Crypto/Crypto.progen
+++ b/Crypto/Crypto.progen
@@ -19,11 +19,11 @@ vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
 vc.project.linker.dependencies.release_static_mt = Crypt32.lib
 bits = ${vc.project.platform.bits}
 dirbits = ${vc.project.platform.bindir.suffix}
-vc.project.prebuild.debug_shared = xcopy /y /e ..\\openssl\\include\\* .\\include\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
-vc.project.prebuild.debug_static_md = xcopy /y /e ..\\openssl\\include\\* .\\include\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
-vc.project.prebuild.debug_static_mt = xcopy /y /e ..\\openssl\\include\\* .\\include\\*\nxcopy /y ..\\openssl\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\*
-vc.project.prebuild.release_shared = xcopy /y /e ..\\openssl\\include\\* .\\include\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
-vc.project.prebuild.release_static_md = xcopy /y /e ..\\openssl\\include\\* .\\include\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
-vc.project.prebuild.release_static_mt = xcopy /y /e ..\\openssl\\include\\* .\\include\\*\nxcopy /y ..\\openssl\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\*
+vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
--- a/Crypto/Crypto_CE_VS90.vcproj
+++ b/Crypto/Crypto_CE_VS90.vcproj
@@ -20,7 +20,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -99,7 +99,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -179,7 +179,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -245,7 +245,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -312,7 +312,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -378,7 +378,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
--- a/Crypto/Crypto_VS90.vcproj
+++ b/Crypto/Crypto_VS90.vcproj
@@ -20,7 +20,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -91,7 +91,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -165,7 +165,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -223,7 +223,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -282,7 +282,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -340,7 +340,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
--- a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters
+++ b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{209b677c-6382-4ce4-8c42-0aa415bcc2bf}</UniqueIdentifier>
+      <UniqueIdentifier>{1fdc23a2-4c6a-46bf-b747-a30e4968b6a7}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{0ffd12b9-ef74-42d7-94d4-2a7bf4fffa41}</UniqueIdentifier>
+      <UniqueIdentifier>{6c5dfb7d-c5a7-4fa3-8806-0f08837e8bb8}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{ea9ac337-e57e-4e9a-acd1-1f3fa98f5770}</UniqueIdentifier>
+      <UniqueIdentifier>{202e7fa1-2777-4daa-96dc-eae20f6a7e46}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{f6456479-cbc9-4b55-8af6-39008688fdb0}</UniqueIdentifier>
+      <UniqueIdentifier>{90a7aa64-ba18-485d-ad04-28dd83d5eda5}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{5ec6a7c1-ab44-485b-9083-c744d2e1424d}</UniqueIdentifier>
+      <UniqueIdentifier>{abcaaa84-0acd-47c0-bb6d-a1cf84ea7e8b}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{cd00aa53-cef9-410d-9d05-882058300138}</UniqueIdentifier>
+      <UniqueIdentifier>{c024ebc8-dc48-4153-8501-e4da7a464220}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{df9071ad-f1e1-49d9-9f65-cb080af9ef9d}</UniqueIdentifier>
+      <UniqueIdentifier>{cd242204-a245-4e33-868d-512a3b964e60}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{6ebe7bab-a37b-4154-992b-f267536ac474}</UniqueIdentifier>
+      <UniqueIdentifier>{b64caf0c-3365-4f2e-9a05-cc0ba7621ccb}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{67e18cae-70ff-4a56-8773-ef5ff5b659e8}</UniqueIdentifier>
+      <UniqueIdentifier>{cec42f11-1626-4df9-90f7-c9bd3d61e62d}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{33f62aec-3556-42fe-8ab7-18e356e2ef35}</UniqueIdentifier>
+      <UniqueIdentifier>{7c26fa41-c29d-4136-a8fa-0c4da407be0e}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{a86d824e-4540-4249-ad53-b2df88e2967f}</UniqueIdentifier>
+      <UniqueIdentifier>{c0b6d4cb-62c3-4f87-ba14-72b9a2ef6f57}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{07ab436b-01a0-4c81-b2d7-b488ab4970cb}</UniqueIdentifier>
+      <UniqueIdentifier>{5cce7023-f11e-4d86-b641-728009d54d33}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{cf20d905-fcf7-4b08-884c-6de1c831b96a}</UniqueIdentifier>
+      <UniqueIdentifier>{9899fdc5-4a64-4abc-9c40-1fbbcd54c34a}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{4b1b76b7-642e-46db-8b0c-fe47e0c3c011}</UniqueIdentifier>
+      <UniqueIdentifier>{2f546b96-8b6c-481f-967b-791275fb1ef2}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{580a9042-0201-445e-b7bf-676f24090efb}</UniqueIdentifier>
+      <UniqueIdentifier>{93d46d6a-2b4d-45c5-ad01-fc041c16e7b7}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters
+++ b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{067e7a52-39df-4596-af6f-a2c0cb06d33d}</UniqueIdentifier>
+      <UniqueIdentifier>{8f9761f2-699f-493d-97c1-195bdb230934}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{19cd2091-2594-4b1a-9b9f-07ba1f625cdc}</UniqueIdentifier>
+      <UniqueIdentifier>{b8084dea-3150-41de-b1fc-286e9fc932f1}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{c36e56d6-8c9f-417c-ab87-e6f9e19aca1b}</UniqueIdentifier>
+      <UniqueIdentifier>{6eb58c71-a9f3-4b42-a54b-2c78faf91861}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{2d2e2b41-dee8-4c43-9579-7e7e320b9331}</UniqueIdentifier>
+      <UniqueIdentifier>{833fa7a8-5730-410b-abfa-4d0c0560135f}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{80eb4051-6690-4742-823f-eb52861183b5}</UniqueIdentifier>
+      <UniqueIdentifier>{f5964101-5180-4411-b99e-20a25e921830}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{04b3e147-f6e8-4ea6-b30e-99d1286f0c9b}</UniqueIdentifier>
+      <UniqueIdentifier>{bb330d93-450d-48c8-b5b0-9d50b0e76e56}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{a0bd2f3d-139f-4b5d-929f-bbb3e507e3b1}</UniqueIdentifier>
+      <UniqueIdentifier>{307b5e7d-84e8-40c4-8a56-8eefa4fdc8a9}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{13e328f3-3241-4f94-b035-b8baf6e9a0b7}</UniqueIdentifier>
+      <UniqueIdentifier>{f2123f3a-4dc0-4e05-ac90-8cc29d3c35ff}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{beb7b081-a411-4191-902d-c2d8f9a2a570}</UniqueIdentifier>
+      <UniqueIdentifier>{79e50ef0-e817-4fc2-8f47-7149b6d549b0}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{b8622600-e149-491a-83fe-98f1561079b5}</UniqueIdentifier>
+      <UniqueIdentifier>{9183f84d-43a2-4930-adb2-dedde364b95c}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{4e0d185f-118f-47c9-9f85-b7339e8b91c1}</UniqueIdentifier>
+      <UniqueIdentifier>{31d3676e-4c17-4a00-943e-4df082de0af2}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{62386ac9-9988-47b3-b764-a8866362a493}</UniqueIdentifier>
+      <UniqueIdentifier>{e6fd35a9-4e91-4dd0-b528-ad13c69f5370}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{60730a90-6d19-496b-b44e-a3d7536e3225}</UniqueIdentifier>
+      <UniqueIdentifier>{ff079ef2-37ad-43b3-b82d-4390f6fd6c31}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{2333429a-05d8-4faf-bb66-9bdbaf741831}</UniqueIdentifier>
+      <UniqueIdentifier>{4f14a695-419a-4daa-9191-97d096c532a9}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{a6434e0d-44ee-4372-a4e2-7ec85770f01b}</UniqueIdentifier>
+      <UniqueIdentifier>{dafe7886-d002-4196-9913-9e840efea593}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_vs100.vcxproj
+++ b/Crypto/Crypto_vs100.vcxproj
@@ -103,8 +103,8 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\debug\*32MDd.dll ..\*
-xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -140,8 +140,8 @@ xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\release\*32MD.dll ..\*
-xcopy /y ..\openssl\win32\release\*32MD.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
@@ -238,8 +238,8 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\debug\*32MDd.dll ..\*
-xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -267,8 +267,8 @@ xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\release\*32MD.dll ..\*
-xcopy /y ..\openssl\win32\release\*32MD.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
--- a/Crypto/Crypto_vs100.vcxproj.filters
+++ b/Crypto/Crypto_vs100.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{2fd255d6-7594-4a66-9695-ef3120f35636}</UniqueIdentifier>
+      <UniqueIdentifier>{624d9daf-fa62-4153-b397-5d8652300de8}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{0b6f110e-d78e-4cf9-b56e-8a56f5adf0ed}</UniqueIdentifier>
+      <UniqueIdentifier>{ca8053c3-c618-4c67-ab46-09a4bb26c136}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{93c0bd6e-2e58-4c28-abfe-7061860105f6}</UniqueIdentifier>
+      <UniqueIdentifier>{1918366e-9313-4df3-b167-306e02dbba22}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{62892aa6-b8be-4746-bb57-c78ee4a94ece}</UniqueIdentifier>
+      <UniqueIdentifier>{e4beac20-18e2-4a53-bdb9-41a03beb0033}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{a91b9a79-4852-4ddb-a7d1-35829dae9478}</UniqueIdentifier>
+      <UniqueIdentifier>{adcf5182-569f-4dd9-979a-b4f73f329d91}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{5ddb36af-f119-4ff1-817d-78dba21a711f}</UniqueIdentifier>
+      <UniqueIdentifier>{b0e55e53-dc4f-4baf-b863-0e32f9889cb7}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{e23d39ce-4dd3-4d70-b59f-c0012a167dce}</UniqueIdentifier>
+      <UniqueIdentifier>{848c6fcb-db73-4408-bb2b-2c563d947c1e}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{dd57a069-59cb-445f-a087-594b748b1cf5}</UniqueIdentifier>
+      <UniqueIdentifier>{0fd144cf-afcc-409d-afd0-f6ca9fa13620}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{b7715214-0a6b-4bbc-9b8f-0a395b53fadd}</UniqueIdentifier>
+      <UniqueIdentifier>{80319ddd-7a39-4a8a-bb9f-6cc63fde8a6b}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{58070b9c-077d-498d-ac77-27ad7a723b9e}</UniqueIdentifier>
+      <UniqueIdentifier>{ce5367f4-6a94-4843-b853-ba0f7eb75551}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{c6ebe2b3-d37d-4d6b-ab99-0b251b5df251}</UniqueIdentifier>
+      <UniqueIdentifier>{7d66e941-462e-4803-8aa2-5f2e94384b70}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{4d575d05-3bc1-4572-9b95-32bff1b89eef}</UniqueIdentifier>
+      <UniqueIdentifier>{a88e5f46-d159-4f4e-9958-be67df2289ca}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{26925014-29d3-43d4-9a7d-c9cc3e898620}</UniqueIdentifier>
+      <UniqueIdentifier>{98e3dc14-072f-494d-ab12-16233be24896}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{d3706580-3b6b-4f49-bcd0-3b8e431379b2}</UniqueIdentifier>
+      <UniqueIdentifier>{ef19e50d-4c19-4465-bea9-a67af66458fe}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{c1e6fe3e-a73b-4a73-aab3-9dd7e3c7bb19}</UniqueIdentifier>
+      <UniqueIdentifier>{cff0daff-f4ec-4ed3-85ef-87c515fe25c0}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_vs110.vcxproj
+++ b/Crypto/Crypto_vs110.vcxproj
@@ -121,8 +121,8 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\debug\*32MDd.dll ..\*
-xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -155,8 +155,8 @@ xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\release\*32MD.dll ..\*
-xcopy /y ..\openssl\win32\release\*32MD.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
@@ -246,8 +246,8 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\debug\*32MDd.dll ..\*
-xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -273,8 +273,8 @@ xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\release\*32MD.dll ..\*
-xcopy /y ..\openssl\win32\release\*32MD.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
--- a/Crypto/Crypto_vs110.vcxproj.filters
+++ b/Crypto/Crypto_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{508ae7b3-ecd6-4ccf-85e8-67e20d28ab95}</UniqueIdentifier>
+      <UniqueIdentifier>{cfeed46a-ed27-485f-a397-87b16d50673f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{0198bdd8-ba09-4288-9ae9-a1e3e885b1de}</UniqueIdentifier>
+      <UniqueIdentifier>{41813333-f36b-4698-98b1-4acb69771a6f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{21bd9f76-ee36-49bb-bac9-ac0ef75fa527}</UniqueIdentifier>
+      <UniqueIdentifier>{28ddec24-305e-4771-8d84-de3b702f1419}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{b5f631d6-a685-42cb-8736-347c1e9100bb}</UniqueIdentifier>
+      <UniqueIdentifier>{6ff5bed8-87ca-4571-8029-f6be66389eae}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{07262261-82e6-4bd6-b37b-16fd03ec44ad}</UniqueIdentifier>
+      <UniqueIdentifier>{e707826a-3840-4902-82c6-610e900463fe}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{519a5b6b-21e2-4c7a-b771-2842ee778ac5}</UniqueIdentifier>
+      <UniqueIdentifier>{9729308a-97ca-4e9f-b8e2-c6f6ec946276}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{6a770034-9d29-41a1-8f88-38bff3d5d3a7}</UniqueIdentifier>
+      <UniqueIdentifier>{2bb8929f-b590-4622-b95a-f85a823babaa}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{75b2b496-8745-49e6-b8ea-9035cd5aa63e}</UniqueIdentifier>
+      <UniqueIdentifier>{60a8c911-81c9-4fbb-b8f1-d7f032bcaf06}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{2c35562c-5567-43a8-b76c-3d265a672aac}</UniqueIdentifier>
+      <UniqueIdentifier>{4df8da9b-0424-44df-b2be-b46c34c55df7}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{e5c214a7-af88-4a4a-b5db-b51054cf16e2}</UniqueIdentifier>
+      <UniqueIdentifier>{2444a84f-574e-4280-92e8-91a6bc481449}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{4c1e59dc-4981-43b8-bc3c-42191dde69bc}</UniqueIdentifier>
+      <UniqueIdentifier>{b7813a70-96dc-4aaf-bfef-bada475b16d5}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{af94e79f-1c0f-4527-93d5-1fb9e75d0c9f}</UniqueIdentifier>
+      <UniqueIdentifier>{e4d9f943-c97b-438a-a8c7-1a7afb209fda}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{4ef530a9-a139-4096-b2bf-bf8910182cba}</UniqueIdentifier>
+      <UniqueIdentifier>{29d7d878-e724-46fe-b058-110dbc014fe1}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{cf5ea426-e331-45bd-8c42-adcd01575b1c}</UniqueIdentifier>
+      <UniqueIdentifier>{fdeb470d-0e73-4296-9cce-f6478376e23b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{b3aa99d5-5c62-4960-ba2c-184073cbff95}</UniqueIdentifier>
+      <UniqueIdentifier>{9eca892f-57c2-4a72-aea6-d39e91bbc050}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_vs120.vcxproj
+++ b/Crypto/Crypto_vs120.vcxproj
@@ -121,8 +121,8 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\debug\*32MDd.dll ..\*
-xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -155,8 +155,8 @@ xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\release\*32MD.dll ..\*
-xcopy /y ..\openssl\win32\release\*32MD.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
@@ -246,8 +246,8 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\debug\*32MDd.dll ..\*
-xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -273,8 +273,8 @@ xcopy /y ..\openssl\win32\debug\*32MDd.lib ..\lib\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\release\*32MD.dll ..\*
-xcopy /y ..\openssl\win32\release\*32MD.lib ..\lib\*</Command>
+      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
+xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
--- a/Crypto/Crypto_vs120.vcxproj.filters
+++ b/Crypto/Crypto_vs120.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{1a52c69b-38fc-466c-b90f-05a9568f344c}</UniqueIdentifier>
+      <UniqueIdentifier>{69782653-aacf-4426-8592-51ce75f06f5c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{24552ec6-5497-4024-a7b0-ad083259c7e9}</UniqueIdentifier>
+      <UniqueIdentifier>{6108b20c-9e35-46f1-a048-6670eac676c0}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{92e66dbb-cfe2-4374-bacc-3a8ba801e760}</UniqueIdentifier>
+      <UniqueIdentifier>{bac49e4b-caeb-4861-8edd-8ef444855ad8}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{13740b7f-8f26-4641-a14c-31a73edd49fd}</UniqueIdentifier>
+      <UniqueIdentifier>{d7bffa7e-7099-4d4a-8a26-e12dfeb8becd}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{163be8e0-c685-4907-a909-0ce896e7f1fd}</UniqueIdentifier>
+      <UniqueIdentifier>{6b81879e-45bc-4093-9e46-26752b15d44f}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{e83e527b-aac9-4249-85a9-02e05e909317}</UniqueIdentifier>
+      <UniqueIdentifier>{53d58874-4c31-46e4-adee-dea1afc52e1b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{055602b2-49d7-4287-8465-a514d6c40960}</UniqueIdentifier>
+      <UniqueIdentifier>{3f4f2025-88ab-4a3f-a601-bb9e4f7190e2}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{f030e12a-fa3e-426f-a0c8-b3e8ff61571d}</UniqueIdentifier>
+      <UniqueIdentifier>{303c84ab-2e5e-4e67-9192-dccd777ecf81}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{2e53f252-7baf-4dc4-b46d-b6fda8e53b84}</UniqueIdentifier>
+      <UniqueIdentifier>{d0a73f93-10c9-443f-8136-859a7f0af9aa}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{e92d5d1a-d7b7-4ce4-a38c-bc3a8f9e99eb}</UniqueIdentifier>
+      <UniqueIdentifier>{8421118e-2303-4740-a7ce-5f86bcb49300}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{73dbe648-9cc2-4f88-979e-757cec42c335}</UniqueIdentifier>
+      <UniqueIdentifier>{9394e794-6e6f-4162-8a1b-372ef46425b5}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{074b732b-137c-427c-84a8-87132d9fa5af}</UniqueIdentifier>
+      <UniqueIdentifier>{b3bd1d88-70f2-4a67-be76-b5b0480b1a9f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{059eedf9-fdce-4455-a4cd-6cfc560533e1}</UniqueIdentifier>
+      <UniqueIdentifier>{b100d0b6-f2f8-4c88-8792-59a0f33159cc}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{431ef645-1c75-4610-89c6-95193674524e}</UniqueIdentifier>
+      <UniqueIdentifier>{f81d040f-eda1-4e4a-bccb-07fe0de92e03}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{87f56280-fd7f-4e4f-82a6-6c4591d95030}</UniqueIdentifier>
+      <UniqueIdentifier>{3da4a7e8-0df2-4552-b0cc-b0cb9157fd83}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_x64_vs100.vcxproj
+++ b/Crypto/Crypto_x64_vs100.vcxproj
@@ -103,8 +103,8 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\debug\*64MDd.dll ..64\*
-xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -140,8 +140,8 @@ xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\release\*64MD.dll ..64\*
-xcopy /y ..\openssl\win64\release\*64MD.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
@@ -238,8 +238,8 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\debug\*64MDd.dll ..64\*
-xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -267,8 +267,8 @@ xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\release\*64MD.dll ..64\*
-xcopy /y ..\openssl\win64\release\*64MD.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
--- a/Crypto/Crypto_x64_vs100.vcxproj.filters
+++ b/Crypto/Crypto_x64_vs100.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{f63a0df1-373a-409f-beb2-c3e6556a3dea}</UniqueIdentifier>
+      <UniqueIdentifier>{8b25fd31-c505-4c1d-b980-36f76b7f604d}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{c9219207-8a11-4a9d-a5da-531b380f9071}</UniqueIdentifier>
+      <UniqueIdentifier>{5112562a-18a0-452f-94c8-07042eb32e3c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{30bd9002-0c7c-4a43-a203-1e542111dffe}</UniqueIdentifier>
+      <UniqueIdentifier>{c4ad2ab5-aaba-40a8-9389-3d78ec12c7be}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{3cc77919-e295-44c1-8b8e-f379bb70f4f6}</UniqueIdentifier>
+      <UniqueIdentifier>{ddf5814b-ac55-4e44-80f7-5c8147b080c7}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{2ecf5415-59d6-4127-9296-649a5d04b09d}</UniqueIdentifier>
+      <UniqueIdentifier>{ad8c3d7e-04f0-4a96-8ed9-24c3f0cf7c8d}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{96e6ba9f-19f6-45ac-9db8-64416e681b42}</UniqueIdentifier>
+      <UniqueIdentifier>{c7fe6f2d-0660-4b59-a624-328cc345183c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{e71c7f7b-37e6-46be-91c4-1c75167de5bc}</UniqueIdentifier>
+      <UniqueIdentifier>{6f26d2b2-0445-4fb2-a2a0-7b3141069cf0}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{1b28127d-7632-475f-a247-c2ce00df3011}</UniqueIdentifier>
+      <UniqueIdentifier>{fb01c164-a87c-4662-b19a-23b0df51b1fd}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{92a9acf4-3233-4369-83c9-1bd983bcfcab}</UniqueIdentifier>
+      <UniqueIdentifier>{01d36372-d001-4e93-9053-5b157ffd88d3}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{864d93b7-bbdb-4280-9ed8-5912a7f010ab}</UniqueIdentifier>
+      <UniqueIdentifier>{f575e2c9-226d-4731-870a-7f0b114bdbe9}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{7490a80d-39a5-4dd1-97b1-1f261ed2f66f}</UniqueIdentifier>
+      <UniqueIdentifier>{0cd061ec-8c0a-46f0-970a-eba2b35edd80}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{5c6b3eed-4794-4c64-a8d2-f9e241f3ac74}</UniqueIdentifier>
+      <UniqueIdentifier>{ba17552f-00e5-4c8e-a17d-365728c3e515}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{87fb6bff-1d53-4821-9bc2-9f0c397dbbca}</UniqueIdentifier>
+      <UniqueIdentifier>{91fc73ed-2c92-4ffa-a152-96bec4bac7db}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{9826a37d-b6c5-4152-8fd4-008265aef418}</UniqueIdentifier>
+      <UniqueIdentifier>{00caf209-5917-4792-833c-96666168158c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{519a3709-48a0-4715-811f-fbae2417b9ab}</UniqueIdentifier>
+      <UniqueIdentifier>{59be6f80-b228-4b41-a423-bdb3a3c2f2df}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_x64_vs110.vcxproj
+++ b/Crypto/Crypto_x64_vs110.vcxproj
@@ -121,8 +121,8 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\debug\*64MDd.dll ..64\*
-xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -155,8 +155,8 @@ xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\release\*64MD.dll ..64\*
-xcopy /y ..\openssl\win64\release\*64MD.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
@@ -246,8 +246,8 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\debug\*64MDd.dll ..64\*
-xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -273,8 +273,8 @@ xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\release\*64MD.dll ..64\*
-xcopy /y ..\openssl\win64\release\*64MD.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
--- a/Crypto/Crypto_x64_vs110.vcxproj.filters
+++ b/Crypto/Crypto_x64_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{401ce9be-0908-42d9-a966-8f2a9ca8e357}</UniqueIdentifier>
+      <UniqueIdentifier>{a4436a18-87f5-4cbb-87a5-1ab850d76fea}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{3630daa2-25e5-446e-b1f5-2480de5c7fab}</UniqueIdentifier>
+      <UniqueIdentifier>{7fe43c84-81eb-4da2-8018-4107343ad87b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{d50c0a2c-beda-4e60-ab21-999926cae972}</UniqueIdentifier>
+      <UniqueIdentifier>{e2be82f3-7a11-40ab-9400-21bc37e0f33f}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{32c3b3b1-8d9f-4e6a-b371-c1fe89462960}</UniqueIdentifier>
+      <UniqueIdentifier>{81c218fc-5173-498b-a5c3-5d812dea81d3}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{4f81fbca-7357-471e-b200-7865252e0a86}</UniqueIdentifier>
+      <UniqueIdentifier>{95097c14-bb84-4b85-abe4-1d69a7040d35}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{c8a5d9eb-becb-4883-8988-74d13ac72418}</UniqueIdentifier>
+      <UniqueIdentifier>{f393034d-d5fa-4030-a711-1666adef4fb4}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{26b65384-9b5c-426f-b394-253f1b29cbd1}</UniqueIdentifier>
+      <UniqueIdentifier>{179f0390-5a03-4466-b580-81ab812184a1}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{f258285e-d01a-409a-a828-6f48a3065c79}</UniqueIdentifier>
+      <UniqueIdentifier>{f809cb80-52a7-43c8-98f4-c37fe977f892}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{3c728873-3de9-490c-a84d-8b8c2860f642}</UniqueIdentifier>
+      <UniqueIdentifier>{7c7eb585-a8b1-4523-948d-8c177b2a7067}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{c164b153-ff63-4208-81e6-b7876d68fbda}</UniqueIdentifier>
+      <UniqueIdentifier>{f6ebabf1-ad04-4d69-8ff1-8be29859656f}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{5552a39c-2c07-4cd5-88e8-e1b3bbc5aded}</UniqueIdentifier>
+      <UniqueIdentifier>{3b98a0d1-234a-4308-950a-496d29129e79}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{f5abaa3c-86ea-43ce-8364-d5d68409c2be}</UniqueIdentifier>
+      <UniqueIdentifier>{ba5dbaf2-2e0f-48b7-9cca-ee703fe80552}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{2892d0cd-be0c-4371-9f66-ca60711093af}</UniqueIdentifier>
+      <UniqueIdentifier>{d16d49f6-b12f-4fbe-a557-6783192e2978}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{da4febfe-0a75-41d5-a21d-5845423be95c}</UniqueIdentifier>
+      <UniqueIdentifier>{9fdca16e-d308-40c8-957d-3811df9fcc7b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{387e99bd-8bfa-4840-9629-003663a7778e}</UniqueIdentifier>
+      <UniqueIdentifier>{6406d1c7-5b63-4631-ae09-e3ec37fc9c80}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_x64_vs120.vcxproj
+++ b/Crypto/Crypto_x64_vs120.vcxproj
@@ -121,8 +121,8 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\debug\*64MDd.dll ..64\*
-xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -155,8 +155,8 @@ xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\release\*64MD.dll ..64\*
-xcopy /y ..\openssl\win64\release\*64MD.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
@@ -246,8 +246,8 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\debug\*64MDd.dll ..64\*
-xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -273,8 +273,8 @@ xcopy /y ..\openssl\win64\debug\*64MDd.lib ..\lib64\*</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\release\*64MD.dll ..64\*
-xcopy /y ..\openssl\win64\release\*64MD.lib ..\lib64\*</Command>
+      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
+xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
--- a/Crypto/Crypto_x64_vs120.vcxproj.filters
+++ b/Crypto/Crypto_x64_vs120.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Cipher">
-      <UniqueIdentifier>{9eac16e3-bc20-472b-ae24-25ad98e1ee86}</UniqueIdentifier>
+      <UniqueIdentifier>{20db04f6-d7de-4b57-9e40-06f45519c430}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{e284f561-9864-45c0-af73-c4eb58be7c0d}</UniqueIdentifier>
+      <UniqueIdentifier>{d1fbe885-ff61-4ab7-926e-28db1e90fd89}</UniqueIdentifier>
    </Filter>
    <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{d059db95-e4b7-45ea-b6af-e0e4d7cefd1e}</UniqueIdentifier>
+      <UniqueIdentifier>{053da751-9123-4861-a677-96e9c7f6e8d5}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA">
-      <UniqueIdentifier>{d22b6084-44c8-4beb-9712-e02298baa786}</UniqueIdentifier>
+      <UniqueIdentifier>{1d1db47d-f5c5-47cd-bc38-c0e77c45196d}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{43fdb438-1798-4582-a7b5-a8fc5365703d}</UniqueIdentifier>
+      <UniqueIdentifier>{d48525ab-c78c-4ad1-b7ed-e922140c623f}</UniqueIdentifier>
    </Filter>
    <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{fb29dc90-e0e0-49a0-875c-461d0201f7e6}</UniqueIdentifier>
+      <UniqueIdentifier>{c4cae929-c772-4add-8a7a-b52887da1c69}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate">
-      <UniqueIdentifier>{c152a74d-f0af-4b1a-a3d1-0b1c38b8dec5}</UniqueIdentifier>
+      <UniqueIdentifier>{84d19a0a-ec7e-4d4c-b84c-04dfd7aa397b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{032ff9f4-969a-4968-93b0-a496d5009b6d}</UniqueIdentifier>
+      <UniqueIdentifier>{aeca7c43-3208-4a89-a2c6-dc6eb4c5416b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{db6b67c5-8dfb-4049-a609-c4550ccf519e}</UniqueIdentifier>
+      <UniqueIdentifier>{e3c0ef61-0828-4a7d-9bb4-05f171f3cb0f}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore">
-      <UniqueIdentifier>{e182aa22-865d-4ee8-a145-edea817d5128}</UniqueIdentifier>
+      <UniqueIdentifier>{53628c5e-9999-4a76-b3fd-9187f5ea4031}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{4462c050-45a1-4d1b-b9c7-9eecb887943d}</UniqueIdentifier>
+      <UniqueIdentifier>{5ed492cc-0385-4992-9dbb-41c61c43ed64}</UniqueIdentifier>
    </Filter>
    <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{4d2bb676-0c64-4cdd-b58c-db4b81ec99dd}</UniqueIdentifier>
+      <UniqueIdentifier>{cfb2425b-5755-4b7b-b61f-8f89a7461945}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest">
-      <UniqueIdentifier>{b377fbbb-a656-41ac-aaaa-55c7bfeaf276}</UniqueIdentifier>
+      <UniqueIdentifier>{e8e80747-73b8-4717-bcf5-4dd059a6cba1}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{6fbcc210-34cd-450e-a568-510a15434914}</UniqueIdentifier>
+      <UniqueIdentifier>{d21750b4-c7b7-4a11-b6e8-c5b3051590c7}</UniqueIdentifier>
    </Filter>
    <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{c4fcc0be-fe7f-4525-86ef-2ba9b66f1ab0}</UniqueIdentifier>
+      <UniqueIdentifier>{135deec6-212b-4ff4-bbdc-519b90c6b81e}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/Crypto_x64_vs90.vcproj
+++ b/Crypto/Crypto_x64_vs90.vcproj
@@ -20,7 +20,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*"/>
+				CommandLine="xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -91,7 +91,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*"/>
+				CommandLine="xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -166,7 +166,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\*&#xA;xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*"/>
+				CommandLine="xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\*&#xA;xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -225,7 +225,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\*"/>
+				CommandLine="xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -285,7 +285,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*"/>
+				CommandLine="xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -344,7 +344,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y /e ..\openssl\include\* .\include\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*"/>
+				CommandLine="xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
--- a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{aeeb507b-b880-40b7-b258-3a55856602a6}</UniqueIdentifier>
+      <UniqueIdentifier>{87d25253-6dc7-43dc-ae8a-82f113773e29}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{99e20bb2-8ea4-4d2e-a5bb-7cabbb61975c}</UniqueIdentifier>
+      <UniqueIdentifier>{ba687aed-323f-4ad9-b8d3-92372c4fe4a0}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{edef5571-70ff-4fef-b722-14217b09749c}</UniqueIdentifier>
+      <UniqueIdentifier>{d39e904e-b717-4b40-bb56-03cbd1208b14}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{4231f7c9-d29c-4879-8175-a5c0174adcaf}</UniqueIdentifier>
+      <UniqueIdentifier>{24f96bc4-1312-475a-8aa9-587bbcea22bf}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{421c61d2-781f-480e-853d-7207831248e3}</UniqueIdentifier>
+      <UniqueIdentifier>{5fe377c0-12e1-45ad-84e4-1bde32810860}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c750e899-a404-48b2-9ba4-595bad902d41}</UniqueIdentifier>
+      <UniqueIdentifier>{b92760f9-556e-486a-9fbe-2985ff227b5b}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{8e1ab71b-f3c9-4e80-9197-4214f20cff85}</UniqueIdentifier>
+      <UniqueIdentifier>{6fdc743c-cb02-4e52-b558-78fc469be879}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{21e480c2-1f7c-4987-b19d-9d5537eb64e6}</UniqueIdentifier>
+      <UniqueIdentifier>{e201a261-5263-4216-a3e2-f0668c251429}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{e9ab664e-4e3c-4a84-836e-4f77772f88a9}</UniqueIdentifier>
+      <UniqueIdentifier>{7970ed12-d956-4b18-bed4-806f9bb20221}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{d1c9fd51-2518-4232-9e9d-78868990a229}</UniqueIdentifier>
+      <UniqueIdentifier>{f1f7024e-115b-4392-bd22-9f21b4384820}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{e32f9443-b80d-4b53-8e14-895ae943afb6}</UniqueIdentifier>
+      <UniqueIdentifier>{e4159b7e-696e-4551-815c-e291e39837e2}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{fbe1138c-dec4-45d9-a2f9-e1824238670c}</UniqueIdentifier>
+      <UniqueIdentifier>{71922843-b04f-4655-b43a-f17552a3538e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{45376c30-92f1-4a05-a7a0-ffd759756fb8}</UniqueIdentifier>
+      <UniqueIdentifier>{4ef03f9e-3009-493b-85a6-4735ed42ab8b}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a2315b1a-581f-4756-87f6-39c786be6df2}</UniqueIdentifier>
+      <UniqueIdentifier>{341f9b51-48d6-4ab4-8bdc-df31c7955867}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{b73d89af-ed0b-4920-bd5a-6611fb0ad49b}</UniqueIdentifier>
+      <UniqueIdentifier>{b96c458b-2b0d-4598-95a1-b1c012f61ac4}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{1facafde-f8ff-4a9a-ba1a-5dee51c869ba}</UniqueIdentifier>
+      <UniqueIdentifier>{c35587a6-88e6-4299-af53-8ba300687613}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{a69f4db9-5c44-40a1-8c7a-0efcf8213fe3}</UniqueIdentifier>
+      <UniqueIdentifier>{4229c8b4-dab3-456a-b65d-24bad02d9ed2}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{4d07af33-7e00-40c8-8890-babbbe03cbdb}</UniqueIdentifier>
+      <UniqueIdentifier>{8c74d7a3-9105-4ab6-af78-302b8d8f005c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{c8ea5a73-ef67-479b-9e07-1b1a30c945a9}</UniqueIdentifier>
+      <UniqueIdentifier>{0718e8c5-31b8-4551-8e1c-4250b10883f6}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{00cf1dde-1f72-4ee5-95fc-a23958af8311}</UniqueIdentifier>
+      <UniqueIdentifier>{3eabc9db-5a2a-4d32-97e5-7b75ba34e117}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{93153940-b3b2-40c5-9fb5-65b999c9575f}</UniqueIdentifier>
+      <UniqueIdentifier>{d451dc3b-6dff-47fe-8ffb-2f3a05e62e1e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{8e155842-0d99-44a6-97dd-05ac49fe1fd9}</UniqueIdentifier>
+      <UniqueIdentifier>{daf5f21f-3f73-47d5-b000-47e516f81fdc}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{a12ce711-17aa-4532-a939-e5f942993f4b}</UniqueIdentifier>
+      <UniqueIdentifier>{10723048-e5aa-4fc6-9b8e-09bf0e87ba90}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{57ce58c2-b1bd-4e83-a45d-b12fc2ddf6cd}</UniqueIdentifier>
+      <UniqueIdentifier>{58811e7b-34b0-46d4-9030-659a02bcc03d}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{7b247ee2-82c2-4ab0-ac9a-32d060956089}</UniqueIdentifier>
+      <UniqueIdentifier>{281e016b-c418-4c76-800a-affec454864d}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{d1b3854e-0be9-493d-b4d1-2961da91d289}</UniqueIdentifier>
+      <UniqueIdentifier>{ca0b258e-5fdb-461f-907c-ffac68428ca4}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{61818cf2-6df9-4756-a43d-f3867ff64b64}</UniqueIdentifier>
+      <UniqueIdentifier>{aca03f24-8a2f-41b1-bd89-362681f09ed2}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{545b7e12-fe62-49b5-a912-3ae1c4de23e2}</UniqueIdentifier>
+      <UniqueIdentifier>{ed8bb05d-3207-430a-b123-5ec12f51512d}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{4e21e095-be19-44c8-97c3-f1474db1c895}</UniqueIdentifier>
+      <UniqueIdentifier>{8c2bb570-6f2c-4f8f-a87b-19a49b4ec136}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{66c4ef2f-5909-4835-a052-ee5217c4a292}</UniqueIdentifier>
+      <UniqueIdentifier>{5982af4d-cadd-49af-866d-9303d31ab120}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{9a24a35b-2604-43a3-b83a-e2c706902aa3}</UniqueIdentifier>
+      <UniqueIdentifier>{f14320f7-bdae-4af1-acf8-bbb5459fc97e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{b1b3a3da-da9e-4891-8851-06b916f6a2ae}</UniqueIdentifier>
+      <UniqueIdentifier>{9aaca37c-aa45-4099-bbd2-b1f14af28556}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{c6836605-73a1-4db4-9f00-eb16b4a3cd47}</UniqueIdentifier>
+      <UniqueIdentifier>{bb6e6177-3203-475d-9bd7-af316aef316f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{446930bc-c659-4ccc-8f86-b0485fb4b2de}</UniqueIdentifier>
+      <UniqueIdentifier>{affd07f2-87d5-462d-98c9-4782e6c1e8a7}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{afad31aa-acd3-491c-9c2a-b3ea39edc405}</UniqueIdentifier>
+      <UniqueIdentifier>{8fd60e09-3c64-4ab6-8716-67eb8690ba64}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{7525fc50-2580-4c8c-be74-d2b39d2093b7}</UniqueIdentifier>
+      <UniqueIdentifier>{4421c47b-4cba-439a-aef0-b6ad119ce344}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{615e8d83-08d4-4cb0-8e05-5f3062c74010}</UniqueIdentifier>
+      <UniqueIdentifier>{927e85c2-89c3-4425-9f39-7883489af843}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{281d7524-b513-48c5-abce-f63a052c173d}</UniqueIdentifier>
+      <UniqueIdentifier>{105b38ac-3522-443f-9388-6ec54e988aae}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{76ce9059-6d74-46e8-bc12-2fba6972006a}</UniqueIdentifier>
+      <UniqueIdentifier>{3b28d956-dd3d-48cc-ae43-6f183ac7e878}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{df2030dc-247d-4d92-bc43-2024d52f4102}</UniqueIdentifier>
+      <UniqueIdentifier>{1b97ca67-74e4-4998-b950-ce132a47d7d5}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{2b0e10b5-7b17-4530-a4ad-51c6af50027b}</UniqueIdentifier>
+      <UniqueIdentifier>{0f3bcced-d7c2-4db6-a92b-f19bd7c9b03f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{15f1ae6a-1bd9-4c96-8266-7e02b6bf7f7d}</UniqueIdentifier>
+      <UniqueIdentifier>{bddb4459-73dd-4aec-8683-724e155c0e0c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{eb70226f-4490-4bc1-be00-6a1ca8c787bd}</UniqueIdentifier>
+      <UniqueIdentifier>{ba6147a4-1d46-4572-8486-8d94d85329bc}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{8b186c7b-4947-4fef-af11-f51708811c20}</UniqueIdentifier>
+      <UniqueIdentifier>{12e68f8b-f956-430c-889a-72f626f2d170}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{b3f6cdef-f6e0-4ef2-9ab0-a23f134d1b5d}</UniqueIdentifier>
+      <UniqueIdentifier>{a5b1944e-6ea4-428e-85b7-798be4ea669e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{4999d4bf-b0c7-4e6d-b4e0-be229068f14f}</UniqueIdentifier>
+      <UniqueIdentifier>{0ad413a0-7380-4fd5-9286-d3de9e6656f7}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{37d8835d-28a0-4bb3-b2af-9776bdf00ff6}</UniqueIdentifier>
+      <UniqueIdentifier>{bdee72e0-bd73-43bd-af0b-b8fe47e607e1}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{27f979f8-7c73-4d5a-b7f0-6f3eb4c0e42f}</UniqueIdentifier>
+      <UniqueIdentifier>{cf362ba0-4f16-48f5-8d67-37bfe776191f}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{ef9893c8-f835-4662-bb20-a779ef84aab4}</UniqueIdentifier>
+      <UniqueIdentifier>{b418f6fb-d846-4133-81b1-d594e4b72ae9}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{c5c56ed9-5c76-4d41-9fba-b7d2b6a6587d}</UniqueIdentifier>
+      <UniqueIdentifier>{820fe1d0-af4d-4b9a-8c22-f0ad727b4541}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{eed1b021-aa16-40e1-8174-dfeb4f4020b5}</UniqueIdentifier>
+      <UniqueIdentifier>{a3016fbf-98c9-479c-b83a-aa41b57828e3}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{610f2b31-4a7e-4ac1-9545-3d5bbf76f434}</UniqueIdentifier>
+      <UniqueIdentifier>{94d2e434-ad1c-4116-842b-73532f160059}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ea98b4a8-e4b7-4e8c-9d45-493f3c961b9a}</UniqueIdentifier>
+      <UniqueIdentifier>{f556e805-687d-4811-a882-d0328f7853c1}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{dbee7844-368a-4b4f-b774-e012cf862636}</UniqueIdentifier>
+      <UniqueIdentifier>{ed412b5a-dc2d-4cb4-97e6-728e82e5207f}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{f18f2d9c-caa5-47b4-8ca4-7858849470a0}</UniqueIdentifier>
+      <UniqueIdentifier>{52a02add-be3c-4b0d-91b8-92fa8c8b35ab}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{8ad16c53-6f33-453a-a4fe-4464527c2236}</UniqueIdentifier>
+      <UniqueIdentifier>{ea8e22b3-d61c-40d2-b0bc-f0568ffa7d01}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Crypto">
-      <UniqueIdentifier>{ca6c4dcb-5c9a-436b-b072-c9eb06697861}</UniqueIdentifier>
+      <UniqueIdentifier>{f81cf2e7-233b-4f27-9b4f-4e3be142a298}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{b3d79002-330d-4c9f-a4c4-d2b8e9cd98e5}</UniqueIdentifier>
+      <UniqueIdentifier>{81c8f503-847a-418b-8cf1-209f5b650034}</UniqueIdentifier>
    </Filter>
    <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{91b06644-ef80-41e9-a83f-e7c8f0ee105c}</UniqueIdentifier>
+      <UniqueIdentifier>{0dd96605-9bfb-432d-8983-3db715caa8d0}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{0adb3afc-2695-4ec9-b514-6685cda73595}</UniqueIdentifier>
+      <UniqueIdentifier>{d37daefd-2ce2-47eb-b356-1cfc95757f59}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{501f0b24-de77-4611-8d24-1f2379c1203a}</UniqueIdentifier>
+      <UniqueIdentifier>{a95971b4-f07f-4db2-a8fd-75c204085101}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{dcf7f8b1-8355-445a-87df-682cd61a0cea}</UniqueIdentifier>
+      <UniqueIdentifier>{104b3c0a-5ed8-4d99-8837-66c4d6eff1d7}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{2ba04aab-8eca-4a21-930d-9404254df5d1}</UniqueIdentifier>
+      <UniqueIdentifier>{69aa857f-4899-47f5-a0d7-d53082ccbfb9}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{77949cfb-5462-4826-b8e6-dcdb579c5330}</UniqueIdentifier>
+      <UniqueIdentifier>{a60b4992-77f9-48ef-8d79-601bad484173}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj
@@ -19,8 +19,7 @@
 			ConfigurationType="2"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -98,8 +97,7 @@
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -178,8 +176,7 @@
 			ConfigurationType="4"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -244,8 +241,7 @@
 			ConfigurationType="4"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -311,8 +307,7 @@
 			ConfigurationType="4"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -377,8 +372,7 @@
 			ConfigurationType="4"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{0d3416a9-860b-496d-b3ef-5857d468f47d}</UniqueIdentifier>
+      <UniqueIdentifier>{154c154b-b7e9-4d14-bddf-f78bb859f6af}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{e4707f5f-089c-40b2-98f0-747bc622964c}</UniqueIdentifier>
+      <UniqueIdentifier>{56fb8f82-1ab4-42c2-aab5-88eb6e518b02}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{f59a4665-1553-4826-b95b-3381f48ec21a}</UniqueIdentifier>
+      <UniqueIdentifier>{6678cc26-c0c7-4d58-8ae2-2456fc65b7be}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{83dfd0db-55be-44ce-87d3-098b45a1de06}</UniqueIdentifier>
+      <UniqueIdentifier>{13d6e3d3-41ba-4ba1-8da5-fe35b73944d8}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{cf4de7b0-f5c3-48b4-a209-9bf22208d8a2}</UniqueIdentifier>
+      <UniqueIdentifier>{66b30fd4-d1b7-4d6f-8265-457afb7b5dd7}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{c16cf22f-bb18-4941-82a4-e8002be349f7}</UniqueIdentifier>
+      <UniqueIdentifier>{80c006ce-e96b-4ea4-953c-ef68b3ed2cab}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{21e7d92c-cee7-4d58-8092-881fc762551d}</UniqueIdentifier>
+      <UniqueIdentifier>{d5aecab0-c33b-442e-b6c6-aa195b5134fc}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{5e0bf4cc-913e-4927-a37f-8e964c4c0405}</UniqueIdentifier>
+      <UniqueIdentifier>{ec111a34-92c9-459a-9ded-4cd78ef7f2c7}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{e3f974a6-64c2-4f8a-be00-63b286b5c454}</UniqueIdentifier>
+      <UniqueIdentifier>{09d629a5-6e96-462f-8939-90255807149b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{8ab4fd94-a966-4aa9-949b-6808dfd8fc82}</UniqueIdentifier>
+      <UniqueIdentifier>{12d9efca-264a-4ade-8d54-0f6bc1a3e838}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{0ba260e5-1935-4c6a-8803-d4edeb68f50b}</UniqueIdentifier>
+      <UniqueIdentifier>{9e894989-473e-47fd-a3d9-0040d5526f93}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{4d5b9d99-3c4a-41e5-b867-164f6dfe59b9}</UniqueIdentifier>
+      <UniqueIdentifier>{ac03c5f6-f6d0-4fec-9bc9-d4bc1e59be44}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{746f8506-5a55-4dc8-932e-5d624f02625c}</UniqueIdentifier>
+      <UniqueIdentifier>{014c2772-e58e-4296-ac14-a8522eed5b23}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{1233f61f-33e5-4aba-82a7-51fcbfe6f5d5}</UniqueIdentifier>
+      <UniqueIdentifier>{653a41a8-2e9a-4be2-bd4c-d7e49c98ad3c}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{85f3d3b6-d05c-4b2c-85c8-722898c34f0f}</UniqueIdentifier>
+      <UniqueIdentifier>{d33682e2-df60-4ae3-a3b1-3bd2c6c9b944}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{4dced74f-5eab-4606-8b1d-959fa950058c}</UniqueIdentifier>
+      <UniqueIdentifier>{f1b71c7a-e9bf-4975-89ce-86d53e5f8c27}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{f1388e0c-e76b-4959-ad69-7e5d54e00248}</UniqueIdentifier>
+      <UniqueIdentifier>{b3780bb8-86e5-4c7e-86af-5bc6c94301cb}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{6cf283de-f3bb-4dd8-a466-a125d23b78ce}</UniqueIdentifier>
+      <UniqueIdentifier>{b1456509-491c-4406-813f-4fe706265a1d}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{5425ec23-ac33-484d-bcee-8473aebf17dc}</UniqueIdentifier>
+      <UniqueIdentifier>{fbea2266-ea42-4f6e-af28-36115412b279}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{35e94a83-6feb-4568-8820-1f9c9302c326}</UniqueIdentifier>
+      <UniqueIdentifier>{75f07138-9f84-443c-856f-8a1d0a4d12e4}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{264bc24f-9063-4a71-a4cb-b584584e532a}</UniqueIdentifier>
+      <UniqueIdentifier>{e58b6fea-edea-4669-8328-2e3ea8f6dd25}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{f6bed758-d559-45e2-b0c4-965826f84d77}</UniqueIdentifier>
+      <UniqueIdentifier>{fa60d265-bda1-46a3-9679-b5532372e7c1}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{ca1dbeaa-3f90-4d83-9dff-77bd6ed91165}</UniqueIdentifier>
+      <UniqueIdentifier>{75bfcbec-96c9-4f17-997d-3286d597dafd}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{1ec874cb-1c86-43ca-816e-5d2749e87eb9}</UniqueIdentifier>
+      <UniqueIdentifier>{f970772f-2e0a-4962-a3e3-7003fb3f52f4}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj
@@ -102,10 +102,6 @@
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetSSLmt</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -139,10 +135,6 @@ xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -179,10 +171,6 @@ xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*
-xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -208,9 +196,6 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -237,10 +222,6 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -266,10 +247,6 @@ xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{c341b844-712d-4952-bdcc-00e632076c1f}</UniqueIdentifier>
+      <UniqueIdentifier>{d729fb1d-28f5-4cc3-81c9-41fb3598a56c}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{4c9d7f10-50f1-4255-92fc-ac4523ba5374}</UniqueIdentifier>
+      <UniqueIdentifier>{3e1f7339-7407-4b68-988d-417d11975d85}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{9f003d78-970e-4b4c-9f51-747169994dec}</UniqueIdentifier>
+      <UniqueIdentifier>{a6abfcca-2690-4b0c-8a8d-14d78c1dfb7f}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{f949faf2-83fe-4b06-bf42-fcaff970fb51}</UniqueIdentifier>
+      <UniqueIdentifier>{47fe6c3b-650d-428b-912a-47feb2c01668}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{c2867602-abff-4276-a18d-bfa964644a7c}</UniqueIdentifier>
+      <UniqueIdentifier>{c90731df-4842-4627-a666-b54f1aae94b8}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{137d8636-3139-4dca-96f2-45a688f645cf}</UniqueIdentifier>
+      <UniqueIdentifier>{04ce29fc-c78f-4a41-854e-c964bebc118f}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{58b4e5bc-ee77-4457-aafd-eaf26cf1537b}</UniqueIdentifier>
+      <UniqueIdentifier>{89e7bddd-c778-49df-a858-887cd0b277f6}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{eb6a9a5a-6804-4c06-b479-3d2b0fe55ce0}</UniqueIdentifier>
+      <UniqueIdentifier>{b9628b42-66d5-4bb0-a045-77175d69c5cb}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{042c45e9-1ff4-4695-bc6f-8da3a9a2c829}</UniqueIdentifier>
+      <UniqueIdentifier>{a81eb868-761b-4ea4-846f-5a5145b9f01a}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{c4231173-048d-4ccf-8eab-0c491dcd91c2}</UniqueIdentifier>
+      <UniqueIdentifier>{fbfb3c68-6920-4b3d-ad78-321d472ee8a2}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{f43b5664-7ac7-45d9-b720-129ef3b1c2b6}</UniqueIdentifier>
+      <UniqueIdentifier>{fbddfc20-2623-4b98-9fbc-0b55eaedb829}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{d6a034ea-71cb-463b-b474-1f294cf1576f}</UniqueIdentifier>
+      <UniqueIdentifier>{e9fb0628-cae4-40af-8ec7-dd65f4c75b0d}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj
@@ -120,10 +120,6 @@
    <IntDir>obj\NetSSL_OpenSSL\$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -154,10 +150,6 @@ xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -191,10 +183,6 @@ xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*
-xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -218,9 +206,6 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -245,10 +230,6 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -272,10 +253,6 @@ xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{7523931d-ab5a-4f2c-a796-ee2dc8114e4d}</UniqueIdentifier>
+      <UniqueIdentifier>{aef70d63-ffa8-4eb2-81b8-bb98786bcb62}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{2fe78717-bed3-4072-a850-45c58007a728}</UniqueIdentifier>
+      <UniqueIdentifier>{8c64f316-f084-4ba0-9b21-d327dc3f4feb}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{e2f661e5-33f6-4c17-add0-9ed743418ac0}</UniqueIdentifier>
+      <UniqueIdentifier>{0e44b159-5ab5-4845-bdca-515630f74e5a}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{15547e08-3cf1-47d4-acc1-162c8fef2902}</UniqueIdentifier>
+      <UniqueIdentifier>{f2c6aaf3-a038-41c7-aa3e-24fbc47719cd}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{bc52bdc1-b32a-4738-9e12-8e35328ea484}</UniqueIdentifier>
+      <UniqueIdentifier>{c851bf64-0635-4120-a719-d81ee10244d5}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{92f10845-9403-433c-a02a-20df43a7b195}</UniqueIdentifier>
+      <UniqueIdentifier>{58e1e504-f216-4ac2-94c6-0ed0d322d39d}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{f05c7c61-d026-4fdf-8797-20ae2163ebd3}</UniqueIdentifier>
+      <UniqueIdentifier>{2bb0be4d-bb19-4838-b6a6-5022a9747f5b}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{0d762913-439f-4f77-9440-66d070290865}</UniqueIdentifier>
+      <UniqueIdentifier>{1f9ad8cd-b0a2-41f0-b94c-f4ae37b1c8f5}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{1cbb88f5-7820-46db-bc1e-6345df9280f4}</UniqueIdentifier>
+      <UniqueIdentifier>{f5c28e16-3b82-43bd-b5cb-7877096a8efe}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{1f06d43d-c228-42f9-af4e-db36d5e460e5}</UniqueIdentifier>
+      <UniqueIdentifier>{ba5a592a-5452-46d6-a338-74c4db2254ea}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{f1157c24-3b2b-48cd-b529-7fc0232bd227}</UniqueIdentifier>
+      <UniqueIdentifier>{6b0b53ce-dff0-4965-b42e-50a072d67798}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{ba4834a4-9676-49d0-a6c7-aef572cb75a0}</UniqueIdentifier>
+      <UniqueIdentifier>{2f7d20e7-fee2-41bf-ab2e-ed15b04f4b79}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj
@@ -120,10 +120,6 @@
    <IntDir>obj\NetSSL_OpenSSL\$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -154,10 +150,6 @@ xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -191,10 +183,6 @@ xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*
-xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -218,9 +206,6 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -245,10 +230,6 @@ xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -272,10 +253,6 @@ xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*
-xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{033a4755-1845-4e3e-a98c-57a067f6be64}</UniqueIdentifier>
+      <UniqueIdentifier>{4d059a7d-c947-4b9d-a971-919f25b83fce}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{f14e6627-1440-4236-806e-ac13cb705e28}</UniqueIdentifier>
+      <UniqueIdentifier>{03749bbd-57d2-4a46-a6e3-55343c2678f0}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{6750314f-fd54-4a53-921d-e82db0290775}</UniqueIdentifier>
+      <UniqueIdentifier>{7399162b-e251-4e11-8a18-39c8066b8bdf}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{4b0775f9-eb07-4242-bf7e-e0ae2f671acb}</UniqueIdentifier>
+      <UniqueIdentifier>{557fdcc9-65c8-493f-89bf-7c9e7e82d001}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{2c9b8ae7-e377-45db-abc3-85f4f0508a65}</UniqueIdentifier>
+      <UniqueIdentifier>{7122937a-0d47-437a-9193-e29cdc16da8c}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{e1b5d97d-6b44-44d8-9b16-474cfd2d3de9}</UniqueIdentifier>
+      <UniqueIdentifier>{dc9fba12-c07d-4153-9441-349a408c0913}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{60360ee1-30aa-4948-9bfd-de5d827c1cee}</UniqueIdentifier>
+      <UniqueIdentifier>{f5793e5b-2a96-42e5-a7e9-4cc0b917804b}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{3fc79851-6c82-4448-85f5-1caa5bd50ff8}</UniqueIdentifier>
+      <UniqueIdentifier>{9bae356d-129f-48bd-8d0f-bfcc10d298b9}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{fbc2bb60-3691-474e-ba6e-f124e5c3e043}</UniqueIdentifier>
+      <UniqueIdentifier>{336fb814-0542-4fdc-89c7-2c5216b6a277}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{c67e4cbd-9f6b-4e13-99ed-9689b719612b}</UniqueIdentifier>
+      <UniqueIdentifier>{7b3c9b6a-1d15-4be0-ae01-6b2de711637b}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{ab581570-4980-48c4-a284-bb74c2cdd688}</UniqueIdentifier>
+      <UniqueIdentifier>{3627386c-9d0c-4a2d-9145-7a62e33d8261}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{ac97f628-3a7d-41d5-925b-17fc5dc54ea6}</UniqueIdentifier>
+      <UniqueIdentifier>{8f66ebaa-c69f-4125-b350-62e0a41ecc51}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj
@@ -19,8 +19,7 @@
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -90,8 +89,7 @@
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -164,8 +162,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\lib\debug\*32MTd.lib ..\lib\*&#xA;xcopy /y ..\openssl\win32\lib\debug\*32MTd.pdb ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -222,8 +219,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\lib\release\*32MT.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -281,8 +277,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\debug\*32MDd.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\debug\*32MDd.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -339,8 +334,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win32\bin\release\*32MD.dll ..\bin\*&#xA;xcopy /y ..\openssl\win32\bin\release\*32MD.lib ..\lib\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj
@@ -102,10 +102,6 @@
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetSSLmt</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -139,10 +135,6 @@ xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -179,10 +171,6 @@ xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\*
-xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -208,9 +196,6 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -237,10 +222,6 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -266,10 +247,6 @@ xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{b1a7e7fe-48e5-42da-ae24-92c02321858c}</UniqueIdentifier>
+      <UniqueIdentifier>{053e3678-2167-4fa7-8fd2-9f05a488df4c}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{301a9c79-dad2-4381-b344-cf0961e6b7db}</UniqueIdentifier>
+      <UniqueIdentifier>{13f2edba-0c49-416e-b924-a2e026839e3b}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{b6314c4f-185a-4e38-a9cb-00d003b4c85f}</UniqueIdentifier>
+      <UniqueIdentifier>{a4719fd6-a57c-4b4b-92d4-28146c213787}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{9e6d99a5-1169-40bf-a231-733d9c1a95be}</UniqueIdentifier>
+      <UniqueIdentifier>{b46b5061-0022-47af-a7b7-9f7f731e9efc}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{12456af7-c30a-4e3a-b175-5411b64138ad}</UniqueIdentifier>
+      <UniqueIdentifier>{2dce42c6-0897-4e15-be60-f9d5d279e084}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{ebbdafe9-f28c-456f-be20-6e76725ab488}</UniqueIdentifier>
+      <UniqueIdentifier>{008e5f58-5c9d-4f0d-bbad-4045fa676afd}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{20b63dd3-1bb6-46c4-9017-8211aea067f8}</UniqueIdentifier>
+      <UniqueIdentifier>{7e008a45-b4a1-4152-b4e7-a56a59409603}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{909770bf-b99a-42ce-b606-d57a2a71d2f6}</UniqueIdentifier>
+      <UniqueIdentifier>{2f3a36e5-7b9e-4f53-a25e-a1f229deee56}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{4ab13427-b3c3-4a22-a238-7c827e1cfc35}</UniqueIdentifier>
+      <UniqueIdentifier>{c7b7d287-d921-4433-810c-2a4814f41350}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{0117d4c7-3b9a-49c5-8c31-e64b7370d6a0}</UniqueIdentifier>
+      <UniqueIdentifier>{9deb8c36-0eac-466c-870f-b2f4e7838016}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{083120c7-3b7d-4d75-9699-7faccbeabe82}</UniqueIdentifier>
+      <UniqueIdentifier>{698318d5-652d-417b-94ed-061652968624}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{e9653840-46e5-449f-8453-c93871916329}</UniqueIdentifier>
+      <UniqueIdentifier>{1bc91905-49a0-4020-ad44-4a4a538d3843}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj
@@ -120,10 +120,6 @@
    <IntDir>obj64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -154,10 +150,6 @@ xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -191,10 +183,6 @@ xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\*
-xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -218,9 +206,6 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -245,10 +230,6 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -272,10 +253,6 @@ xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{4b8b899e-9254-4955-b87f-ec362ebfe4eb}</UniqueIdentifier>
+      <UniqueIdentifier>{3e6c7dd7-6844-40b9-9f63-d0853cbc6a83}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{7acca992-0902-434a-a75c-4d4687db293f}</UniqueIdentifier>
+      <UniqueIdentifier>{08b33621-1ce6-408b-90a4-4c4e6cc90dec}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{9f8df131-2619-4f6d-99ac-b7170785bb35}</UniqueIdentifier>
+      <UniqueIdentifier>{b504409c-de58-4ab5-a3ef-c8e0a42fef7d}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{81706c53-76af-4be7-8192-284f4e7c0c01}</UniqueIdentifier>
+      <UniqueIdentifier>{8ba2a0f7-8b2f-4cd9-adc3-9e4642a21953}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{3c9984ce-2b49-4587-ab37-08ba7359206d}</UniqueIdentifier>
+      <UniqueIdentifier>{c4783868-e7be-4be7-8b6b-5a3837c6ad3b}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{11a3ac2e-fed4-4b3e-9a4a-9fc44a5f16ec}</UniqueIdentifier>
+      <UniqueIdentifier>{12704729-0ed7-4a58-8965-6df88fc40dd6}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{eacbe8cf-9276-449a-82ed-060e41b24e73}</UniqueIdentifier>
+      <UniqueIdentifier>{2bc0865a-0e99-4f22-ac82-00781de1c92a}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{d0aa9871-3652-48de-a40f-6154109c3a68}</UniqueIdentifier>
+      <UniqueIdentifier>{e13c496d-361f-4fb9-b0a7-15cb4a3a6db1}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{1aef3343-f696-4d61-9842-1fa2125d2ddc}</UniqueIdentifier>
+      <UniqueIdentifier>{d2546d96-0e43-4df7-abab-0bea99de9d04}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{9c63354c-ed8c-4781-bb9f-335cadf54927}</UniqueIdentifier>
+      <UniqueIdentifier>{fc6ee8f3-5a0d-4104-b63e-efb7588877d7}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{06d3e8d1-5d61-4c3b-9ad7-78a60b865c53}</UniqueIdentifier>
+      <UniqueIdentifier>{b1675f8c-1636-4d72-8cf0-753c577f3159}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{30cd251c-751b-4bfb-bc50-01cb7296aee2}</UniqueIdentifier>
+      <UniqueIdentifier>{8e5a6bcc-15b5-4980-84dc-b0e16730976a}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj
@@ -120,10 +120,6 @@
    <IntDir>obj64\NetSSL_OpenSSL\$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -154,10 +150,6 @@ xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -191,10 +183,6 @@ xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\*
-xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -218,9 +206,6 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -245,10 +230,6 @@ xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -272,10 +253,6 @@ xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*</Command>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*
-xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*</Command>
-    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="SSLCore">
-      <UniqueIdentifier>{c3e53ba6-892e-482f-81b8-00d0412b9430}</UniqueIdentifier>
+      <UniqueIdentifier>{ef01361c-09c3-48dc-8cce-3f8c3d63de94}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{fe011429-4471-44c7-a5dc-8ecb408adc8f}</UniqueIdentifier>
+      <UniqueIdentifier>{5e7aae96-4f3f-4071-91b0-6a895813f070}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{3a3eb5a3-05b7-4784-aa75-62a8d9a7dd9f}</UniqueIdentifier>
+      <UniqueIdentifier>{bdd5b54c-85c7-42e3-9d19-feefad2e2602}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{0b131612-b2e3-4810-869c-9ca073fffda7}</UniqueIdentifier>
+      <UniqueIdentifier>{c33b2079-d942-4dc7-ac22-0b9211827338}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{d336cb09-4507-407f-b5a4-44996bebf5d8}</UniqueIdentifier>
+      <UniqueIdentifier>{a38a4315-9db1-4cee-8c56-7017e56335a4}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{012ede69-7d1b-4dad-b7e4-2a3b861fce5d}</UniqueIdentifier>
+      <UniqueIdentifier>{2d0e18f7-0e0d-44c2-9232-5076bb264650}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets">
-      <UniqueIdentifier>{67861a4e-ed22-49b8-a491-fda75d803e3a}</UniqueIdentifier>
+      <UniqueIdentifier>{17cf7233-80c9-47fb-8296-a7457b56d7da}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{d1bb0096-ef7b-4d51-9566-969325f5c909}</UniqueIdentifier>
+      <UniqueIdentifier>{72096e46-c476-4b78-984b-280e772e90f1}</UniqueIdentifier>
    </Filter>
    <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{35ceea81-cef3-4165-bb84-131c5203e61c}</UniqueIdentifier>
+      <UniqueIdentifier>{4a217ed3-047f-409c-9b05-c8497644d2d5}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{3bd8df32-550d-4d23-8d0c-bd05264e0051}</UniqueIdentifier>
+      <UniqueIdentifier>{30e05752-01c3-422f-a0ec-c1c532d246dd}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{55ff4e34-ebf4-42b2-b423-6b9a938128c9}</UniqueIdentifier>
+      <UniqueIdentifier>{dde5079d-2bd2-49d4-86c6-b1a31de1f95d}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{1434b1c2-9a67-4858-9775-2a7bcd2673f8}</UniqueIdentifier>
+      <UniqueIdentifier>{dd1ab80c-6470-4817-ac15-b319dd328eb8}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj
@@ -19,8 +19,7 @@
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -90,8 +89,7 @@
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -165,8 +163,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win64\lib\debug\*64MTd.lib ..\lib64\*&#xA;xcopy /y ..\openssl\win64\lib\debug\*64MTd.pdb ..\lib64\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -224,8 +221,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win64\lib\release\*64MT.lib ..\lib64\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -284,8 +280,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win64\bin\debug\*64MDd.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\debug\*64MDd.lib ..\lib64\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -343,8 +338,7 @@
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\win64\bin\release\*64MD.dll ..\bin64\*&#xA;xcopy /y ..\openssl\win64\bin\release\*64MD.lib ..\lib64\*"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
--- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{d2187a8f-46c4-45ee-b361-31417b8199da}</UniqueIdentifier>
+      <UniqueIdentifier>{e0b88b2a-dafc-49d0-8ba6-93b997d5fd3e}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{9b08ce5c-6aa3-4f37-a10b-ff6de4045195}</UniqueIdentifier>
+      <UniqueIdentifier>{6547b3c8-ff71-446d-af76-5564f58aa460}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{68157cd4-7bc1-43ac-a9e5-7ccd45f1ecfa}</UniqueIdentifier>
+      <UniqueIdentifier>{7ee4073e-943c-4d16-a11c-6cb1a6605193}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{d5e67c4f-3ccd-4ec9-91e2-47b0c107b6c8}</UniqueIdentifier>
+      <UniqueIdentifier>{6d30068d-3a1c-4ec8-b8d6-b02774671e3e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{f30d5367-7ec6-4695-8e38-325434205f17}</UniqueIdentifier>
+      <UniqueIdentifier>{6777e4ed-6a21-4e25-8c8d-ca77f172343e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{e6c2e2be-8147-4ce0-aff0-7bda9384ec07}</UniqueIdentifier>
+      <UniqueIdentifier>{cd1bcfa7-61b0-4e3e-933a-86817ed133da}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{069419ee-465c-4e77-ab59-30fa43a71cc2}</UniqueIdentifier>
+      <UniqueIdentifier>{153b024d-1233-4fc8-8999-2afc8c79517c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{87948a99-f367-4d99-8310-b3ff31ac76dc}</UniqueIdentifier>
+      <UniqueIdentifier>{ef92a123-c3f0-47e4-8607-b8a70775dc14}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{40acd793-154e-49b3-8dd2-ecec48230b07}</UniqueIdentifier>
+      <UniqueIdentifier>{02711761-a6b5-4c38-865c-932d65aa6646}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{206681c3-8ec5-47d3-8e1d-7dfd8f03ab28}</UniqueIdentifier>
+      <UniqueIdentifier>{97720335-fd88-4852-abea-a0ba6cb59090}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{e2b9ffb0-e95d-4bc8-9bee-f9f56fab5057}</UniqueIdentifier>
+      <UniqueIdentifier>{8390a3e1-46bb-4995-88bf-4216b14ad609}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{8816453c-99e4-4580-8e07-60206b87ad85}</UniqueIdentifier>
+      <UniqueIdentifier>{92c0ff64-598f-44d3-bf78-63336d18df56}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{91fbed1c-3b2d-4efa-b9a6-1a16c4884a29}</UniqueIdentifier>
+      <UniqueIdentifier>{d0126c7a-b704-498f-92a1-82ad47ef826c}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{1140fa01-a200-4afe-a119-805c1f3b9fd8}</UniqueIdentifier>
+      <UniqueIdentifier>{3172c27e-2be2-45c2-9709-903e94340ddc}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{d0000024-1bb9-47ab-88fd-7e263e831fee}</UniqueIdentifier>
+      <UniqueIdentifier>{356a948d-5e73-469e-95aa-dbb9b1066c0d}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{b309f0ca-2c70-4fa3-8cdd-2f993eb0ede2}</UniqueIdentifier>
+      <UniqueIdentifier>{603a1166-2f0d-407a-ae65-f6ae525688c0}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{2e372cf0-cbf6-463c-9a2e-ea9c4b8e117f}</UniqueIdentifier>
+      <UniqueIdentifier>{a69c94cc-fa0e-4c5d-9f80-422214726ba6}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{f248b2c4-a301-4652-acf2-5069254a05ad}</UniqueIdentifier>
+      <UniqueIdentifier>{5298ceab-6d8f-4aa8-9c6e-743fdf57d6af}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{1ba1ceb4-e1f9-459f-ac4d-7f6415385a5c}</UniqueIdentifier>
+      <UniqueIdentifier>{58a1270d-b6f9-4c7c-afec-cd2b7d1076ff}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{1d1435b6-379d-43a6-a58e-1eefdc69f9cc}</UniqueIdentifier>
+      <UniqueIdentifier>{333bbb29-7128-47de-95b3-ac1b1c89b353}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{c84401b7-bb1b-48b9-9059-a157fc51325e}</UniqueIdentifier>
+      <UniqueIdentifier>{1bf84ba6-0399-4c13-b813-1e65925d3ed2}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{8177b105-54c5-4740-b708-a2421877abbe}</UniqueIdentifier>
+      <UniqueIdentifier>{2104eb50-4458-425b-b372-4c1fe5b4ced9}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{dfa258b6-7b4c-4b87-ba8d-3a5424da0707}</UniqueIdentifier>
+      <UniqueIdentifier>{ea743497-fee8-4fd3-ae3d-11023e9d465a}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{ba0c7e86-bcd3-4879-93c6-e93a6b204540}</UniqueIdentifier>
+      <UniqueIdentifier>{9213fd60-cee0-4063-9d4c-fd35a15ced7a}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{361502ec-3f6d-44a9-a1a4-5e3dd24c154e}</UniqueIdentifier>
+      <UniqueIdentifier>{44692237-df6d-4196-90bc-b53d7e914b9c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c30f6b16-f878-472d-9688-b757954c06ae}</UniqueIdentifier>
+      <UniqueIdentifier>{d655082b-5a7b-40e6-85c3-98fd0e6b8f45}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{895a6380-ec32-410b-931c-c6f8d2b90d35}</UniqueIdentifier>
+      <UniqueIdentifier>{443f4c2d-adf4-43c9-ba10-8b3d40adc038}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{e9596676-d9fb-42fd-b06d-fd114691fc6b}</UniqueIdentifier>
+      <UniqueIdentifier>{fa6d2c0b-d884-4b7b-808c-6a24193c0ae1}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{adaa5e9c-e6ee-4c8f-bdc9-424ac4c1dc45}</UniqueIdentifier>
+      <UniqueIdentifier>{0e4354c0-1acc-4fc7-a950-5ceca6706fe2}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{16232078-bf3d-4312-94e4-568f7c883880}</UniqueIdentifier>
+      <UniqueIdentifier>{efa710bd-348b-4195-a2fb-76d90b45d66a}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{9028862c-6cc0-42a9-a46c-fef794e1d710}</UniqueIdentifier>
+      <UniqueIdentifier>{3b266024-ca02-4b52-9a06-a956c9e770cc}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{a6f903f2-3af0-4db7-a55a-b7069cdd4039}</UniqueIdentifier>
+      <UniqueIdentifier>{0c5902b8-b286-4b56-90ec-ee97c66904e5}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{1d4e262d-b9f1-4eb9-a729-33ffe1200b71}</UniqueIdentifier>
+      <UniqueIdentifier>{6336daee-342a-4488-8ae8-fc995c20d403}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{20b591b9-2660-458b-beb0-566fef5213e6}</UniqueIdentifier>
+      <UniqueIdentifier>{b9b9d21c-7246-44a8-abb6-0238f36c37b7}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{2f225b0b-30e2-4a0a-9c06-45a5567f357e}</UniqueIdentifier>
+      <UniqueIdentifier>{5d73aa62-e58e-42b6-9323-d85b1ade767e}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{b7d79c80-567a-454c-ba00-4ac6ce1f851a}</UniqueIdentifier>
+      <UniqueIdentifier>{7e8a4b57-22f7-47da-bc04-fa08eee8ea2b}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{988266ca-765b-4351-835e-78b04f7aec47}</UniqueIdentifier>
+      <UniqueIdentifier>{609a4cad-b2ac-4ccb-b42e-4fdf6760d7c8}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{3ee01d10-6f0f-4738-9389-7428b055b751}</UniqueIdentifier>
+      <UniqueIdentifier>{f13c0df1-426d-4806-9c65-e883fb70c9cd}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{64b68997-740f-4836-85e8-9297ae9d9407}</UniqueIdentifier>
+      <UniqueIdentifier>{f7397664-d636-4dda-9ff0-a77bf1915db7}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{7fd11b9f-a6f0-4326-a28c-b88aa027dd46}</UniqueIdentifier>
+      <UniqueIdentifier>{96a9716b-1cd3-4d81-95f4-74e49dedcd67}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{b53d2a04-759c-4d88-994b-93bf542b4abf}</UniqueIdentifier>
+      <UniqueIdentifier>{e2f04256-7096-48c7-9180-701be60fb4f7}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{dd001ec7-57ad-49e3-bc3d-40e4c48bac18}</UniqueIdentifier>
+      <UniqueIdentifier>{315f228d-78cf-4142-8e6f-22ee45d85545}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{48ffb8c9-ecea-4ac0-8c09-8dab3aaac2a2}</UniqueIdentifier>
+      <UniqueIdentifier>{ab51506b-0cd6-44ba-8217-980e02ae6d63}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{828ca2f9-615c-4317-890a-dedf5e2954a9}</UniqueIdentifier>
+      <UniqueIdentifier>{d2c4d178-7581-4bb3-b420-196812488b25}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{0d5047bf-f396-4de4-af90-d298b3973d16}</UniqueIdentifier>
+      <UniqueIdentifier>{fe18bcd0-217a-4a4a-84d6-23977f59bf10}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{85374bb8-dcc3-4aac-87b9-73537d363b08}</UniqueIdentifier>
+      <UniqueIdentifier>{7def267c-9b05-4d99-a879-11434f13ec1a}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{7697810c-ee6c-45f9-879e-04bd0f960083}</UniqueIdentifier>
+      <UniqueIdentifier>{f351f56b-161b-4531-8aeb-b7913a0484bd}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{cd55893b-8aa2-4299-8274-3dd0201abe48}</UniqueIdentifier>
+      <UniqueIdentifier>{8c175a45-cc83-4333-ad7f-aa949ab70bc3}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{e2a6df05-829e-445d-8619-5d31d737977b}</UniqueIdentifier>
+      <UniqueIdentifier>{7fbe5c99-d07c-4e17-9296-0d8e86a52ef6}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{14b38dd4-bbf6-435e-b4f4-0b4c5161007f}</UniqueIdentifier>
+      <UniqueIdentifier>{47fb77df-0933-4f55-a008-6f42a055202a}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{bd250164-e090-498b-83d7-6315d8bb2737}</UniqueIdentifier>
+      <UniqueIdentifier>{089eb8f0-cd79-439b-b5f3-adef53ae6a0d}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{913dcb3a-8ce4-46d1-83c7-525349b6766b}</UniqueIdentifier>
+      <UniqueIdentifier>{9aac5ebd-3e34-4d00-9a2a-d05686bdd301}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{a069fa06-4fcd-4521-8242-5f6345f20429}</UniqueIdentifier>
+      <UniqueIdentifier>{d84384d4-1a79-4153-bcf5-d1daa07b6e33}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{e002d00c-cdd0-4dab-86a5-1cee1deff26a}</UniqueIdentifier>
+      <UniqueIdentifier>{674a6506-31b0-42f6-b045-c1f1f3f2b939}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{99389668-66d2-48eb-bb8a-1429589607aa}</UniqueIdentifier>
+      <UniqueIdentifier>{00abc070-f810-43df-9704-fe01582c4073}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{87c663f1-45dd-4825-9e02-dbc0a3dd8c7e}</UniqueIdentifier>
+      <UniqueIdentifier>{fcfd70d7-6c9e-4a9e-bb3a-56d22db5805e}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{4d7ec54a-7c87-45fa-b34e-4da3b6471729}</UniqueIdentifier>
+      <UniqueIdentifier>{4596c92c-bdbc-4976-ba22-0788b7685802}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{b136169c-cfdc-4577-9425-7411ca32d190}</UniqueIdentifier>
+      <UniqueIdentifier>{2e7a263c-8ba3-4824-a846-e35a95916a01}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{21b8fb42-8260-408e-b720-653fbd14cd57}</UniqueIdentifier>
+      <UniqueIdentifier>{b0f4330e-b2e3-4318-aeb1-dfe81eec3ff3}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{896b449b-534b-433b-8245-ca51a46f41c2}</UniqueIdentifier>
+      <UniqueIdentifier>{834f3735-8465-4a77-b24e-aac5dd0bd4ac}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{9d55707f-6b8c-4c1e-9369-6398b9142be2}</UniqueIdentifier>
+      <UniqueIdentifier>{7a048be1-8667-4ec8-8336-6b327cb9e042}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{abba49f8-f5e4-472e-a9d7-c54fafa678cd}</UniqueIdentifier>
+      <UniqueIdentifier>{f86a2001-b5a4-4815-872e-6e6bff462f4b}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{b39dee73-e554-4fa2-969a-0e412ecf68aa}</UniqueIdentifier>
+      <UniqueIdentifier>{775a3546-0467-4084-b63e-99d99344ff6e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{2f960fc9-4278-4038-89eb-af0bbe20b536}</UniqueIdentifier>
+      <UniqueIdentifier>{eaaf1a5f-3b01-4921-9429-97a474f579a0}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{4c03bd3e-8d60-4e10-99af-b51bc55fd21a}</UniqueIdentifier>
+      <UniqueIdentifier>{2aae3502-13ef-4743-986b-9cfd0ec01ceb}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{d460e6f5-09ed-4345-9a95-1abe44b6efad}</UniqueIdentifier>
+      <UniqueIdentifier>{2dbdf97e-aae5-473a-9a3e-706bcddb017c}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{1fc933d8-9d1a-4f04-b8ce-de237fc6cbbf}</UniqueIdentifier>
+      <UniqueIdentifier>{239746c1-1171-427e-a6a6-45b310453980}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{0ecdf70d-c37c-49d5-b254-52c867176894}</UniqueIdentifier>
+      <UniqueIdentifier>{e10a44fd-75ad-438f-a6fa-ee43c017b859}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{c7d63603-c329-4c93-9b0e-72ef719813ba}</UniqueIdentifier>
+      <UniqueIdentifier>{48cbe409-2fce-4b83-aa27-3979558a1297}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{f464df9f-da94-45b5-a97f-458e78c9d737}</UniqueIdentifier>
+      <UniqueIdentifier>{963b1d64-78a0-4b7b-8d59-a2c2a5842adc}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{bcf167be-c31d-481d-a990-d5d88b0cf1ab}</UniqueIdentifier>
+      <UniqueIdentifier>{a298fd01-d67e-4d73-8785-75f5add3aea6}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{95393e52-0a7e-4bdb-977a-e88b1578e861}</UniqueIdentifier>
+      <UniqueIdentifier>{cbfe56f5-7b5e-4829-8e81-46ffcd6bca80}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{fc55e302-f7fa-4eda-9a1a-8bedb02584cc}</UniqueIdentifier>
+      <UniqueIdentifier>{c1113477-2a2a-4b5f-9cb4-881c2f0ac62f}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{35830894-f267-4d97-ae1c-fb0096c6049c}</UniqueIdentifier>
+      <UniqueIdentifier>{8269334b-5c60-4e63-bd37-2c6358d792bc}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{b2595691-2705-421b-832b-dfdd47a46e93}</UniqueIdentifier>
+      <UniqueIdentifier>{591a273e-39d0-478d-81e8-3eb65b7f0aad}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{1ae67bee-e7c9-48af-8e6c-e5860c368f03}</UniqueIdentifier>
+      <UniqueIdentifier>{afe6c071-5737-45b3-a784-989a5729213a}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{da3985fc-1989-471a-8b28-4fa76705dc4b}</UniqueIdentifier>
+      <UniqueIdentifier>{131f64a6-a3b1-4f46-b00e-beccaab884b5}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{aed25d71-01ad-49e9-aef2-6eb3e784eeef}</UniqueIdentifier>
+      <UniqueIdentifier>{90be2149-aadd-4f9c-9b63-372584a99ee8}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{1b4cc53b-0dd3-454c-8ddc-f48e255ec782}</UniqueIdentifier>
+      <UniqueIdentifier>{ca8bf80b-3907-42f4-9b58-d917b5f6ba7b}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{648949bf-6435-4dbe-8a2b-4fe9db15caf8}</UniqueIdentifier>
+      <UniqueIdentifier>{1ebb2fa6-6f0e-44c6-a4f9-2a2b2fbf60f1}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{c9a61f02-610d-4d79-9c4e-561d72fc0cf2}</UniqueIdentifier>
+      <UniqueIdentifier>{2702ce9f-c37a-4823-8308-28a9cc1e9f16}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{33f24efd-edbb-4a24-a932-b1be2c085a68}</UniqueIdentifier>
+      <UniqueIdentifier>{02bf3783-73bf-4465-876b-554aec2160c8}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{b43b8716-01db-4a0a-b3dc-8da1f41af1a5}</UniqueIdentifier>
+      <UniqueIdentifier>{144d2cff-df9c-460f-b23a-4ef6159a9d65}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{5312f66f-a237-4b65-bde1-fd510d4104d5}</UniqueIdentifier>
+      <UniqueIdentifier>{09c09cbe-507d-445e-9ed7-30cbf34c72f1}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{f8f140de-4bdb-43c0-94fb-fb8129117587}</UniqueIdentifier>
+      <UniqueIdentifier>{74b1555a-cead-485b-9639-df0320a7eac5}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{e3f4da15-2b73-491b-ab0f-14af02d571e3}</UniqueIdentifier>
+      <UniqueIdentifier>{e7ef8336-0f96-4617-97ff-d0604c53ee89}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{4e8180f6-182d-4092-a9f8-085d15b9ee04}</UniqueIdentifier>
+      <UniqueIdentifier>{f70174f1-8988-4614-834c-2a9bcb7c82f3}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{7f13a382-7222-4043-b8b7-36cc5e794bf4}</UniqueIdentifier>
+      <UniqueIdentifier>{9265ff4a-e7e6-42b5-b2dc-e65ecd0a4e14}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{c9e48a23-7bfc-47cd-aa8b-d67164b34a38}</UniqueIdentifier>
+      <UniqueIdentifier>{f68d3e83-f4cf-4fa5-a601-51858ad5ef20}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{849d7de5-ee4d-4c0c-ba73-ba0a5af12826}</UniqueIdentifier>
+      <UniqueIdentifier>{f144602c-454d-468a-879b-83184bee78a3}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{b9a61eb6-fefe-4419-9d64-bc39e6e00161}</UniqueIdentifier>
+      <UniqueIdentifier>{6bdbd15b-61ce-42fa-a937-0cd1240ff444}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{0175f080-0b5c-4e1a-a650-d1a61db69030}</UniqueIdentifier>
+      <UniqueIdentifier>{962f24d3-f49e-4f0e-a737-6977692b1020}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{0ecb7b58-da6e-4213-bbc9-077ba86f0b5f}</UniqueIdentifier>
+      <UniqueIdentifier>{f72f9342-4e6e-4163-812b-e64a69c983d7}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{985fac62-8e40-4b4d-9c1b-ada5d0702649}</UniqueIdentifier>
+      <UniqueIdentifier>{906b6d71-6bd3-4f5d-8b6d-c397f0efdf65}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{d05dcc45-c582-4bc9-b206-f05bb46b1df7}</UniqueIdentifier>
+      <UniqueIdentifier>{96034882-219a-47de-b149-902ad005b97a}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{9346b5fe-d32f-4d5c-b23c-2d65212d0149}</UniqueIdentifier>
+      <UniqueIdentifier>{3cb8a08e-b317-4026-986b-5d2034007de6}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{473dc67f-db4a-42ba-8b95-a1f58eaed436}</UniqueIdentifier>
+      <UniqueIdentifier>{f35c69ae-fec6-4af1-90ee-201d2445d268}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{e18bbdbe-d1ad-4af8-8a70-1a6b7b715834}</UniqueIdentifier>
+      <UniqueIdentifier>{300fc5ab-83c5-4664-8629-5f902af1de5c}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{ce7b3006-e082-41d6-a56e-81c334e4c20c}</UniqueIdentifier>
+      <UniqueIdentifier>{f235f94f-a5f6-4c35-a20b-14408757bb7f}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{2974a837-c10e-4799-b63c-0b3b53767d49}</UniqueIdentifier>
+      <UniqueIdentifier>{3c101304-eff0-404a-a2f1-9cd3cd9765b6}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{dfa65348-e746-45ae-a98a-31f2f4ec6fb5}</UniqueIdentifier>
+      <UniqueIdentifier>{cfc1a0a1-ed70-4d98-92df-ac6b086c08be}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{5e1bf560-2e50-4fd8-b07b-93e25f454785}</UniqueIdentifier>
+      <UniqueIdentifier>{45c5ea91-0837-4daf-8cf9-8ed2be339d75}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{60607fa7-230f-433d-a680-7a797e972159}</UniqueIdentifier>
+      <UniqueIdentifier>{d41411db-d747-4d8b-835e-629ba8cd3c87}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{ef59a01d-8fa2-4d34-9c1e-ad5e9a45d4c2}</UniqueIdentifier>
+      <UniqueIdentifier>{20a9251d-2f34-472b-935c-2581f274b10f}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{66fcc822-ddd1-4bc3-b154-a9128bffb147}</UniqueIdentifier>
+      <UniqueIdentifier>{3c47a65f-08c2-4fe6-a188-a09311d8c0fd}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{c2867875-fb5a-4712-82bb-51c2301e6a7f}</UniqueIdentifier>
+      <UniqueIdentifier>{4803c17a-2dcf-457b-8e28-f5dc70794af2}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{381ea1b1-97ce-4617-820a-b0573f989246}</UniqueIdentifier>
+      <UniqueIdentifier>{2962ee9f-2d46-4f06-bcd6-ecad9a0dd6ce}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{e39e2dda-1ba2-4942-b922-ab32ff603123}</UniqueIdentifier>
+      <UniqueIdentifier>{303846f0-c7ba-4756-9518-beb0793e3c4d}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{b85264fa-d9c7-4cee-b7d0-af38fca578e3}</UniqueIdentifier>
+      <UniqueIdentifier>{a9e5dfaa-5996-4024-8e7d-35c53694b6f1}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{c55f2e37-f4f3-481e-b33b-c15823a80528}</UniqueIdentifier>
+      <UniqueIdentifier>{d831f5f9-d138-43e5-b1c7-cac8cdbc197c}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{ebc98743-d5f7-4e2b-b37d-9070d92d7be4}</UniqueIdentifier>
+      <UniqueIdentifier>{626f7c49-deeb-4121-ba74-fc51f9245a23}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{edb68b5b-e18b-4142-8a7d-2221b6aba8cf}</UniqueIdentifier>
+      <UniqueIdentifier>{17257349-e9be-4aed-a1e4-ac5bb781897b}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{f50d6612-a068-47a1-8b16-6366d933f6c3}</UniqueIdentifier>
+      <UniqueIdentifier>{0344bf8a-b84b-4552-854e-d0c6780f6cdc}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{a0987a91-6ded-4e7c-b8a7-ba38fb18db72}</UniqueIdentifier>
+      <UniqueIdentifier>{7de9d59c-1f14-4775-bb88-3aa48de022cd}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{ac0c3eba-dc4c-400c-a073-86b12f95cffc}</UniqueIdentifier>
+      <UniqueIdentifier>{28a2bd47-bdb0-49ab-a5cb-306f67676c53}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{e369d53d-6adb-4c4f-869b-a0f77e16281a}</UniqueIdentifier>
+      <UniqueIdentifier>{3f9d1415-78f9-4d36-8d19-544782fbbe6d}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{18a2b400-bd8c-40cd-b0a2-4b7138f225de}</UniqueIdentifier>
+      <UniqueIdentifier>{dd43bad3-723f-4f3e-bee0-9eed94c1c7b7}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{57d5c9c9-a1d9-4c46-ab3a-ddf18a04ae47}</UniqueIdentifier>
+      <UniqueIdentifier>{f187d938-1099-48b3-8a21-fcc076081f62}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{050fecb5-dbb1-49f4-bf54-df6e69c8a70e}</UniqueIdentifier>
+      <UniqueIdentifier>{21204ad4-8beb-438e-b124-3091afd1b7b8}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{55e66440-909f-4f5a-b8db-ebdb0cf5d427}</UniqueIdentifier>
+      <UniqueIdentifier>{4288755d-5144-458d-8f91-1fadcbc4fa1a}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{c0e5a81a-2479-4bbb-84b9-7e1b33763f76}</UniqueIdentifier>
+      <UniqueIdentifier>{1cbbff28-42cd-44f4-bcf8-94b4c5eab25f}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{d8f9bfe2-91fa-4269-83a0-de1b478eb109}</UniqueIdentifier>
+      <UniqueIdentifier>{0db4a667-2531-4b5c-81db-edeeb8127693}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{c2cd8f5d-a565-4273-ae5a-345237d2ae35}</UniqueIdentifier>
+      <UniqueIdentifier>{b4d89687-7b5e-46d4-a5b1-441fa9376b1b}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{4def0fdd-2ee9-4da8-a875-e0a68bbd3bd0}</UniqueIdentifier>
+      <UniqueIdentifier>{26186ce5-4fb5-4299-8bd7-00b0eb7c607f}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{7eccf2a6-4204-4a3f-bdce-8211b610e3cb}</UniqueIdentifier>
+      <UniqueIdentifier>{7d76811e-1b85-44b4-9480-21108575ee80}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{d4630e5d-809f-41bf-82fe-f7dc48e304b4}</UniqueIdentifier>
+      <UniqueIdentifier>{843ba12a-840c-41c6-b9ac-5c52c79a2e99}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{c35df5a9-f8ac-474f-bd21-f970fcf94a31}</UniqueIdentifier>
+      <UniqueIdentifier>{4b56748a-1b98-4e19-83c5-0276c7c8269a}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{23049803-f5a2-40d3-986e-944ac84f6f68}</UniqueIdentifier>
+      <UniqueIdentifier>{5ed77e20-4fe5-47ac-a197-d057757d8830}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{14c37024-27f7-42e9-a404-61f6019f7353}</UniqueIdentifier>
+      <UniqueIdentifier>{1bb55586-bfdc-43a3-a5c7-f053e8b45b8e}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{ac3d3892-c16c-4e4c-b94a-5d6e64c564e1}</UniqueIdentifier>
+      <UniqueIdentifier>{78d00871-b4ee-4fc6-aeb2-ca2fb4af218e}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{9dd281c0-2dc5-4e0d-a89a-340d333eb025}</UniqueIdentifier>
+      <UniqueIdentifier>{490ef239-c152-4ce3-b951-51b5ef4169b7}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{47270f29-4065-430e-89d9-81fd5198888f}</UniqueIdentifier>
+      <UniqueIdentifier>{73f33340-4ea7-42f8-8260-0287649d2fd5}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{4de5ee5f-ab4b-43a5-b7c0-82fce99d052b}</UniqueIdentifier>
+      <UniqueIdentifier>{500b7aa5-382b-4fec-b4f4-e9cfdfa78c90}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{f3cb3ffa-3e7f-4b2a-bec8-5cd8b13ab3f7}</UniqueIdentifier>
+      <UniqueIdentifier>{d5fd394b-6978-4422-8542-34d1c821c828}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{84b5b690-281b-48a1-bf5c-81c00c4ba97e}</UniqueIdentifier>
+      <UniqueIdentifier>{57fb0ab4-007d-48f6-8079-2cade587d086}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{dbacd4c4-de6c-4663-ba48-ffe38f526f98}</UniqueIdentifier>
+      <UniqueIdentifier>{765b8235-f784-4fc3-9187-e052fd0011e6}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{f68e29d7-7bd1-4d5e-a53b-d5b78d5083d6}</UniqueIdentifier>
+      <UniqueIdentifier>{e24c1a13-2659-474f-8ab8-4ebafa201ab8}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{64301eb5-24bc-41df-99dd-7ea9a2e3a009}</UniqueIdentifier>
+      <UniqueIdentifier>{53489db6-1b5a-417e-a812-471bb3587fa5}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{e8414c91-7bf0-4ded-a911-addfe1e91b96}</UniqueIdentifier>
+      <UniqueIdentifier>{ff028afd-0fec-4f1f-ade2-250cfd2afac9}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{56f6e2b4-764f-449e-bf25-3882c97a6b04}</UniqueIdentifier>
+      <UniqueIdentifier>{194d0ea3-eed0-4e61-87e9-8096870b4dc6}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,64 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="HTTPS">
-      <UniqueIdentifier>{b6519e4f-5696-4d4d-8c2a-c20d31ec1a5e}</UniqueIdentifier>
+      <UniqueIdentifier>{f3a69302-4e58-498c-8a0f-2921ba8b27d5}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{8a46671f-856b-4226-a7a4-57d010c8a190}</UniqueIdentifier>
+      <UniqueIdentifier>{4b4f6ad0-99ed-499b-912f-b470976da3c0}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{123c7f1d-5507-407e-9f40-e0e1390f62f0}</UniqueIdentifier>
+      <UniqueIdentifier>{fe5d4764-27c7-4323-aa37-52a92ce3c780}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{9f02dac5-3f1a-4009-b5aa-2edd6aff5670}</UniqueIdentifier>
+      <UniqueIdentifier>{c386e29c-3dc5-40e2-ae63-1a9bc245494d}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{50ae6260-0779-4c43-a956-0f3cf4685907}</UniqueIdentifier>
+      <UniqueIdentifier>{56e6867a-73f9-47d3-bf6e-33e53366e1d7}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{6bb5aebf-0d4c-4d0c-aabc-d1d7cfd6cb65}</UniqueIdentifier>
+      <UniqueIdentifier>{328279f1-13a7-4910-ab29-c3ce24e9e096}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{54013368-f284-4843-b492-49c7bfa9bbfb}</UniqueIdentifier>
+      <UniqueIdentifier>{28f80414-6002-456c-b1fe-9a6f5b1a82ba}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{5e94def8-aa2e-472a-99c3-d08659fea948}</UniqueIdentifier>
+      <UniqueIdentifier>{2821e8f4-a52d-4e7f-939c-2a238903b49a}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{c6bcef7e-de7e-4c96-aa72-5badeadc286b}</UniqueIdentifier>
+      <UniqueIdentifier>{4be26df8-3173-4798-a58c-c7367370660d}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{4794c060-2759-4cee-b4c0-2f7e5b37d58c}</UniqueIdentifier>
+      <UniqueIdentifier>{84d0d59a-ecbb-4a4c-9018-45fccae1bc38}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{ce61db73-c2a2-47c6-a243-996fab5e584f}</UniqueIdentifier>
+      <UniqueIdentifier>{c5e5c410-fb67-474f-a66d-f5fda4a2c0cc}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{341cc94c-1edf-4ba9-880f-544807b52dd6}</UniqueIdentifier>
+      <UniqueIdentifier>{c765b6fc-0be5-4611-b645-d6cf20903935}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{d4e783b9-12f4-40ba-8cc8-83dc2b94b864}</UniqueIdentifier>
+      <UniqueIdentifier>{c45e23b6-f9fa-49f6-857c-3b046f42569c}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{a6db87b0-ea89-40e4-a642-16133a95dcc6}</UniqueIdentifier>
+      <UniqueIdentifier>{25c609b7-e36b-4eb7-8bf5-6bb48d373894}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{6ace2a39-351c-43dd-9ed0-42c87bb802da}</UniqueIdentifier>
+      <UniqueIdentifier>{ae153ea9-5761-4e92-b76e-811efbd94bc5}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{c3721841-0d90-4582-a0de-9771d809629d}</UniqueIdentifier>
+      <UniqueIdentifier>{de4ba87e-ff5a-4e2e-9859-bc8297969ea3}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{7db2445e-a438-4204-8429-67f4f3b57b9d}</UniqueIdentifier>
+      <UniqueIdentifier>{4c20335c-7ba1-48f5-b649-06c95e86cc21}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{f80a6f37-fde0-41a5-8144-b09436d9c4b5}</UniqueIdentifier>
+      <UniqueIdentifier>{24bed41e-3d77-448c-b7a5-a8980a532fcb}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{0bbcc792-a307-4c1a-91f9-74574fb99033}</UniqueIdentifier>
+      <UniqueIdentifier>{50f5f6a9-53be-4dcb-ba56-9dff5febcc49}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{b90907c9-b45f-4ecc-a8c9-35db3abf53c1}</UniqueIdentifier>
+      <UniqueIdentifier>{cbeeeb41-db6d-4b71-8019-73a2fee2e8d5}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>