diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 6b109abacc..cfceb65ca4 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -38,9 +38,9 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IIS\src\Microsoft.AspNetCore.Server.IIS.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Core" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Https" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj" />
diff --git a/src/Middleware/CORS/test/FunctionalTests/package-lock.json b/src/Middleware/CORS/test/FunctionalTests/package-lock.json
index c2a6f2c7d6..3db2468bdf 100644
--- a/src/Middleware/CORS/test/FunctionalTests/package-lock.json
+++ b/src/Middleware/CORS/test/FunctionalTests/package-lock.json
@@ -1668,8 +1668,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1690,14 +1689,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1712,20 +1709,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1842,8 +1836,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1855,7 +1848,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1870,7 +1862,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1878,14 +1869,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -1904,7 +1893,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1985,8 +1973,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1998,7 +1985,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2084,8 +2070,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2121,7 +2106,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2141,7 +2125,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2185,14 +2168,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
diff --git a/src/Servers/IIS/.gitignore b/src/Servers/IIS/.gitignore
index b5d62b3329..280e795a56 100644
--- a/src/Servers/IIS/.gitignore
+++ b/src/Servers/IIS/.gitignore
@@ -37,27 +37,24 @@ project.lock.json
 *.CppClean.log
 *msbuild.log
 gtest.log
-
-src/*/*/Debug/
-src/*/*/x64/Debug/
-src/*/*/Release/
-src/*/*/x64/Release/
+Debug/
+x64/Debug/
+Release/
+x64/Release/
 x64/
 *vcxproj.filters
 *.aps
 *.pdb
 *.lib
 *.idb
-*.TMP
-
-src/*/AspNetCore/aspnetcoremodule.h
-src/*/AspNetCore/aspnetcore_msg.h
-src/*/AspNetCore/aspnetcore_msg.rc
-src/*/*/version.h
-src/*/InProcessRequestHandler/version.h
-src/*/OutOfProcessRequestHandler/version.h
-src/*/CommonLib/aspnetcore_msg.h
-src/*/CommonLib/aspnetcore_msg.rc
+*.res
+*.pch
+aspnetcoremodule.h
+AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h
+AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h
+AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc
+AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
+version.h
 test/*/Debug
 test/*/Release
 .build
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
similarity index 99%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
index 2b628348fb..d64d53d984 100644
--- a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\Build\Build.Settings" />
+  <Import Project="..\..\build\Build.Settings" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -260,7 +260,7 @@
       <Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\..\..\build\native.targets" />
+  <Import Project="..\..\build\native.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/application.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/application.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/path.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/path.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/resource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/resource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Source.def b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Source.def
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Source.def
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Source.def
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/resource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/resource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/application.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/application.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/main.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/main.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/path.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/path.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.cxx b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.cxx
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.cpp
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.cpp
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/buffer.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/buffer.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/buffer.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/buffer.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/datetime.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/datetime.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/datetime.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/datetime.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/dbgutil.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/dbgutil.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/dbgutil.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/dbgutil.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashfn.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashfn.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashfn.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashfn.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashtable.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashtable.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashtable.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashtable.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/listentry.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/listentry.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/listentry.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/listentry.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/macros.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/macros.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/macros.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/macros.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.cpp
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.cpp
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ntassert.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/ntassert.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ntassert.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/ntassert.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/percpu.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/percpu.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/percpu.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/percpu.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/precomp.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/precomp.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/precomp.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/precomp.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/prime.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/prime.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/prime.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/prime.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/pudebug.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/pudebug.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/pudebug.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/pudebug.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.c b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.c
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.c
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.c
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/rwlock.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/rwlock.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/rwlock.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/rwlock.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.cpp
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.cpp
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.c b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.c
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.c
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.c
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/treehash.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/treehash.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/treehash.h
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/treehash.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/util.cxx b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/util.cxx
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/util.cxx
rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/util.cxx
diff --git a/src/Servers/IIS/LICENSE.txt b/src/Servers/IIS/AspNetCoreModuleV1/LICENSE.txt
similarity index 100%
rename from src/Servers/IIS/LICENSE.txt
rename to src/Servers/IIS/AspNetCoreModuleV1/LICENSE.txt
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
similarity index 62%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
index 4ab6c6330a..ef1b44bc18 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
+++ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
@@ -14,11 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/aspnetcore_schema.xml" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" PackagePath="contentFiles/any/any/x86" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64" />
+    <Content Include="..\..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/aspnetcore_schema.xml" />
     <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props" PackagePath="build\" />
     <Reference Include="AspNetCoreModule" />
   </ItemGroup>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props
rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/_._ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/_._
rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
similarity index 99%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
index 98c5920ed4..b4fbd7ce27 100644
--- a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
@@ -55,7 +55,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\Build\Build.Settings" />
+  <Import Project="..\..\build\Build.Settings" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -298,7 +298,7 @@
   <ItemGroup>
     <Xml Include="aspnetcore_schema_v2.xml" />
   </ItemGroup>
-  <Import Project="..\..\..\build\native.targets" />
+  <Import Project="..\..\build\native.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/Source.def b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/Source.def
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/Source.def
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/Source.def
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm.mof
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/ancm.mof
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm.mof
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml
new file mode 100644
index 0000000000..d65be07195
--- /dev/null
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml
@@ -0,0 +1,47 @@
+<!--
+    
+    IIS Asp.Net Core Extension Schema
+    
+    ** Please DO NOT edit this file yourself. **
+    
+    If you want to add configuration sections to the schema, you may place 
+    them in .xml files similar to this one, in this directory. They will be 
+    picked up automatically on startup.
+
+-->
+
+<configSchema>
+    <sectionSchema name="system.webServer/aspNetCore">
+        <attribute name="processPath" type="string" expanded="true"/>
+        <attribute name="arguments" type="string" expanded="true" defaultValue=""/>
+        <attribute name="startupTimeLimit" type="uint" defaultValue="120" validationType="integerRange" validationParameter="0,3600"/>
+        <!-- in seconds -->
+        <attribute name="shutdownTimeLimit" type="uint" defaultValue="10" validationType="integerRange" validationParameter="0,600"/>
+        <!-- in seconds -->
+        <attribute name="rapidFailsPerMinute" type="uint" defaultValue="10" validationType="integerRange" validationParameter="0,100"/>
+        <attribute name="requestTimeout" type="timeSpan" defaultValue="00:02:00" validationType="timeSpanRange" validationParameter="0,1296000,1"/>
+        <attribute name="stdoutLogEnabled" type="bool" defaultValue="false" />
+        <attribute name="stdoutLogFile" type="string" defaultValue=".\aspnetcore-stdout" expanded="true"/>
+        <attribute name="processesPerApplication" type="uint" defaultValue="1" validationType="integerRange" validationParameter="1,100"/>
+        <attribute name="forwardWindowsAuthToken" type="bool" defaultValue="true" />
+        <attribute name="disableStartUpErrorPage" type="bool" defaultValue="false" />
+        <attribute name="hostingModel" type="string" />
+        <element name="recycleOnFileChange">
+            <collection addElement="file" clearElement="clear">
+                <attribute name="path" type="string" required="true" validationType="nonEmptyString" expanded="true"/>
+            </collection>
+        </element>
+        <element name="environmentVariables">
+            <collection addElement="environmentVariable" clearElement="clear" >
+                <attribute name="name" type="string" required="true" validationType="nonEmptyString"/>
+                <attribute name="value" type="string" required="true"/>
+            </collection>
+        </element>
+        <element name="handlerSettings">
+            <collection addElement="handlerSetting" clearElement="clear" >
+                <attribute name="name" type="string" required="true" validationType="nonEmptyString"/>
+               <attribute name="value" type="string" required="true"/>
+            </collection>
+        </element>
+    </sectionSchema>
+</configSchema>
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/proxymodule.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/proxymodule.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/resource.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/resource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/resource.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/resource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/stdafx.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/stdafx.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/stdafx.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/AspNetCore/stdafx.h
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/stdafx.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventLog.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventTracing.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventTracing.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/EventTracing.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventTracing.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/FileOutputManager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/FileOutputManager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HandleWrapper.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HandleWrapper.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/IOutputManager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/IOutputManager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/NonCopyable.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/NonCopyable.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/NullOutputManager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/NullOutputManager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ResultException.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ResultException.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ResultException.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ResultException.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/application.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/application.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/application.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/application.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h
new file mode 100644
index 0000000000..57f402cdef
--- /dev/null
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h
@@ -0,0 +1,328 @@
+/*++
+
+ Copyright (c) .NET Foundation. All rights reserved.
+ Licensed under the MIT License. See License.txt in the project root for license information.
+
+Module Name:
+
+    aspnetcore_msg.mc
+
+Abstract:
+
+    Asp.Net Core Module localizable messages.
+
+--*/
+
+
+#ifndef _ASPNETCORE_MSG_H_
+#define _ASPNETCORE_MSG_H_
+
+//
+//  Values are 32 bit values laid out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +---+-+-+-----------------------+-------------------------------+
+//  |Sev|C|R|     Facility          |               Code            |
+//  +---+-+-+-----------------------+-------------------------------+
+//
+//  where
+//
+//      Sev - is the severity code
+//
+//          00 - Success
+//          01 - Informational
+//          10 - Warning
+//          11 - Error
+//
+//      C - is the Customer code flag
+//
+//      R - is a reserved bit
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: ASPNETCORE_EVENT_PROCESS_START_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_PROCESS_START_ERROR ((DWORD)0x000003E8L)
+
+//
+// MessageId: ASPNETCORE_EVENT_PROCESS_START_SUCCESS
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_PROCESS_START_SUCCESS ((DWORD)0x000003E9L)
+
+//
+// MessageId: ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED ((DWORD)0x000003EBL)
+
+//
+// MessageId: ASPNETCORE_EVENT_CONFIG_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_CONFIG_ERROR    ((DWORD)0x000003ECL)
+
+//
+// MessageId: ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE ((DWORD)0x000003EDL)
+
+//
+// MessageId: ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST ((DWORD)0x000003EEL)
+
+//
+// MessageId: ASPNETCORE_EVENT_LOAD_CLR_FALIURE
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_LOAD_CLR_FALIURE ((DWORD)0x000003EFL)
+
+//
+// MessageId: ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP ((DWORD)0x000003F0L)
+
+//
+// MessageId: ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR ((DWORD)0x000003F1L)
+
+//
+// MessageId: ASPNETCORE_EVENT_ADD_APPLICATION_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR ((DWORD)0x000003F2L)
+
+//
+// MessageId: ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT ((DWORD)0x000003F3L)
+
+//
+// MessageId: ASPNETCORE_EVENT_RECYCLE_APPOFFLINE
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE ((DWORD)0x000003F4L)
+
+//
+// MessageId: ASPNETCORE_EVENT_MODULE_DISABLED
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_MODULE_DISABLED ((DWORD)0x000003F5L)
+
+//
+// MessageId: ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION ((DWORD)0x000003FAL)
+
+//
+// MessageId: ASPNETCORE_EVENT_PROCESS_START_FAILURE
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_PROCESS_START_FAILURE ((DWORD)0x000003FCL)
+
+//
+// MessageId: ASPNETCORE_EVENT_RECYCLE_CONFIGURATION
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_RECYCLE_CONFIGURATION ((DWORD)0x000003FDL)
+
+//
+// MessageId: ASPNETCORE_EVENT_RECYCLE_APP_FAILURE
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_RECYCLE_APP_FAILURE ((DWORD)0x000003FEL)
+
+//
+// MessageId: ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR ((DWORD)0x00000400L)
+
+//
+// MessageId: ASPNETCORE_EVENT_GENERAL_INFO
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_GENERAL_INFO    ((DWORD)0x00000401L)
+
+//
+// MessageId: ASPNETCORE_EVENT_GENERAL_WARNING
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_GENERAL_WARNING ((DWORD)0x00000402L)
+
+//
+// MessageId: ASPNETCORE_EVENT_GENERAL_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_GENERAL_ERROR   ((DWORD)0x00000403L)
+
+//
+// MessageId: ASPNETCORE_EVENT_INPROCESS_RH_MISSING
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_INPROCESS_RH_MISSING ((DWORD)0x00000404L)
+
+//
+// MessageId: ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING ((DWORD)0x00000405L)
+
+//
+// MessageId: ASPNETCORE_EVENT_PROCESS_SHUTDOWN
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_PROCESS_SHUTDOWN ((DWORD)0x00000406L)
+
+//
+// MessageId: ASPNETCORE_EVENT_INPROCESS_START_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_INPROCESS_START_ERROR ((DWORD)0x00000407L)
+
+//
+// MessageId: ASPNETCORE_EVENT_INPROCESS_START_SUCCESS
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS ((DWORD)0x00000408L)
+
+//
+// MessageId: ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL ((DWORD)0x00000409L)
+
+//
+// MessageId: ASPNETCORE_CONFIGURATION_LOAD_ERROR
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_CONFIGURATION_LOAD_ERROR ((DWORD)0x0000040AL)
+
+//
+// MessageId: ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT ((DWORD)0x0000040BL)
+
+//
+// MessageId: ASPNETCORE_EVENT_DEBUG_LOG
+//
+// MessageText:
+//
+// %1
+//
+#define ASPNETCORE_EVENT_DEBUG_LOG       ((DWORD)0x0000040CL)
+
+
+#endif     // _ASPNETCORE_MODULE_MSG_H_
+
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
new file mode 100644
index 0000000000..0abcb0fa2c
--- /dev/null
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 "MSG00001.bin"
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/config_utility.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/config_utility.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/config_utility.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/debugutil.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/exceptions.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/exceptions.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/file_utility.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/fx_ver.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/fx_ver.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/fx_ver.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/fx_ver.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/fx_ver.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxroptions.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/hostfxroptions.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/iapplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/iapplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/iapplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/irequesthandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/irequesthandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/requesthandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/resources.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/stdafx.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/stdafx.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/stdafx.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/stdafx.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/stdafx.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/sttimer.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/targetver.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/targetver.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/targetver.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/targetver.h
diff --git a/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
similarity index 79%
rename from src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
index 3d5d6efaa4..88eda258d2 100644
--- a/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
@@ -61,22 +61,22 @@
     <ClCompile Include="utility_tests.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
+    <ProjectReference Include="..\AspNetCore\AspNetCore.vcxproj">
       <Project>{ec82302f-d2f0-4727-99d1-eabc0dd9dc3b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj">
+    <ProjectReference Include="..\\CommonLib\CommonLib.vcxproj">
       <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj">
+    <ProjectReference Include="..\IISLib\IISLib.vcxproj">
       <Project>{09d9d1d6-2951-4e14-bc35-76a23cf9391a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj">
+    <ProjectReference Include="..\RequestHandlerLib\RequestHandlerLib.vcxproj">
       <Project>{1533e271-f61b-441b-8b74-59fb61df0552}</Project>
     </ProjectReference>
     <ProjectReference Include="..\gtest\gtest.vcxproj">
       <Project>{cac1267b-8778-4257-aac6-caf481723b01}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
+    <ProjectReference Include="..\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
       <Project>{d57ea297-6dc2-4bc0-8c91-334863327863}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -93,14 +93,14 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\</AdditionalIncludeDirectories>
       <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\InProcessRequestHandler\$(Configuration)\;</AdditionalLibraryDirectories>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
@@ -120,14 +120,14 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\</AdditionalIncludeDirectories>
       <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\InProcessRequestHandler\x64\$(Configuration)\;</AdditionalLibraryDirectories>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
@@ -145,7 +145,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\</AdditionalIncludeDirectories>
       <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -155,7 +155,7 @@
       <AdditionalOptions>/NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions)</AdditionalOptions>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <AdditionalLibraryDirectories>..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\InProcessRequestHandler\$(Configuration)\;</AdditionalLibraryDirectories>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
@@ -173,7 +173,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\</AdditionalIncludeDirectories>
       <AdditionalOptions>/D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" </AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -183,7 +183,7 @@
       <AdditionalOptions>/NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions)</AdditionalOptions>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <AdditionalLibraryDirectories>..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\InProcessRequestHandler\x64\$(Configuration)\;</AdditionalLibraryDirectories>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
diff --git a/src/Servers/IIS/test/CommonLibTests/ConfigUtilityTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/ConfigUtilityTests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/FileOutputManagerTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/FileOutputManagerTests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/FileOutputManagerTests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/FileOutputManagerTests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/GlobalVersionTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/GlobalVersionTests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/GlobalVersionTests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/GlobalVersionTests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/Helpers.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/Helpers.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/Helpers.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/Helpers.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/Helpers.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/Helpers.h
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/Helpers.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/Helpers.h
diff --git a/src/Servers/IIS/test/CommonLibTests/NativeTests.targets b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/NativeTests.targets
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/NativeTests.targets
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/NativeTests.targets
diff --git a/src/Servers/IIS/test/CommonLibTests/PipeOutputManagerTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/PipeOutputManagerTests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/PipeOutputManagerTests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/PipeOutputManagerTests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/exception_handler_tests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/exception_handler_tests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/exception_handler_tests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/exception_handler_tests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/fakeclasses.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/fakeclasses.h
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/fakeclasses.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/fakeclasses.h
diff --git a/src/Servers/IIS/test/CommonLibTests/hostfxr_utility_tests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/hostfxr_utility_tests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/hostfxr_utility_tests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/hostfxr_utility_tests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/inprocess_application_tests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/inprocess_application_tests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/inprocess_application_tests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/inprocess_application_tests.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/main.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/main.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp
diff --git a/src/Servers/IIS/test/CommonLibTests/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/stdafx.h
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/stdafx.h
diff --git a/src/Servers/IIS/test/CommonLibTests/utility_tests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/utility_tests.cpp
similarity index 100%
rename from src/Servers/IIS/test/CommonLibTests/utility_tests.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/utility_tests.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/DefaultRules.ruleset b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/DefaultRules.ruleset
rename to src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/acache.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ahutil.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/base64.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/buffer.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/buffer.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/datetime.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/datetime.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/datetime.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/datetime.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/dbgutil.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/dbgutil.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/dbgutil.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashfn.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashfn.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashfn.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashfn.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashtable.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/hashtable.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/listentry.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/listentry.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/macros.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/macros.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/macros.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/macros.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisz.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/multisza.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ntassert.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ntassert.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/ntassert.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/ntassert.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/percpu.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/percpu.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/percpu.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/percpu.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/precomp.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/precomp.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/precomp.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/precomp.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/prime.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/prime.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/prime.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/prime.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.c b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.c
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.c
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.c
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/reftrace.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/rwlock.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/rwlock.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringa.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/stringu.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.c b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.c
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/tracelog.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/treehash.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/treehash.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/treehash.h
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/treehash.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/util.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/IISLib/util.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
similarity index 99%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
index 69435f32d6..9785deeab5 100644
--- a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\Build\Build.Settings" />
+  <Import Project="..\..\build\Build.Settings" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -269,7 +269,7 @@
     </None>
     <None Include="Source.def" />
   </ItemGroup>
-  <Import Project="..\..\..\build\native.targets" />
+  <Import Project="..\..\build\native.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/Source.def
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/Source.def
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/resource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/resource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h
rename to src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
rename to src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in
rename to src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
new file mode 100644
index 0000000000..1cc9e02ba9
--- /dev/null
+++ b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
@@ -0,0 +1,42 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <PackageId>$(MSBuildProjectName)</PackageId>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <PackageTags>aspnetcore</PackageTags>
+    <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
+    <Pack>true</Pack>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <PackageDescription>ASP.NET Core Module</PackageDescription>
+    <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll" PackagePath="contentFiles/any/any/x86" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb" PackagePath="contentFiles/any/any/x86" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" PackagePath="contentFiles/any/any/x64" />
+    <Content Include="..\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" PackagePath="contentFiles/any/any/x64" />
+
+    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x86/2.0.0" />
+    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x86/2.0.0" />
+    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x64/2.0.0" />
+    <Content Include="..\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x64/2.0.0" />
+
+    <Content Include="..\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/" />
+    <Content Include="..\AspNetCore\ancm.mof" PackagePath="/" />
+    <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props.in" PackagePath="build\" />
+    <Reference Include="AspNetCoreModuleV2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="_._" PackagePath="lib/$(TargetFramework)/" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <Target Name="CopyFilesToOutputDirectory" />
+  <Target Name="CoreCompile" DependsOnTargets="ResolveReferences" />
+  <Target Name="CreateManifestResourceNames" />
+</Project>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/_._
rename to src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
similarity index 99%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
index ca2bc0f4aa..e3d11e040d 100644
--- a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\Build\Build.Settings" />
+  <Import Project="..\..\build\Build.Settings" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -278,7 +278,7 @@
     </None>
     <None Include="Source.def" />
   </ItemGroup>
-  <Import Project="..\..\..\build\native.targets" />
+  <Import Project="..\..\build\native.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h
rename to src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h
similarity index 100%
rename from src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h
rename to src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h
diff --git a/src/Servers/IIS/test/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj
similarity index 100%
rename from src/Servers/IIS/test/gtest/gtest.vcxproj
rename to src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj
diff --git a/src/Servers/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs
similarity index 100%
rename from src/Servers/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs
rename to src/Servers/IIS/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs
diff --git a/src/Servers/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
similarity index 66%
rename from src/Servers/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
rename to src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
index 559c7029fb..cfe47d5e42 100644
--- a/src/Servers/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
+++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj
@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
-    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
-    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
-    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs
similarity index 100%
rename from src/Servers/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs
rename to src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs
diff --git a/src/Servers/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs
similarity index 100%
rename from src/Servers/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs
rename to src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs
diff --git a/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
similarity index 92%
rename from src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj
rename to src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
index 1ceb1e2e3b..5f3ceb977d 100644
--- a/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj
+++ b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\build\testsite.props" />
+  <Import Project="..\..\..\build\testsite.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
diff --git a/src/Servers/IIS/samples/NativeIISSample/Startup.cs b/src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs
similarity index 100%
rename from src/Servers/IIS/samples/NativeIISSample/Startup.cs
rename to src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs
diff --git a/src/Servers/IIS/samples/NativeIISSample/web.config b/src/Servers/IIS/IIS/samples/NativeIISSample/web.config
similarity index 100%
rename from src/Servers/IIS/samples/NativeIISSample/web.config
rename to src/Servers/IIS/IIS/samples/NativeIISSample/web.config
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs b/src/Servers/IIS/IIS/src/AssemblyInfo.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs
rename to src/Servers/IIS/IIS/src/AssemblyInfo.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs b/src/Servers/IIS/IIS/src/Core/DuplexStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs
rename to src/Servers/IIS/IIS/src/Core/DuplexStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs b/src/Servers/IIS/IIS/src/Core/EmptyStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs
rename to src/Servers/IIS/IIS/src/Core/EmptyStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs b/src/Servers/IIS/IIS/src/Core/HttpRequestStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs
rename to src/Servers/IIS/IIS/src/Core/HttpRequestStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs b/src/Servers/IIS/IIS/src/Core/HttpResponseStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs
rename to src/Servers/IIS/IIS/src/Core/HttpResponseStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs b/src/Servers/IIS/IIS/src/Core/HttpStreamState.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs
rename to src/Servers/IIS/IIS/src/Core/HttpStreamState.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs b/src/Servers/IIS/IIS/src/Core/HttpUpgradeStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs
rename to src/Servers/IIS/IIS/src/Core/HttpUpgradeStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs b/src/Servers/IIS/IIS/src/Core/IISConfigurationData.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs
rename to src/Servers/IIS/IIS/src/Core/IISConfigurationData.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.Features.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.Features.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.IHttpConnectionFeature.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.IHttpConnectionFeature.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.IO.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.IO.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.Log.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.Log.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContext.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContextOfT.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpContextOfT.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Servers/IIS/IIS/src/Core/IISHttpServer.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs
rename to src/Servers/IIS/IIS/src/Core/IISHttpServer.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/Servers/IIS/IIS/src/Core/IISNativeApplication.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs
rename to src/Servers/IIS/IIS/src/Core/IISNativeApplication.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs b/src/Servers/IIS/IIS/src/Core/IISServerAuthenticationHandler.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs
rename to src/Servers/IIS/IIS/src/Core/IISServerAuthenticationHandler.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs b/src/Servers/IIS/IIS/src/Core/IISServerSetupFilter.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs
rename to src/Servers/IIS/IIS/src/Core/IISServerSetupFilter.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs b/src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.Flush.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs
rename to src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.Flush.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs b/src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.Read.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs
rename to src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.Read.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs b/src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.Write.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs
rename to src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.Write.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
rename to src/Servers/IIS/IIS/src/Core/IO/AsyncIOEngine.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/Servers/IIS/IIS/src/Core/IO/AsyncIOOperation.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs
rename to src/Servers/IIS/IIS/src/Core/IO/AsyncIOOperation.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs b/src/Servers/IIS/IIS/src/Core/IO/AsyncWriteOperationBase.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs
rename to src/Servers/IIS/IIS/src/Core/IO/AsyncWriteOperationBase.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs b/src/Servers/IIS/IIS/src/Core/IO/IAsyncIOEngine.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs
rename to src/Servers/IIS/IIS/src/Core/IO/IAsyncIOEngine.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs b/src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs
rename to src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs b/src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.Read.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs
rename to src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.Read.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs b/src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.Write.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs
rename to src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.Write.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs b/src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs
rename to src/Servers/IIS/IIS/src/Core/IO/WebSocketsAsyncIOEngine.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs b/src/Servers/IIS/IIS/src/Core/OutputProducer.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs
rename to src/Servers/IIS/IIS/src/Core/OutputProducer.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs b/src/Servers/IIS/IIS/src/Core/ReadOnlyStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs
rename to src/Servers/IIS/IIS/src/Core/ReadOnlyStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs b/src/Servers/IIS/IIS/src/Core/Streams.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs
rename to src/Servers/IIS/IIS/src/Core/Streams.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs b/src/Servers/IIS/IIS/src/Core/ThrowingWasUpgradedWriteOnlyStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs
rename to src/Servers/IIS/IIS/src/Core/ThrowingWasUpgradedWriteOnlyStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs b/src/Servers/IIS/IIS/src/Core/WrappingStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs
rename to src/Servers/IIS/IIS/src/Core/WrappingStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs b/src/Servers/IIS/IIS/src/Core/WriteOnlyStream.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs
rename to src/Servers/IIS/IIS/src/Core/WriteOnlyStream.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx b/src/Servers/IIS/IIS/src/CoreStrings.resx
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx
rename to src/Servers/IIS/IIS/src/CoreStrings.resx
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs b/src/Servers/IIS/IIS/src/HttpContextExtensions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs
rename to src/Servers/IIS/IIS/src/HttpContextExtensions.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs b/src/Servers/IIS/IIS/src/IISServerDefaults.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs
rename to src/Servers/IIS/IIS/src/IISServerDefaults.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs b/src/Servers/IIS/IIS/src/IISServerOptions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs
rename to src/Servers/IIS/IIS/src/IISServerOptions.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs b/src/Servers/IIS/IIS/src/IServerVariableFeature.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs
rename to src/Servers/IIS/IIS/src/IServerVariableFeature.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
similarity index 96%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
rename to src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
index 2a4fbd76a3..e6d9dbc6c8 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -25,7 +25,7 @@
   </Target>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.targets
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
rename to src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.targets
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Servers/IIS/IIS/src/NativeMethods.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs
rename to src/Servers/IIS/IIS/src/NativeMethods.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs b/src/Servers/IIS/IIS/src/Properties/CoreStrings.Designer.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs
rename to src/Servers/IIS/IIS/src/Properties/CoreStrings.Designer.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs
rename to src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/Servers/IIS/IIS/src/_._
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/_._
rename to src/Servers/IIS/IIS/src/_._
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/AppHostConfig/IIS.config b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppHostConfig/IIS.config
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/AppHostConfig/IIS.config
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/AppHostConfig/IIS.config
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/AppOfflineTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/BasicAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/CommonStartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/CommonStartupTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/CompressionTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/LogFileTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/LogFileTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/RequiresNewShim.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/RequiresNewShim.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/ServerAbortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/ServerAbortTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/AppVerifier.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/AppVerifier.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/AppVerifier.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs
similarity index 99%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs
index 7876403e65..d09df9ddea 100644
--- a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         public static string GetTestWebSitePath(string name)
         {
-            return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "testassets", name);
+            return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"IIS", "test", "testassets", name);
         }
 
         public static string GetInProcessTestSitesPath()
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs
diff --git a/src/Servers/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
diff --git a/src/Servers/IIS/test/Common.Tests/Common.Tests.csproj b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj
similarity index 63%
rename from src/Servers/IIS/test/Common.Tests/Common.Tests.csproj
rename to src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj
index 86ceaa68b6..00f8077d1c 100644
--- a/src/Servers/IIS/test/Common.Tests/Common.Tests.csproj
+++ b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj
@@ -5,11 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
-    <!-- <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" /> -->
-  </ItemGroup>
-
-  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
diff --git a/src/Servers/IIS/test/Common.Tests/Utilities/DisposableList.cs b/src/Servers/IIS/IIS/test/Common.Tests/Utilities/DisposableList.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.Tests/Utilities/DisposableList.cs
rename to src/Servers/IIS/IIS/test/Common.Tests/Utilities/DisposableList.cs
diff --git a/src/Servers/IIS/test/Common.Tests/Utilities/TestConnections.cs b/src/Servers/IIS/IIS/test/Common.Tests/Utilities/TestConnections.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.Tests/Utilities/TestConnections.cs
rename to src/Servers/IIS/IIS/test/Common.Tests/Utilities/TestConnections.cs
diff --git a/src/Servers/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs b/src/Servers/IIS/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs
similarity index 100%
rename from src/Servers/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs
rename to src/Servers/IIS/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs
diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
rename to src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs
rename to src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs
diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
similarity index 100%
rename from src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
rename to src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs
rename to src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs
diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs
rename to src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs
diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
similarity index 100%
rename from src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
rename to src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
diff --git a/src/Servers/IIS/test/IIS.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.FunctionalTests/DeployerSelector.cs
rename to src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs
diff --git a/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
similarity index 100%
rename from src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
rename to src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
diff --git a/src/Servers/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
diff --git a/src/Servers/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
similarity index 90%
rename from src/Servers/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
index a054225ac5..b51d293845 100644
--- a/src/Servers/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
@@ -17,7 +17,7 @@ namespace IIS.FunctionalTests
         [RequiresIIS(IISCapability.TracingModule)]
         public void CheckMofFile()
         {
-            var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "src", "aspnetcoremodulev2", "aspnetcore", "ancm.mof");
+            var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "aspnetcoremodulev2", "aspnetcore", "ancm.mof");
             var process = Process.Start("mofcomp.exe", path);
             process.WaitForExit();
             Assert.Equal(0, process.ExitCode);
diff --git a/src/Servers/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
rename to src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs
diff --git a/src/Servers/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
rename to src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
diff --git a/src/Servers/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/AppHostConfig/HostableWebCore.config b/src/Servers/IIS/IIS/test/IIS.Tests/AppHostConfig/HostableWebCore.config
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/AppHostConfig/HostableWebCore.config
rename to src/Servers/IIS/IIS/test/IIS.Tests/AppHostConfig/HostableWebCore.config
diff --git a/src/Servers/IIS/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/ClientDisconnectTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
similarity index 92%
rename from src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj
rename to src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
index e164287935..cfa37a08af 100644
--- a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\..\build\testsite.props" />
+
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <InProcessTestSite>true</InProcessTestSite>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/test/IIS.Tests/ResponseAbortTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/ResponseAbortTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/StrictTestServerTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/StrictTestServerTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/StrictTestServerTests.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/StrictTestServerTests.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/TestServerTest.cs b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/TestServerTest.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
diff --git a/src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs
similarity index 100%
rename from src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs
rename to src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/HttpsTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/HttpsTests.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/HttpsTests.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
rename to src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
diff --git a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
similarity index 95%
rename from src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
rename to src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
index e58313842f..6d2829d8f1 100644
--- a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\build\testsite.props" />
+  <Import Project="..\..\..\..\build\testsite.props" />
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/DummyServer.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/DummyServer.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/DummyServer.cs
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/DummyServer.cs
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
similarity index 94%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
index 3abf38c73c..01c9c06433 100644
--- a/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\build\testsite.props" />
+  <Import Project="..\..\..\..\build\testsite.props" />
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/Program.cs
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/web.config b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/web.config
similarity index 100%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/web.config
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/web.config
diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/wwwroot/static.txt
similarity index 100%
rename from src/Servers/IIS/test/testassets/InProcessWebSite/wwwroot/static.txt
rename to src/Servers/IIS/IIS/test/testassets/InProcessWebSite/wwwroot/static.txt
diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj
similarity index 88%
rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj
rename to src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj
index 81b924c89e..43c2b459fe 100644
--- a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\build\testsite.props" />
+  <Import Project="..\..\..\..\build\testsite.props" />
 
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
@@ -25,4 +25,4 @@
     <Reference Include="xunit.assert" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Program.cs
similarity index 99%
rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs
rename to src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Program.cs
index 90895237d2..c349510b26 100644
--- a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs
+++ b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Program.cs
@@ -42,4 +42,3 @@ namespace TestSite
         }
     }
 }
-
diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Startup.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs
rename to src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Startup.cs
diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt
similarity index 100%
rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt
rename to src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt
diff --git a/src/Servers/IIS/test/testassets/StressTestWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Program.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/StressTestWebSite/Program.cs
rename to src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Program.cs
diff --git a/src/Servers/IIS/test/testassets/StressTestWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/StressTestWebSite/Startup.cs
rename to src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs
diff --git a/src/Servers/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj
similarity index 92%
rename from src/Servers/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj
rename to src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj
index 578fd81a4f..934cfb2991 100644
--- a/src/Servers/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\build\testsite.props" />
+  <Import Project="..\..\..\..\build\testsite.props" />
 
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
diff --git a/src/Servers/IIS/test/testassets/TestTasks/InjectRequestHandler.cs b/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/TestTasks/InjectRequestHandler.cs
rename to src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs
diff --git a/src/Servers/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
similarity index 100%
rename from src/Servers/IIS/test/testassets/TestTasks/TestTasks.csproj
rename to src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
diff --git a/src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs b/src/Servers/IIS/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs
rename to src/Servers/IIS/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs
diff --git a/src/Servers/IIS/test/testassets/shared/WebSockets/Constants.cs b/src/Servers/IIS/IIS/test/testassets/shared/WebSockets/Constants.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/shared/WebSockets/Constants.cs
rename to src/Servers/IIS/IIS/test/testassets/shared/WebSockets/Constants.cs
diff --git a/src/Servers/IIS/test/testassets/shared/WebSockets/HandshakeHelpers.cs b/src/Servers/IIS/IIS/test/testassets/shared/WebSockets/HandshakeHelpers.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/shared/WebSockets/HandshakeHelpers.cs
rename to src/Servers/IIS/IIS/test/testassets/shared/WebSockets/HandshakeHelpers.cs
diff --git a/src/Servers/IIS/test/testassets/shared/WebSockets/TestStartup.cs b/src/Servers/IIS/IIS/test/testassets/shared/WebSockets/TestStartup.cs
similarity index 100%
rename from src/Servers/IIS/test/testassets/shared/WebSockets/TestStartup.cs
rename to src/Servers/IIS/IIS/test/testassets/shared/WebSockets/TestStartup.cs
diff --git a/src/Servers/IIS/IISIntegration.NoV1.sln b/src/Servers/IIS/IISIntegration.NoV1.sln
index 43cbf1fc02..b1384237d4 100644
--- a/src/Servers/IIS/IISIntegration.NoV1.sln
+++ b/src/Servers/IIS/IISIntegration.NoV1.sln
@@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 15.0.26730.03
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -16,16 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.Config = NuGet.Config
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473}
 	EndProjectSection
@@ -45,14 +31,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "IIS\test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "IIS\samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "IIS\src\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}
 		{55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85}
@@ -60,57 +46,77 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
 		{D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{06CA2C2B-83B0-4D83-905A-E0C74790009E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "IIS\benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}"
 	ProjectSection(ProjectDependencies) = postProject
 		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "IIS\test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{D182103F-8405-4647-B158-C36F598657EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{D182103F-8405-4647-B158-C36F598657EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "IIS\test\IIS.Tests\IIS.Tests.csproj", "{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{34135ED7-313D-4E68-860C-D6B51AA28523}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "IIS\test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests\IIS.Tests.csproj", "{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "IIS\test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "IIS\test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "IIS\test\testassets\TestTasks\TestTasks.csproj", "{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "IIS\test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{E685D546-FDCD-4A4C-9183-728C308A9A9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\testassets\TestTasks\TestTasks.csproj", "{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "IIS\test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{E685D546-FDCD-4A4C-9183-728C308A9A9E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "IIS\test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IIS", "IIS", "{8446E0D1-F421-4FD2-8B49-9183CCABD9D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTesting.IIS", "IntegrationTesting.IIS", "{E4A4ED67-4802-41B9-8CC4-319BA94217C5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MIcrosoft.AspNetCore.Server.IISIntegration.Tests", "test\IISIntegration.Tests\MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{ACCF17D6-CEA0-4008-8F36-70085163CAE7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IISIntegration", "IISIntegration", "{0E64513F-CA63-491E-8A53-91092AFFDA63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8FD4E4F7-C4A2-4934-88DA-67209AB12017}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8E03138E-100D-46C7-ADCE-DAC054135825}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{11AEFF49-1076-4D7B-9F9A-98AC68B5193A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{0A001897-51D2-4847-905C-313A0D0B69DA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2ABCC6B2-F14C-429A-AA45-996215DCCFBD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A365E3A9-FC5F-44CD-92B8-BE7BE50BECF1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F10CFC80-ED34-4B58-9A29-0E915A2FFFF3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{E93D0704-4E09-4266-82BA-29E14CADE422}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{98DA3CDD-571F-412F-9CAB-6543CE81EC30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "IISIntegration\test\Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{01452FA1-65C9-4A38-A544-E55E63B93357}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "AspNetCoreModuleV2\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "IISIntegration\samples\IISSample\IISSample.csproj", "{2C720685-FBE2-4450-9A01-CAA327D3485A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -122,18 +128,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.Build.0 = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.Build.0 = Release|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -182,16 +176,6 @@ Global
 		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU
 		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU
 		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64
@@ -254,16 +238,6 @@ Global
 		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64
 		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32
 		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64
@@ -286,18 +260,6 @@ Global
 		{D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU
 		{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x64.Build.0 = Debug|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x86.Build.0 = Debug|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x64.ActiveCfg = Release|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x64.Build.0 = Release|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x86.ActiveCfg = Release|Any CPU
-		{34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x86.Build.0 = Release|Any CPU
 		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -388,50 +350,90 @@ Global
 		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.Build.0 = Release|x64
 		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.ActiveCfg = Release|x86
 		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.Build.0 = Release|x86
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x64.Build.0 = Debug|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x86.Build.0 = Debug|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x64.ActiveCfg = Release|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x64.Build.0 = Release|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x86.ActiveCfg = Release|Any CPU
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x86.Build.0 = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x64.Build.0 = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x86.Build.0 = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x64.Build.0 = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x86.Build.0 = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x64.ActiveCfg = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x64.Build.0 = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x86.ActiveCfg = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x86.Build.0 = Release|Any CPU
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|Win32
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x64.Build.0 = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x86.Build.0 = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x64.ActiveCfg = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x64.Build.0 = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x86.ActiveCfg = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
-		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
+		{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {2ABCC6B2-F14C-429A-AA45-996215DCCFBD}
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {8FD4E4F7-C4A2-4934-88DA-67209AB12017}
+		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {8E03138E-100D-46C7-ADCE-DAC054135825}
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
 		{55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
 		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
-		{48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF}
+		{48F46909-E76A-4788-BCE1-E543C0E140FE} = {0A001897-51D2-4847-905C-313A0D0B69DA}
 		{D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
 		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
-		{CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 		{1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
-		{D182103F-8405-4647-B158-C36F598657EF} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{34135ED7-313D-4E68-860C-D6B51AA28523} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{582B07BC-73F4-4689-8557-B039298BD82C} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{D1EA5D99-28FD-4197-81DE-17098846B38B} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{E685D546-FDCD-4A4C-9183-728C308A9A9E} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
-		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
-		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
-		{ACCF17D6-CEA0-4008-8F36-70085163CAE7} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
+		{D182103F-8405-4647-B158-C36F598657EF} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{582B07BC-73F4-4689-8557-B039298BD82C} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{D1EA5D99-28FD-4197-81DE-17098846B38B} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{8FD4E4F7-C4A2-4934-88DA-67209AB12017} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{8E03138E-100D-46C7-ADCE-DAC054135825} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{11AEFF49-1076-4D7B-9F9A-98AC68B5193A} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{0A001897-51D2-4847-905C-313A0D0B69DA} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{2ABCC6B2-F14C-429A-AA45-996215DCCFBD} = {0E64513F-CA63-491E-8A53-91092AFFDA63}
+		{A365E3A9-FC5F-44CD-92B8-BE7BE50BECF1} = {0E64513F-CA63-491E-8A53-91092AFFDA63}
+		{F10CFC80-ED34-4B58-9A29-0E915A2FFFF3} = {0E64513F-CA63-491E-8A53-91092AFFDA63}
+		{E93D0704-4E09-4266-82BA-29E14CADE422} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{98DA3CDD-571F-412F-9CAB-6543CE81EC30} = {E4A4ED67-4802-41B9-8CC4-319BA94217C5}
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0} = {A365E3A9-FC5F-44CD-92B8-BE7BE50BECF1}
+		{01452FA1-65C9-4A38-A544-E55E63B93357} = {98DA3CDD-571F-412F-9CAB-6543CE81EC30}
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{2C720685-FBE2-4450-9A01-CAA327D3485A} = {F10CFC80-ED34-4B58-9A29-0E915A2FFFF3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln
index 4627298e8b..79e60796d0 100644
--- a/src/Servers/IIS/IISIntegration.sln
+++ b/src/Servers/IIS/IISIntegration.sln
@@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 15.0.26730.03
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -16,75 +11,118 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.Config = NuGet.Config
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{F54715C3-88D8-49E3-A291-C13570FE81FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552}
+		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}"
 	ProjectSection(SolutionItems) = preProject
 		build\applicationhost.config = build\applicationhost.config
 		build\applicationhost.iis.config = build\applicationhost.iis.config
-		build\dependencies.props = build\dependencies.props
+		build\assets.props = build\assets.props
+		build\Build.Settings = build\Build.Settings
+		build\Config.Definitions.Props = build\Config.Definitions.Props
+		build\Key.snk = build\Key.snk
+		build\launchSettings.json = build\launchSettings.json
 		build\native.targets = build\native.targets
 		build\repo.props = build\repo.props
+		build\repo.targets = build\repo.targets
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "IIS\test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "IIS\samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "IIS\src\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}
+		{55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85}
+		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
+		{D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{06CA2C2B-83B0-4D83-905A-E0C74790009E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{FF5339B2-071F-4881-B15B-F91BD1A01153}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{5180EB73-1100-4DBE-9563-94B0C183B0CA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "IIS\benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}"
+	ProjectSection(ProjectDependencies) = postProject
+		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "IIS\test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{D182103F-8405-4647-B158-C36F598657EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{F47351C2-66E7-478D-A728-05A33768830A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "IIS\test\IIS.Tests\IIS.Tests.csproj", "{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{73552B7B-BFBB-457D-B718-E0BF5C631358}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "IIS\test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "IIS\test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "IIS\test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "IIS\test\testassets\TestTasks\TestTasks.csproj", "{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{302F6BB2-AFEF-4A75-8B51-4A068607430E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "IIS\test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{E685D546-FDCD-4A4C-9183-728C308A9A9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{BB265F11-FB3F-45C6-A197-7F0468568C82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "IIS\test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{A112C374-B4CD-41CC-8D45-87E4357B7E22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "IIS\test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests\IIS.Tests.csproj", "{7E5185FD-58B6-4F31-8600-00BDC0AFB514}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IIS", "IIS", "{8446E0D1-F421-4FD2-8B49-9183CCABD9D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTesting.IIS", "IntegrationTesting.IIS", "{E4A4ED67-4802-41B9-8CC4-319BA94217C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IISIntegration", "IISIntegration", "{0E64513F-CA63-491E-8A53-91092AFFDA63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8FD4E4F7-C4A2-4934-88DA-67209AB12017}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8E03138E-100D-46C7-ADCE-DAC054135825}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{11AEFF49-1076-4D7B-9F9A-98AC68B5193A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{0A001897-51D2-4847-905C-313A0D0B69DA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2ABCC6B2-F14C-429A-AA45-996215DCCFBD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A365E3A9-FC5F-44CD-92B8-BE7BE50BECF1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F10CFC80-ED34-4B58-9A29-0E915A2FFFF3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{E93D0704-4E09-4266-82BA-29E14CADE422}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{98DA3CDD-571F-412F-9CAB-6543CE81EC30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "IISIntegration\test\Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{01452FA1-65C9-4A38-A544-E55E63B93357}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "AspNetCoreModuleV2\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "IISIntegration\samples\IISSample\IISSample.csproj", "{2C720685-FBE2-4450-9A01-CAA327D3485A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{341B6CBA-34BF-46CE-B851-8350D4FD925A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -96,18 +134,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.Build.0 = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.ActiveCfg = Release|Any CPU
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.Build.0 = Release|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -120,46 +146,42 @@ Global
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU
 		{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|Any CPU
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.ActiveCfg = Debug|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.Build.0 = Debug|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.ActiveCfg = Debug|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.Build.0 = Debug|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|Any CPU.ActiveCfg = Release|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.ActiveCfg = Release|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.Build.0 = Release|x64
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.ActiveCfg = Release|x86
-		{F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.Build.0 = Release|x86
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.ActiveCfg = Debug|x64
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Debug|x64
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.ActiveCfg = Debug|Win32
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.Build.0 = Debug|Win32
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|x64
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|x64
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.ActiveCfg = Release|Win32
-		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.Build.0 = Release|Win32
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x64.ActiveCfg = Debug|x64
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x64.Build.0 = Debug|x64
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x86.ActiveCfg = Debug|x86
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Debug|x86.Build.0 = Debug|x86
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|Any CPU.ActiveCfg = Release|x86
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x64.ActiveCfg = Release|x64
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x64.Build.0 = Release|x64
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x86.ActiveCfg = Release|x86
-		{FF5339B2-071F-4881-B15B-F91BD1A01153}.Release|x86.Build.0 = Release|x86
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.Build.0 = Debug|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.Build.0 = Release|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.Build.0 = Release|Any CPU
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|Any CPU.Build.0 = Debug|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.ActiveCfg = Debug|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.Build.0 = Debug|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.ActiveCfg = Debug|x86
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.Build.0 = Debug|x86
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.ActiveCfg = Release|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.Build.0 = Release|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.ActiveCfg = Release|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.ActiveCfg = Release|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU
+		{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64
 		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64
@@ -190,6 +212,18 @@ Global
 		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64
 		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32
 		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.Build.0 = Debug|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.Build.0 = Release|Any CPU
 		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64
 		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64
@@ -220,42 +254,132 @@ Global
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32
-		{F47351C2-66E7-478D-A728-05A33768830A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Debug|x64.Build.0 = Debug|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Release|x64.ActiveCfg = Release|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Release|x64.Build.0 = Release|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Release|x86.ActiveCfg = Release|Any CPU
-		{F47351C2-66E7-478D-A728-05A33768830A}.Release|x86.Build.0 = Release|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x64.Build.0 = Debug|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Debug|x86.Build.0 = Debug|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x64.ActiveCfg = Release|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x64.Build.0 = Release|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x86.ActiveCfg = Release|Any CPU
-		{73552B7B-BFBB-457D-B718-E0BF5C631358}.Release|x86.Build.0 = Release|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x64.Build.0 = Debug|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Debug|x86.Build.0 = Debug|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x64.ActiveCfg = Release|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x64.Build.0 = Release|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x86.ActiveCfg = Release|Any CPU
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26}.Release|x86.Build.0 = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.Build.0 = Debug|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.Build.0 = Release|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.Build.0 = Release|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x64.Build.0 = Debug|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x86.Build.0 = Debug|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.ActiveCfg = Release|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.Build.0 = Release|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.ActiveCfg = Release|Any CPU
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.Build.0 = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.Build.0 = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.Build.0 = Debug|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.ActiveCfg = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.Build.0 = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.ActiveCfg = Release|Any CPU
+		{582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.Build.0 = Release|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x64.Build.0 = Debug|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x86.Build.0 = Debug|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x64.ActiveCfg = Release|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x64.Build.0 = Release|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.Build.0 = Release|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x64.Build.0 = Debug|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x86.Build.0 = Debug|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x64.ActiveCfg = Release|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x64.Build.0 = Release|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.Build.0 = Release|Any CPU
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.ActiveCfg = Debug|x64
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.Build.0 = Debug|x64
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.ActiveCfg = Debug|x86
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.Build.0 = Debug|x86
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|Any CPU.ActiveCfg = Release|x86
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.ActiveCfg = Release|x64
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.Build.0 = Release|x64
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.ActiveCfg = Release|x86
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.Build.0 = Release|x86
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.ActiveCfg = Debug|x64
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.Build.0 = Debug|x64
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.ActiveCfg = Debug|x86
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.Build.0 = Debug|x86
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|Any CPU.ActiveCfg = Release|x86
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.ActiveCfg = Release|x64
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.Build.0 = Release|x64
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.ActiveCfg = Release|x86
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.Build.0 = Release|x86
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.ActiveCfg = Debug|x64
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.Build.0 = Debug|x64
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.ActiveCfg = Debug|x86
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.Build.0 = Debug|x86
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|Any CPU.ActiveCfg = Release|x86
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.ActiveCfg = Release|x64
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.Build.0 = Release|x64
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.ActiveCfg = Release|x86
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.Build.0 = Release|x86
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x64.Build.0 = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x86.Build.0 = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x64.Build.0 = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x86.Build.0 = Debug|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x64.ActiveCfg = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x64.Build.0 = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x86.ActiveCfg = Release|Any CPU
+		{01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x86.Build.0 = Release|Any CPU
 		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64
 		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64
@@ -266,106 +390,78 @@ Global
 		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64
 		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32
 		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x64.Build.0 = Debug|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Debug|x86.Build.0 = Debug|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x64.ActiveCfg = Release|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x64.Build.0 = Release|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x86.ActiveCfg = Release|Any CPU
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E}.Release|x86.Build.0 = Release|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x64.Build.0 = Debug|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Debug|x86.Build.0 = Debug|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x64.ActiveCfg = Release|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x64.Build.0 = Release|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x86.ActiveCfg = Release|Any CPU
-		{BB265F11-FB3F-45C6-A197-7F0468568C82}.Release|x86.Build.0 = Release|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x64.Build.0 = Debug|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Debug|x86.Build.0 = Debug|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x64.ActiveCfg = Release|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x64.Build.0 = Release|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x86.ActiveCfg = Release|Any CPU
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22}.Release|x86.Build.0 = Release|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x64.Build.0 = Debug|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Debug|x86.Build.0 = Debug|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x64.ActiveCfg = Release|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x64.Build.0 = Release|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x86.ActiveCfg = Release|Any CPU
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514}.Release|x86.Build.0 = Release|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Debug|x86.Build.0 = Debug|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x64.Build.0 = Release|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4}.Release|x86.Build.0 = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x64.Build.0 = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x86.Build.0 = Debug|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x64.ActiveCfg = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x64.Build.0 = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x86.ActiveCfg = Release|Any CPU
+		{2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x86.Build.0 = Release|Any CPU
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.ActiveCfg = Debug|x64
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Debug|x64
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.ActiveCfg = Debug|Win32
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.Build.0 = Debug|Win32
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|x64
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|x64
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.ActiveCfg = Release|Win32
+		{439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.Build.0 = Release|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
-		{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{F54715C3-88D8-49E3-A291-C13570FE81FC} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
-		{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {16E521CE-77F1-4B1C-A183-520A41C4F372}
-		{439824F9-1455-4CC4-BD79-B44FA0A16552} = {16E521CE-77F1-4B1C-A183-520A41C4F372}
-		{FF5339B2-071F-4881-B15B-F91BD1A01153} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {5180EB73-1100-4DBE-9563-94B0C183B0CA}
-		{5180EB73-1100-4DBE-9563-94B0C183B0CA} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{55494E58-E061-4C4C-A0A8-837008E72F85} = {5180EB73-1100-4DBE-9563-94B0C183B0CA}
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {5180EB73-1100-4DBE-9563-94B0C183B0CA}
-		{D57EA297-6DC2-4BC0-8C91-334863327863} = {5180EB73-1100-4DBE-9563-94B0C183B0CA}
-		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {5180EB73-1100-4DBE-9563-94B0C183B0CA}
-		{1533E271-F61B-441B-8B74-59FB61DF0552} = {5180EB73-1100-4DBE-9563-94B0C183B0CA}
-		{F47351C2-66E7-478D-A728-05A33768830A} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{73552B7B-BFBB-457D-B718-E0BF5C631358} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
-		{DCF44144-8018-4F25-A5B8-EDE5ABAEDF26} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{302F6BB2-AFEF-4A75-8B51-4A068607430E} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{BB265F11-FB3F-45C6-A197-7F0468568C82} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{A112C374-B4CD-41CC-8D45-87E4357B7E22} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{7E5185FD-58B6-4F31-8600-00BDC0AFB514} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
-		{2C2F3C65-6F8B-4C49-9A7F-5E21DE059CE4} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
+		{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {2ABCC6B2-F14C-429A-AA45-996215DCCFBD}
+		{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {8FD4E4F7-C4A2-4934-88DA-67209AB12017}
+		{46A8612B-418B-4D70-B3A7-A21DD0627473} = {8E03138E-100D-46C7-ADCE-DAC054135825}
+		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{48F46909-E76A-4788-BCE1-E543C0E140FE} = {0A001897-51D2-4847-905C-313A0D0B69DA}
+		{D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{D182103F-8405-4647-B158-C36F598657EF} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{D17B7B35-5361-4A50-B499-E03E5C3CC095} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{582B07BC-73F4-4689-8557-B039298BD82C} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{D1EA5D99-28FD-4197-81DE-17098846B38B} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{E685D546-FDCD-4A4C-9183-728C308A9A9E} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE} = {E93D0704-4E09-4266-82BA-29E14CADE422}
+		{8FD4E4F7-C4A2-4934-88DA-67209AB12017} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{8E03138E-100D-46C7-ADCE-DAC054135825} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{11AEFF49-1076-4D7B-9F9A-98AC68B5193A} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{0A001897-51D2-4847-905C-313A0D0B69DA} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3}
+		{2ABCC6B2-F14C-429A-AA45-996215DCCFBD} = {0E64513F-CA63-491E-8A53-91092AFFDA63}
+		{A365E3A9-FC5F-44CD-92B8-BE7BE50BECF1} = {0E64513F-CA63-491E-8A53-91092AFFDA63}
+		{F10CFC80-ED34-4B58-9A29-0E915A2FFFF3} = {0E64513F-CA63-491E-8A53-91092AFFDA63}
+		{E93D0704-4E09-4266-82BA-29E14CADE422} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A}
+		{98DA3CDD-571F-412F-9CAB-6543CE81EC30} = {E4A4ED67-4802-41B9-8CC4-319BA94217C5}
+		{BACB6E5C-A4DB-4513-B9DD-8FEC752585F0} = {A365E3A9-FC5F-44CD-92B8-BE7BE50BECF1}
+		{01452FA1-65C9-4A38-A544-E55E63B93357} = {98DA3CDD-571F-412F-9CAB-6543CE81EC30}
+		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{2C720685-FBE2-4450-9A01-CAA327D3485A} = {F10CFC80-ED34-4B58-9A29-0E915A2FFFF3}
+		{439824F9-1455-4CC4-BD79-B44FA0A16552} = {341B6CBA-34BF-46CE-B851-8350D4FD925A}
+		{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {341B6CBA-34BF-46CE-B851-8350D4FD925A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/src/Servers/IIS/NuGetPackageVerifier.json b/src/Servers/IIS/IISIntegration/NuGetPackageVerifier.json
similarity index 100%
rename from src/Servers/IIS/NuGetPackageVerifier.json
rename to src/Servers/IIS/IISIntegration/NuGetPackageVerifier.json
diff --git a/src/Servers/IIS/NuGetPackageVerifier.xplat.json b/src/Servers/IIS/IISIntegration/NuGetPackageVerifier.xplat.json
similarity index 100%
rename from src/Servers/IIS/NuGetPackageVerifier.xplat.json
rename to src/Servers/IIS/IISIntegration/NuGetPackageVerifier.xplat.json
diff --git a/src/Servers/IIS/samples/IISSample/IISSample.csproj b/src/Servers/IIS/IISIntegration/samples/IISSample/IISSample.csproj
similarity index 100%
rename from src/Servers/IIS/samples/IISSample/IISSample.csproj
rename to src/Servers/IIS/IISIntegration/samples/IISSample/IISSample.csproj
diff --git a/src/Servers/IIS/samples/IISSample/Startup.cs b/src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs
similarity index 100%
rename from src/Servers/IIS/samples/IISSample/Startup.cs
rename to src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs
diff --git a/src/Servers/IIS/samples/IISSample/web.config b/src/Servers/IIS/IISIntegration/samples/IISSample/web.config
similarity index 100%
rename from src/Servers/IIS/samples/IISSample/web.config
rename to src/Servers/IIS/IISIntegration/samples/IISSample/web.config
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs b/src/Servers/IIS/IISIntegration/src/AuthenticationHandler.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs
rename to src/Servers/IIS/IISIntegration/src/AuthenticationHandler.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs b/src/Servers/IIS/IISIntegration/src/ForwardedTlsConnectionFeature.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs
rename to src/Servers/IIS/IISIntegration/src/ForwardedTlsConnectionFeature.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs b/src/Servers/IIS/IISIntegration/src/IISDefaults.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs
rename to src/Servers/IIS/IISIntegration/src/IISDefaults.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs b/src/Servers/IIS/IISIntegration/src/IISHostingStartup.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs
rename to src/Servers/IIS/IISIntegration/src/IISHostingStartup.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs b/src/Servers/IIS/IISIntegration/src/IISMiddleware.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs
rename to src/Servers/IIS/IISIntegration/src/IISMiddleware.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs b/src/Servers/IIS/IISIntegration/src/IISOptions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs
rename to src/Servers/IIS/IISIntegration/src/IISOptions.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs b/src/Servers/IIS/IISIntegration/src/IISSetupFilter.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs
rename to src/Servers/IIS/IISIntegration/src/IISSetupFilter.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
rename to src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.targets
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets
rename to src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.targets
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/Servers/IIS/IISIntegration/src/NativeMethods.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs
rename to src/Servers/IIS/IISIntegration/src/NativeMethods.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/Servers/IIS/IISIntegration/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
rename to src/Servers/IIS/IISIntegration/src/Properties/AssemblyInfo.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/Servers/IIS/IISIntegration/src/WebHostBuilderIISExtensions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
rename to src/Servers/IIS/IISIntegration/src/WebHostBuilderIISExtensions.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json b/src/Servers/IIS/IISIntegration/src/baseline.netcore.json
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json
rename to src/Servers/IIS/IISIntegration/src/baseline.netcore.json
diff --git a/src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs b/src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs
rename to src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs
diff --git a/src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs b/src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs
similarity index 100%
rename from src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs
rename to src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs
diff --git a/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
new file mode 100644
index 0000000000..6567415b2f
--- /dev/null
+++ b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/ApplicationDeployerFactory.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/ApplicationDeployerFactory.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config b/src/Servers/IIS/IntegrationTesting.IIS/src/Http.config
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config
rename to src/Servers/IIS/IntegrationTesting.IIS/src/Http.config
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameterExtensions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameterExtensions.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameters.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameters.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/LoggingHandler.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/LoggingHandler.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
similarity index 90%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
rename to src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index 6c33ddf82b..5078985cc8 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -27,9 +27,9 @@
   </Target>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
   </ItemGroup>
 
   <Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="'$(OS)' == 'Windows_NT'">
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/ProcessTracker.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/ProcessTracker.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/WebConfigHelpers.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/WebConfigHelpers.cs
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/XElementExtensions.cs
similarity index 100%
rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs
rename to src/Servers/IIS/IntegrationTesting.IIS/src/XElementExtensions.cs
diff --git a/src/Servers/IIS/ResolveIisReferences.targets b/src/Servers/IIS/ResolveIisReferences.targets
index 11b7c2a16c..ab9d2021cb 100644
--- a/src/Servers/IIS/ResolveIisReferences.targets
+++ b/src/Servers/IIS/ResolveIisReferences.targets
@@ -10,14 +10,14 @@ with the right MSBuild incantations to get output copied to the right place.
     <When Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">
       <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModule'))' == 'true' ">
         <Reference Remove="AspNetCoreModule" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
+        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
       </ItemGroup>
 
       <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' ">
         <Reference Remove="AspNetCoreModuleV2" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
+        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
+        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
+        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
       </ItemGroup>
 
       <ItemGroup Condition="@(NativeProjectReference->Count()) != 0">
diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props
index 71165b1b06..f05a8f5251 100644
--- a/src/Servers/IIS/build/assets.props
+++ b/src/Servers/IIS/build/assets.props
@@ -15,10 +15,10 @@
           NativeAsset="aspnetcore"
           PropetyName="AspNetCoreModuleV1Shim"
           BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb"
         />
         <Components
           VCPlatform="Win32"
@@ -27,10 +27,10 @@
           NativeAsset="aspnetcore"
           PropetyName="AspNetCoreModuleV1Shim"
           BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb"
         />
         <Components
           VCPlatform="x64"
@@ -39,10 +39,10 @@
           NativeAsset="aspnetcorev2"
           PropetyName="AspNetCoreModuleV2Shim"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb"
         />
         <Components
           VCPlatform="Win32"
@@ -51,10 +51,10 @@
           NativeAsset="aspnetcorev2"
           PropetyName="AspNetCoreModuleV2Shim"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb"
         />
         <Components
           VCPlatform="x64"
@@ -63,10 +63,10 @@
           NativeAsset="aspnetcorev2_inprocess"
           PropetyName="AspNetCoreModuleV2InProcessHandler"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb"
         />
         <Components
           VCPlatform="Win32"
@@ -75,36 +75,36 @@
           NativeAsset="aspnetcorev2_inprocess"
           PropetyName="AspNetCoreModuleV2InProcessHandler"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.pdb"
         />
         <Components
           VCPlatform="x64"
           Platform="x64"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           NativeAsset="aspnetcorev2_outofprocess"
           BaseOutputPath="AspNetCoreModuleV2"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb"
         />
         <Components
           VCPlatform="Win32"
           Platform="x86"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           NativeAsset="aspnetcorev2_outofprocess"
           BaseOutputPath="AspNetCoreModuleV2"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb"
         />
 
        <ShimComponents
@@ -114,10 +114,10 @@
           NativeAsset="aspnetcore"
           PropetyName="AspNetCoreModuleV1Shim"
           BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb"
         />
         <ShimComponents
           VCPlatform="Win32"
@@ -126,10 +126,10 @@
           NativeAsset="aspnetcore"
           PropetyName="AspNetCoreModuleV1Shim"
           BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb"
         />
         <ShimComponents
           VCPlatform="x64"
@@ -138,10 +138,10 @@
           NativeAsset="aspnetcorev2"
           PropetyName="AspNetCoreModuleV2Shim"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb"
         />
         <ShimComponents
           VCPlatform="Win32"
@@ -150,37 +150,37 @@
           NativeAsset="aspnetcorev2"
           PropetyName="AspNetCoreModuleV2Shim"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb"
         />
         <ShimComponents
           VCPlatform="x64"
           Platform="x64"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           NativeAsset="aspnetcorev2_outofprocess"
           BaseOutputPath="AspNetCoreModuleV2"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb"
           HandlerPath="2.0.0"
         />
         <ShimComponents
           VCPlatform="Win32"
           Platform="x86"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           NativeAsset="aspnetcorev2_outofprocess"
           BaseOutputPath="AspNetCoreModuleV2"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb"
           HandlerPath="2.0.0"
         />
 
@@ -191,10 +191,10 @@
           NativeAsset="aspnetcorev2_inprocess"
           PropetyName="AspNetCoreModuleV2InProcessHandler"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb"
         />
         <InProcessComponents
           VCPlatform="Win32"
@@ -203,10 +203,10 @@
           NativeAsset="aspnetcorev2_inprocess"
           PropetyName="AspNetCoreModuleV2InProcessHandler"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_inprocess.pdb"
         />
 
        <RunShimComponents
@@ -216,10 +216,10 @@
           NativeAsset="aspnetcore"
           PropetyName="AspNetCoreModuleV1Shim"
           BaseOutputPath="AspNetCoreModuleV1"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.pdb"
         />
         <RunShimComponents
           VCPlatform="$(NativeVCPlatform)"
@@ -228,23 +228,23 @@
           NativeAsset="aspnetcorev2"
           PropetyName="AspNetCoreModuleV2Shim"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.pdb"
         />
         <RunShimComponents
           VCPlatform="$(NativeVCPlatform)"
           Platform="$(NativePlatform)"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           NativeAsset="aspnetcorev2_outofprocess"
           BaseOutputPath="AspNetCoreModuleV2"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.pdb"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.pdb"
         />
 
        <RunInProcessComponents
@@ -254,18 +254,18 @@
           NativeAsset="aspnetcorev2_inprocess"
           PropetyName="AspNetCoreModuleV2InProcessHandler"
           BaseOutputPath="AspNetCoreModuleV2"
-          ProjectDirectory="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler"
-          DllLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll"
-          Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
-          PdbLocation="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.pdb"
+          ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler"
+          DllLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll"
+          Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"
+          PdbLocation="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.pdb"
         />
 
     </ItemGroup>
     <PropertyGroup>
 
-       <AspNetCoreModuleV1ShimDll>$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll</AspNetCoreModuleV1ShimDll>
-       <AspNetCoreModuleV2ShimDll>$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll</AspNetCoreModuleV2ShimDll>
-       <AspNetCoreModuleV2InProcessHandlerDll>$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll</AspNetCoreModuleV2InProcessHandlerDll>
-       <AspNetCoreModuleV2OutOfProcessHandlerDll>$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll</AspNetCoreModuleV2OutOfProcessHandlerDll>
+       <AspNetCoreModuleV1ShimDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll</AspNetCoreModuleV1ShimDll>
+       <AspNetCoreModuleV2ShimDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll</AspNetCoreModuleV2ShimDll>
+       <AspNetCoreModuleV2InProcessHandlerDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll</AspNetCoreModuleV2InProcessHandlerDll>
+       <AspNetCoreModuleV2OutOfProcessHandlerDll>$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll</AspNetCoreModuleV2OutOfProcessHandlerDll>
     </PropertyGroup>
 </Project>
diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props
index cb0acadbf7..e859f7d25a 100644
--- a/src/Servers/IIS/build/testsite.props
+++ b/src/Servers/IIS/build/testsite.props
@@ -46,14 +46,14 @@
 
   <!-- Deps file injection-->
   <ItemGroup Condition="('$(InProcessTestSite)' == 'true') AND ('$(ReferenceTestTasks)' != 'false')">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\test\testassets\TestTasks\TestTasks.csproj">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\IIS\test\testassets\TestTasks\TestTasks.csproj">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
 
   <Target Name="PrepareInjectionApp" Condition="'$(InProcessTestSite)' == 'true'">
     <PropertyGroup>
-      <InjectDepsAssembly>$(MSBuildThisFileDirectory)..\test\testassets\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks</InjectDepsAssembly>
+      <InjectDepsAssembly>$(MSBuildThisFileDirectory)..\IIS\test\testassets\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks</InjectDepsAssembly>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
deleted file mode 100644
index 1649ef6927..0000000000
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
+++ /dev/null
@@ -1,42 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <PackageId>$(MSBuildProjectName)</PackageId>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <PackageTags>aspnetcore</PackageTags>
-    <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
-    <Pack>true</Pack>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <PackageDescription>ASP.NET Core Module</PackageDescription>
-    <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.pdb" PackagePath="contentFiles/any/any/x86" />
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" PackagePath="contentFiles/any/any/x64" />
-
-    <Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x86/2.0.0" />
-    <Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x86\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x86/2.0.0" />
-    <Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x64/2.0.0" />
-    <Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x64/2.0.0" />
-
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/" />
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\ancm.mof" PackagePath="/" />
-    <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props.in" PackagePath="build\" />
-    <Reference Include="AspNetCoreModuleV2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="_._" PackagePath="lib/$(TargetFramework)/" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <Target Name="CopyFilesToOutputDirectory" />
-  <Target Name="CoreCompile" DependsOnTargets="ResolveReferences" />
-  <Target Name="CreateManifestResourceNames" />
-</Project>
diff --git a/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj
deleted file mode 100644
index 85d670991c..0000000000
--- a/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/Servers/IIS/tools/certificate.ps1 b/src/Servers/IIS/tools/certificate.ps1
deleted file mode 100644
index 52c8817796..0000000000
--- a/src/Servers/IIS/tools/certificate.ps1
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-<##############################################################################
- Example
- 
- ###############################################################################
- # Create a new root certificate on "Cert:\LocalMachine\My" and export it to "Cert:\LocalMachine\Root"
- # FYI, you can do the same thing with one of the following commands:
- #   %sdxroot\tools\amd64\MakeCert.exe -r -pe -n "CN=ANCMTest_Root" -b 12/22/2013 -e 12/23/2020 -ss root -sr localmachine -len 2048 -a sha256
- #   $thumbPrint = (New-SelfSignedCertificate -DnsName "ANCMTest_Root", "ANCMTest_Roo3" -CertStoreLocation "cert:\LocalMachine\My").Thumbprint
- ###############################################################################
- $rootSubject = "ANCMTest_Root"
- $thumbPrint = .\certificate.ps1 -Command Create-SelfSignedCertificate -Subject $rootSubject
- .\certificate.ps1 -Command Export-CertificateTo -TargetThumbPrint $thumbPrint -TargetSSLStore "Cert:\LocalMachine\My" -ExportToSSLStore "Cert:\LocalMachine\Root"
- .\certificate.ps1 -Command Get-CertificateThumbPrint -Subject $rootSubject -TargetSSLStore "Cert:\LocalMachine\Root"
-  
- ###############################################################################
- # Create a new certificate setting issuer with the root certicate's subject name on "Cert:\LocalMachine\My" and export it to "Cert:\LocalMachine\Root"
- # FYI, you can do the same thing with one of the following commands:
- #   %sdxroot\tools\amd64\MakeCert.exe -pe -n "CN=ANCMTestWebServer" -b 12/22/2013 -e 12/23/2020  -eku 1.3.6.1.5.5.7.3.1 -is root -ir localmachine -in $rootSubject -len 2048 -ss my -sr localmachine -a sha256
- #   %sdxroot\tools\amd64\MakeCert.exe -pe -n "CN=ANCMTest_Client" -eku 1.3.6.1.5.5.7.3.2 -is root -ir localmachine -in ANCMTest_Root -ss my -sr currentuser -len 2048 -a sha256
- ###############################################################################
- $childSubject = "ANCMTest_Client"
- $thumbPrint2 = .\certificate.ps1 -Command Create-SelfSignedCertificate -Subject $childSubject -IssuerName $rootSubject
- ("Result: $thumbPrint2")
- .\certificate.ps1 -Command Export-CertificateTo -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\LocalMachine\My" -ExportToSSLStore "Cert:\CurrentUser\My"
-
- .\certificate.ps1 -Command Export-CertificateTo -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\LocalMachine\My" -ExportToSSLStore C:\gitroot\AspNetCoreModule\tools\test.pfx -PfxPassword test
-
-
- # Clean up
- .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\LocalMachine\My"
- .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\CurrentUser\Root"
- .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint -TargetSSLStore "Cert:\LocalMachine\My"
- .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint -TargetSSLStore "Cert:\LocalMachine\Root"
-
-###############################################################################>
-
-
-Param(
-    [parameter(Mandatory=$true , Position=0)]
-    [ValidateSet("Create-SelfSignedCertificate",
-                 "Delete-Certificate",
-                 "Export-CertificateTo",
-                 "Get-CertificateThumbPrint",
-                 "Get-CertificatePublicKey")]
-    [string]
-    $Command,
-
-    [parameter()]
-    [string]
-    $Subject,
-
-    [parameter()]
-    [string]
-    $IssuerName,
-
-    [Parameter()]
-    [string]
-    $FriendlyName = "", 
-
-    [Parameter()]
-    [string[]]
-    $AlternativeNames = "",
-
-    [Parameter()]
-    [string]
-    $TargetSSLStore = "",
-    
-    [Parameter()]
-    [string]
-    $ExportToSSLStore = "",
-    
-    [Parameter()]
-    [string]
-    $PfxPassword = "",
-
-    [Parameter()]
-    [string]
-    $TargetThumbPrint = ""
-)
-
-function Create-SelfSignedCertificate($_subject, $_friendlyName, $_alternativeNames, $_issuerName) {
-
-    if (-not $_subject)
-    {
-        return ("Error!!! _subject is required")
-    }
-
-    #
-    # $_issuerName should be set with the value subject and its certificate path will be root path
-    if (-not $_issuerName)
-    {
-        $_issuerName = $_subject
-    }
-
-    #
-    # Create $subjectDn and $issuerDn
-    $subjectDn = new-object -com "X509Enrollment.CX500DistinguishedName"
-    $subjectDn.Encode( "CN=" + $_subject, $subjectDn.X500NameFlags.X500NameFlags.XCN_CERT_NAME_STR_NONE)
-    $issuerDn = new-object -com "X509Enrollment.CX500DistinguishedName"
-    $issuerDn.Encode("CN=" + $_issuerName, $subjectDn.X500NameFlags.X500NameFlags.XCN_CERT_NAME_STR_NONE)
-    
-    #
-    # Create a new Private Key
-    $key = new-object -com "X509Enrollment.CX509PrivateKey"
-    $key.ProviderName =  "Microsoft Enhanced RSA and AES Cryptographic Provider"    
-    # XCN_AT_SIGNATURE, The key can be used for signing
-    $key.KeySpec = 2
-    $key.Length = 2048
-    # MachineContext 0: Current User, 1: Local Machine
-    $key.MachineContext = 1
-    $key.Create() 
-
-    # 
-    # Create a cert object with the newly created private key
-    $cert = new-object -com "X509Enrollment.CX509CertificateRequestCertificate"
-    $cert.InitializeFromPrivateKey(2, $key, "")
-    $cert.Subject = $subjectDn
-    $cert.Issuer = $issuerDn
-    $cert.NotBefore = (get-date).AddMinutes(-10)
-    $cert.NotAfter = $cert.NotBefore.AddYears(2)
-            
-    #Use Sha256
-    $hashAlgorithm = New-Object -ComObject X509Enrollment.CObjectId
-    $hashAlgorithm.InitializeFromAlgorithmName(1,0,0,"SHA256")
-    $cert.HashAlgorithm = $hashAlgorithm    
-	 
-    #
-    # Key usage should be set for non-root certificate
-    if ($_issuerName -ne $_subject)
-    {
-        #
-        # Extended key usage 
-        $clientAuthOid = New-Object -ComObject "X509Enrollment.CObjectId"
-        $clientAuthOid.InitializeFromValue("1.3.6.1.5.5.7.3.2")
-        $serverAuthOid = new-object -com "X509Enrollment.CObjectId"
-        $serverAuthOid.InitializeFromValue("1.3.6.1.5.5.7.3.1")
-        $ekuOids = new-object -com "X509Enrollment.CObjectIds.1"
-        $ekuOids.add($clientAuthOid)
-        $ekuOids.add($serverAuthOid)
-        $ekuExt = new-object -com "X509Enrollment.CX509ExtensionEnhancedKeyUsage"
-        $ekuExt.InitializeEncode($ekuOids)
-        $cert.X509Extensions.Add($ekuext)
-    	
-        #
-        #Set Key usage
-        $keyUsage = New-Object -com "X509Enrollment.cx509extensionkeyusage"
-        # XCN_CERT_KEY_ENCIPHERMENT_KEY_USAGE
-        $flags = 0x20
-        # XCN_CERT_DIGITAL_SIGNATURE_KEY_USAGE
-        $flags = $flags -bor 0x80
-        $keyUsage.InitializeEncode($flags)
-        $cert.X509Extensions.Add($keyUsage)
-    }
-        
-    #
-    # Subject alternative names
-    if ($_alternativeNames -ne $null) {
-        $names =  new-object -com "X509Enrollment.CAlternativeNames"
-        $altNames = new-object -com "X509Enrollment.CX509ExtensionAlternativeNames"
-        foreach ($n in $_alternativeNames) {
-            $name = new-object -com "X509Enrollment.CAlternativeName"
-            # Dns Alternative Name
-            $name.InitializeFromString(3, $n)
-            $names.Add($name)
-        }
-        $altNames.InitializeEncode($names)
-        $cert.X509Extensions.Add($altNames)
-    }
-
-    $cert.Encode()
-
-    #$locator = $(New-Object "System.Guid").ToString()
-    $locator = [guid]::NewGuid().ToString()
-    $enrollment = new-object -com "X509Enrollment.CX509Enrollment"    
-    $enrollment.CertificateFriendlyName = $locator        
-    $enrollment.InitializeFromRequest($cert)
-    $certdata = $enrollment.CreateRequest(0)
-    $enrollment.InstallResponse(2, $certdata, 0, "")
-
-    # Wait for certificate to be populated
-    $end = $(Get-Date).AddSeconds(1)
-    do {
-        $Certificates = Get-ChildItem Cert:\LocalMachine\My
-        foreach ($item in $Certificates)
-        {
-            if ($item.FriendlyName -eq $locator)
-            {
-                $CACertificate = $item
-            }
-        }
-    } while ($CACertificate -eq $null -and $(Get-Date) -lt $end)
-
-    $thumbPrint = ""
-    if ($CACertificate -and $CACertificate.Thumbprint)
-    {
-        $thumbPrint = $CACertificate.Thumbprint.Trim()
-    }
-    return $thumbPrint
-}
-
-function Delete-Certificate($_targetThumbPrint, $_targetSSLStore = $TargetSSLStore) {
-
-    if (-not $_targetThumbPrint)
-    {
-        return ("Error!!! _targetThumbPrint is required")
-    }
-
-    if (Test-Path "$_targetSSLStore\$_targetThumbPrint")
-    {
-        Remove-Item "$_targetSSLStore\$_targetThumbPrint" -Force -Confirm:$false
-    }
-
-    if (Test-Path "$_targetSSLStore\$_targetThumbPrint")
-    {
-        return ("Error!!! Failed to delete a certificate of $_targetThumbPrint")
-    }
-}
-
-function Export-CertificateTo($_targetThumbPrint, $_exportToSSLStore, $_password)
-{
-    if (-not $_targetThumbPrint)
-    {
-        return ("Error!!! _targetThumbPrint is required")
-    }
-
-    if (-not (Test-Path "$TargetSSLStore\$_targetThumbPrint"))
-    {
-        return ("Error!!! Export failed. Can't find target certificate: $TargetSSLStore\$_targetThumbPrint")
-    }
-        
-    $cert = Get-Item "$TargetSSLStore\$_targetThumbPrint"
-    $tempExportFile = "$env:temp\_tempCertificate.cer"
-    if (Test-Path $tempExportFile)
-    {
-        Remove-Item $tempExportFile -Force -Confirm:$false
-    }
-    
-    $isThisWin7 = $false
-    $exportToSSLStoreName = $null
-    $exportToSSLStoreLocation = $null
-    $targetSSLStoreName = $null
-    $targetSSLStoreLocation = $null
-    
-    if ((Get-Command Export-Certificate 2> out-null) -eq $null)
-    {
-        $isThisWin7 = $true
-    }
-    
-    # if _exportToSSLStore points to a .pfx file
-    if ($exportToSSLStore.ToLower().EndsWith(".pfx"))
-    {
-        if (-not $_password)
-        {
-            return ("Error!!! _password is required")
-        }
-
-        if ($isThisWin7)
-        {  
-            if ($TargetSSLStore.ToLower().Contains("my"))
-            {
-                $targetSSLStoreName = "My"
-            }
-            elseif ($_exportToSSLStore.ToLower().Contains("root"))
-            {
-                $targetSSLStoreName = "Root"
-            }
-            else
-            {
-                throw ("Unsupported store name " + $TargetSSLStore)
-            }
-            if ($TargetSSLStore.ToLower().Contains("localmachine"))
-            {
-                $targetSSLStoreLocation = "LocalMachine"
-            }
-            else
-            {
-                throw ("Unsupported store location name " + $TargetSSLStore)
-            }
-
-            &certutil.exe @('-exportpfx', '-p', $_password, $targetSSLStoreName, $_targetThumbPrint, $_exportToSSLStore) | out-null
-            
-            if ( Test-Path $_exportToSSLStore )
-            {
-                # Succeeded to export to .pfx file
-                return 
-            }
-            else
-            {
-                return ("Error!!! Can't export $TargetSSLStore\$_targetThumbPrint to $tempExportFile")
-            }
-        }
-        else
-        {
-            $securedPassword = ConvertTo-SecureString -String $_password -Force –AsPlainText 
-            $exportedPfxFile = Export-PfxCertificate -FilePath $_exportToSSLStore -Cert $TargetSSLStore\$_targetThumbPrint -Password $securedPassword
-            if ( ($exportedPfxFile -ne $null) -and (Test-Path $exportedPfxFile.FullName) )
-            {
-                # Succeeded to export to .pfx file
-                return 
-            }
-            else
-            {
-                return ("Error!!! Can't export $TargetSSLStore\$_targetThumbPrint to $tempExportFile")
-            }
-        }
-    }
-
-    if ($isThisWin7)
-    {
-        # Initialize variables for Win7
-        if ($_exportToSSLStore.ToLower().Contains("my"))
-        {
-            $exportToSSLStoreName = [System.Security.Cryptography.X509Certificates.StoreName]::My
-        }
-        elseif ($_exportToSSLStore.ToLower().Contains("root"))
-        {
-            $exportToSSLStoreName = [System.Security.Cryptography.X509Certificates.StoreName]::Root
-        }
-        else
-        {
-            throw ("Unsupported store name " + $_exportToSSLStore)
-        }
-        if ($_exportToSSLStore.ToLower().Contains("localmachine"))
-        {
-            $exportToSSLStoreLocation = [System.Security.Cryptography.X509Certificates.StoreLocation]::LocalMachine
-        }
-        elseif ($_exportToSSLStore.ToLower().Contains("currentuser"))
-        {
-            $exportToSSLStoreLocation = [System.Security.Cryptography.X509Certificates.StoreLocation]::CurrentUser
-        }
-        else
-        {
-            throw ("Unsupported store location name " + $_exportToSSLStore)
-        }
-
-        # Export-Certificate is not available. 
-        $isThisWin7 = $true
-        $certificate = Get-Item "$TargetSSLStore\$_targetThumbPrint"
-        $base64certificate = @"
------BEGIN CERTIFICATE-----
-$([Convert]::ToBase64String($certificate.Export('Cert'), [System.Base64FormattingOptions]::InsertLineBreaks)))
------END CERTIFICATE-----
-"@
-        Set-Content -Path $tempExportFile -Value $base64certificate | Out-Null
-    }
-    else 
-    {
-        Export-Certificate -Cert $cert -FilePath $tempExportFile | Out-Null
-        if (-not (Test-Path $tempExportFile))
-        {
-            return ("Error!!! Can't export $TargetSSLStore\$_targetThumbPrint to $tempExportFile")
-        }
-    }
-
-    if ($isThisWin7)
-    {
-        [Reflection.Assembly]::Load("System.Security, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a") | Out-Null
-        $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($tempExportFile)
-        $store = New-Object System.Security.Cryptography.X509Certificates.X509Store($exportToSSLStoreName,$exportToSSLStoreLocation)
-        $store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite) | Out-Null
-        $store.Add($cert) | Out-Null
-    }
-    else
-    {
-        # clean up destination SSL store
-        Delete-Certificate $_targetThumbPrint $_exportToSSLStore
-        if (Test-Path "$_exportToSSLStore\$_targetThumbPrint")
-        {
-            return ("Error!!! Can't delete already existing one $_exportToSSLStore\$_targetThumbPrint")
-        }
-        Import-Certificate -CertStoreLocation $_exportToSSLStore -FilePath $tempExportFile | Out-Null
-    }
-
-    Sleep 3
-    if (-not (Test-Path "$_exportToSSLStore\$_targetThumbPrint"))
-    {
-        return ("Error!!! Can't copy $TargetSSLStore\$_targetThumbPrint to $_exportToSSLStore")
-    }
-}
-
-function Get-CertificateThumbPrint($_subject, $_issuerName, $_targetSSLStore)
-{
-    if (-not $_subject)
-    {
-        return ("Error!!! _subject is required")
-    }
-    if (-not $_targetSSLStore)
-    {
-        return ("Error!!! _targetSSLStore is required")
-    }
-
-    if (-not (Test-Path "$_targetSSLStore"))
-    {
-        return ("Error!!! Can't find target store")
-    }
-
-    $targetCertificate = $null
-    
-    $Certificates = Get-ChildItem $_targetSSLStore
-    foreach ($item in $Certificates)
-    {
-        $findItem = $false
-        # check subject name first
-        if ($item.Subject.ToLower() -eq "CN=$_subject".ToLower())
-        {            
-            $findItem = $true
-        }
-
-        # check issuerName as well
-        if ($_issuerName -and $item.Issuer.ToLower() -ne "CN=$_issuerName".ToLower())
-        {
-            $findItem = $false
-        }
-
-        if ($findItem)
-        {
-            $targetCertificate = $item
-            break
-        }
-    }
-    $result = ""
-    if ($targetCertificate)
-    {
-        $result = $targetCertificate.Thumbprint
-    }
-    else
-    {
-        ("Error!!! Can't find target certificate")
-    }
-    return $result
-}
-
-function Get-CertificatePublicKey($_targetThumbPrint)
-{
-    if (-not $_targetThumbPrint)
-    {
-        return ("Error!!! _targetThumbPrint is required")
-    }
-
-    if (-not (Test-Path "$TargetSSLStore\$_targetThumbPrint"))
-    {
-        return ("Error!!! Can't find target certificate")
-    }
-
-    $cert = Get-Item "$TargetSSLStore\$_targetThumbPrint"
-    $byteArray = $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Cert)
-    $publicKey = [System.Convert]::ToBase64String($byteArray).Trim()
-
-    return $publicKey
-}
-
-# Error handling and initializing default values
-if (-not $TargetSSLStore)
-{
-    $TargetSSLStore = "Cert:\LocalMachine\My"
-}
-else
-{
-    if ($Command -eq "Create-SelfSignedCertificate")
-    {
-        return ("Error!!! Create-SelfSignedCertificate should use default value for -TargetSSLStore if -Issuer is not provided")
-    }
-}
-
-if (-not $ExportToSSLStore)
-{
-    $ExportToSSLStore = "Cert:\LocalMachine\Root"
-}
-
-switch ($Command)
-{
-    "Create-SelfSignedCertificate"
-    {
-        return Create-SelfSignedCertificate $Subject $FriendlyName $AlternativeNames $IssuerName
-    }
-    "Delete-Certificate"
-    {
-        return Delete-Certificate $TargetThumbPrint
-    }
-    "Export-CertificateTo"
-    {
-        return Export-CertificateTo $TargetThumbPrint $ExportToSSLStore $PfxPassword
-    }
-    "Get-CertificateThumbPrint"
-    {
-        return Get-CertificateThumbPrint $Subject $IssuerName $TargetSSLStore
-    }
-    "Get-CertificatePublicKey"
-    {
-        return Get-CertificatePublicKey $TargetThumbPrint
-    }
-    default
-    {
-        throw "Unknown command"
-    }
-}
diff --git a/src/Servers/IIS/tools/httpsys.ps1 b/src/Servers/IIS/tools/httpsys.ps1
deleted file mode 100644
index af2254e96f..0000000000
--- a/src/Servers/IIS/tools/httpsys.ps1
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright (c) .NET Foundation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-
-##############################################################################
-# Example
-# $result = .\httpsys.ps1 -Command Get-SslBinding -IpAddress "0x00" -Port 46300
-# .\httpsys.ps1 -Command Add-SslBinding -IpAddress "0x00" -Port 46300 –Thumbprint $result.CertificateHash
-# .\httpsys.ps1 -Command Delete-SslBinding -IpAddress "0x00" -Port 46300
-##############################################################################
-
-Param (
-    [parameter(Mandatory=$true , Position=0)]
-    [ValidateSet("Add-SslBinding",
-                 "Delete-SslBinding",
-                 "Get-SslBinding")]
-    [string]
-    $Command,
-    
-    [parameter()]
-    [string]
-    $IpAddress,
-    
-    [parameter()]
-    [string]
-    $Port,
-
-    [parameter()]
-    [string]
-    $Thumbprint,
-
-    [parameter()]
-    [string]
-    $TargetSSLStore,
-
-    [parameter()]
-    [string]
-    $AppId,
-
-    [parameter()] 
-    [System.Net.IPEndPoint] 
-    $IpEndPoint
-    )
-
-
-# adjust parameter variables
-if (-not $IpEndPoint)
-{
-    if ($IpAddress -and $Port)
-    {
-        $IpEndPoint = New-Object "System.Net.IPEndPoint" -ArgumentList $IpAddress,$Port
-    }
-}
-
-if (-not $TargetSSLStore)
-{
-    $TargetSSLStore = "Cert:\LocalMachine\My"
-}
-
-$StoreName = ($TargetSSLStore.Split("\") | Select-Object -Last 1).Trim()
-
-$Certificate = Get-Item "$TargetSSLStore\$Thumbprint"
-
-if (-not $AppId)
-{
-    # Assign a random GUID for $AppId
-    $AppId = [guid]::NewGuid()
-}
-
-$cs = '
-namespace Microsoft.IIS.Administration.Setup {
-using System;  
-using System.Diagnostics;  
-using System.Diagnostics.CodeAnalysis;  
-using System.Net;  
-using System.Runtime.InteropServices;  
-using System.Security.Cryptography.X509Certificates;  
-using System.Text;  
-using System.ComponentModel;  
-
-    public class Http {           
-        public const int HTTP_INITIALIZE_CONFIG = 2;  
-        public const int HTTP_SERVICE_CONFIG_SSLCERT_INFO = 1; 
-
-        [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)]  
-        public static extern uint HttpDeleteServiceConfiguration(IntPtr ServiceHandle, int ConfigId, ref HTTP_SERVICE_CONFIG_SSL_SET pConfigInformation, int ConfigInformationLength, IntPtr pOverlapped);  
-        
-        [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)]  
-        public static extern uint HttpInitialize(HTTPAPI_VERSION version, uint flags, IntPtr pReserved);   
-
-        [DllImport("httpapi.dll", EntryPoint = "HttpQueryServiceConfiguration",  
-            CharSet = CharSet.Unicode, ExactSpelling = true,  
-            CallingConvention = CallingConvention.StdCall)]  
-        public static extern uint HttpQueryServiceConfiguration(  
-            IntPtr serviceHandle,  
-            HTTP_SERVICE_CONFIG_ID configID,  
-            ref HTTP_SERVICE_CONFIG_SSL_QUERY pInputConfigInfo,  
-            UInt32 InputConfigInfoLength, 
-            IntPtr pOutputConfigInfo,
-            UInt32 OutputConfigInfoLength,  
-            [In, Out] ref UInt32 pReturnLength,  
-            IntPtr pOverlapped  
-        );  
-        
-        [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)]  
-        public static extern uint HttpSetServiceConfiguration(IntPtr ServiceHandle, int ConfigId, ref HTTP_SERVICE_CONFIG_SSL_SET pConfigInformation, int ConfigInformationLength, IntPtr pOverlapped);
-  
-        [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)]  
-        public static extern uint HttpTerminate(uint flags, IntPtr pReserved);
-
-        public static HTTP_SERVICE_CONFIG_SSL_SET MarshalConfigSslSet(IntPtr ptr) {
-            return (HTTP_SERVICE_CONFIG_SSL_SET)Marshal.PtrToStructure(ptr, typeof(HTTP_SERVICE_CONFIG_SSL_SET));
-        }
-    }   
-  
-    public enum HTTP_SERVICE_CONFIG_ID {  
-        HttpServiceConfigIPListenList,  
-        HttpServiceConfigSSLCertInfo,  
-        HttpServiceConfigUrlAclInfo,  
-        HttpServiceConfigMax  
-    }  
-  
-    public enum HTTP_SERVICE_CONFIG_QUERY_TYPE {  
-        HttpServiceConfigQueryExact,  
-        HttpServiceConfigQueryNext,  
-        HttpServiceConfigQueryMax  
-    }  
-    
-    [StructLayout(LayoutKind.Sequential)]  
-    public struct HTTPAPI_VERSION {  
-        public ushort HttpApiMajorVersion;  
-        public ushort HttpApiMinorVersion;  
-    }    
-  
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]  
-    public struct HTTP_SERVICE_CONFIG_SSL_KEY {  
-        public IntPtr pIpPort;  
-    }  
-  
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]  
-    public struct HTTP_SERVICE_CONFIG_SSL_QUERY {  
-        public HTTP_SERVICE_CONFIG_QUERY_TYPE QueryDesc; 
-        public IntPtr KeyDesc;  
-        public Int32 dwToken;  
-    }  
-        
-    [StructLayout(LayoutKind.Sequential)]  
-    public struct HTTP_SERVICE_CONFIG_SSL_SET {  
-        public IntPtr KeyDesc;  
-        public uint SslHashLength;  
-        public IntPtr pSslHash;  
-        public Guid AppId;  
-        [MarshalAs(UnmanagedType.LPWStr)]  
-        public string pSslCertStoreName;  
-        public int DefaultCertCheckMode;  
-        public int DefaultRevocationFreshnessTime;  
-        public int DefaultRecovationUrlRetrievalTimeout;  
-        [MarshalAs(UnmanagedType.LPWStr)]  
-        public string pDefaultSslCtlIdentifier;  
-        [MarshalAs(UnmanagedType.LPWStr)]  
-        public string pDefaultSslCtlStoreName;  
-        public int DefaultFlags;  
-    }      
-}
-'
-
-$SUCCESS = 0
-function InitializeInterop() {
-    try {
-        [Microsoft.IIS.Administration.Setup.Http] | Out-Null
-    }
-    catch {
-        Add-Type $cs
-    }
-}
-
-function GetIpEndpointBytes($_ipEndpoint) {
-    $socketAddress = $_ipEndpoint.Serialize()
-    $ipBytes = [System.Array]::CreateInstance([System.Byte], $socketAddress.Size)
-    for ($i = 0; $i -lt $socketAddress.Size; $i++) {
-        $ipBytes[$i] = $socketAddress[$i]
-    }
-    return $ipBytes
-}
-
-function GetBindingInfo($sslConfig) {
-    $hash = [System.Array]::CreateInstance([System.Byte], [int]($sslConfig.SslHashLength))
-    [System.Runtime.InteropServices.Marshal]::Copy($sslConfig.pSslHash, $hash, 0, $sslConfig.SslHashLength)
-
-    $socketAddressLength = 16
-    $sa = [System.Array]::CreateInstance([System.Byte], $socketAddressLength)
-    [System.Runtime.InteropServices.Marshal]::Copy($sslConfig.KeyDesc, $sa, 0, $socketAddressLength)
-    $socketAddress = New-Object "System.Net.SocketAddress" -ArgumentList ([System.Net.Sockets.AddressFamily]::InterNetwork, $socketAddressLength)
-    for ($i = 0; $i -lt $sa.Length; $i++) {
-        $socketAddress[$i] = $sa[$i]
-    }
-
-    $ep = New-Object "System.Net.IPEndPoint" -ArgumentList ([ipaddress]::Any, 0)
-    $endpoint = [System.Net.IPEndPoint]$ep.Create($socketAddress)
-
-    $ret = @{}
-    $ret.CertificateHash = [System.BitConverter]::ToString($hash).Replace("-", "")
-    $ret.AppId = $sslConfig.AppId
-    $ret.IpEndpoint = $endpoint
-    return $ret
-}
-
-function InitializeHttpSys() {
-    $v = New-Object "Microsoft.IIS.Administration.Setup.HTTPAPI_VERSION"
-    $V.HttpApiMajorVersion = 1
-    $v.HttpApiMinorVersion = 0
-
-    $result = [Microsoft.IIS.Administration.Setup.Http]::HttpInitialize($v, [Microsoft.IIS.Administration.Setup.Http]::HTTP_INITIALIZE_CONFIG, [System.IntPtr]::Zero)
-
-    if ($result -ne $SUCCESS) {
-        Write-Warning "Error initializing Http API"
-        throw [System.ComponentModel.Win32Exception] $([System.int32]$result)
-    }
-
-    return $result
-}
-
-function TerminateHttpSys() {
-    return [Microsoft.IIS.Administration.Setup.Http]::HttpTerminate([Microsoft.IIS.Administration.Setup.Http]::HTTP_INITIALIZE_CONFIG, [System.IntPtr]::Zero)
-}
-
-function Add-SslBinding($_ipEndpoint, $_certificate, $_appId) {
-    if ($_ipEndpoint -eq $null) {
-        throw "Ip Endpoint required."
-    }
-
-    if ($_certificate -eq $null) {
-        throw "Certificate required."
-    }
-
-    if ($appId -eq $null) {
-        throw "App id required."
-    }
-
-    <# FYI, [System.Guid]::Parse() is not supported in lower version of powershell
-    if (-not($_appId -is [System.Guid])) {
-        $_appId = [System.Guid]::Parse($_appId)
-    }
-    #>
-
-    setSslConfiguration $_ipEndpoint $_certificate $_appId
-}
-
-function Delete-SslBinding($_ipEndpoint) {
-
-    if ($_ipEndpoint -eq $null) {
-        throw "Ip Endpoint required."
-    }
-
-    setSslConfiguration $_ipEndpoint $null $([System.Guid]::Empty)
-}
-
-function Get-SslBinding($_ipEndpoint) {
-
-    if ($_ipEndpoint -eq $null) {
-        throw "Ip Endpoint required."
-    }
-
-    $bufferSize = 4096
-    try {
-        InitializeHttpSys| Out-Null
-
-        $ipBytes = [System.Byte[]]$(GetIpEndpointBytes($_ipEndpoint))
-        $hIp = [System.Runtime.InteropServices.GCHandle]::Alloc($ipBytes, [System.Runtime.InteropServices.GCHandleType]::Pinned)
-        $pIp = $hIp.AddrOfPinnedObject()
-
-        $queryParam = New-Object "Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_SSL_QUERY"
-        $queryParam.QueryDesc = [Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_QUERY_TYPE]::HttpServiceConfigQueryExact
-        $queryParam.dwToken = 0
-        $queryParam.KeyDesc = $pIp
-
-        $returnLen = 0
-        $pReturnSet = [System.Runtime.InteropServices.Marshal]::AllocHGlobal($bufferSize)    
-
-        $result = [Microsoft.IIS.Administration.Setup.Http]::HttpQueryServiceConfiguration(
-                        [System.IntPtr]::Zero,
-                        [Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_ID]::HttpServiceConfigSSLCertInfo,
-                        [ref] $queryParam,
-                        [uint32]([System.Runtime.InteropServices.Marshal]::SizeOf($queryParam)),
-                        $pReturnSet,
-                        $bufferSize,
-                        [ref] $returnLen,
-                        [System.IntPtr]::Zero)
-
-        if ($result -eq 2) {
-            # File not found
-            return $null
-        }
-        if ($result -ne $SUCCESS) {
-            Write-Warning "Error reading Ssl Cert Configuration"
-            throw [System.ComponentModel.Win32Exception] $([System.int32]$result)
-        }
-        $sslConfig = [Microsoft.IIS.Administration.Setup.Http]::MarshalConfigSslSet($pReturnSet)
-        return GetBindingInfo $sslConfig
-    }
-    finally {
-        if ($hIp -ne $null) {
-            $hIp.Free()
-            $hIp = $null
-        }
-        if ($pReturnSet -ne [System.IntPtr]::Zero) {
-            [System.Runtime.InteropServices.Marshal]::FreeHGlobal($pReturnSet)
-            $pReturnSet = [System.IntPtr]::Zero
-        }
-        TerminateHttpSys | Out-Null
-    }
-}
-
-function setSslConfiguration($_ipEndpoint, $_certificate, $_appId) {
-
-    try {
-        InitializeHttpSys| Out-Null
-    
-        $sslSet = New-Object "Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_SSL_SET"
-        $sslSetSize = [System.Runtime.InteropServices.Marshal]::SizeOf($sslSet)
-
-        $ipBytes = [System.Byte[]]$(GetIpEndpointBytes($_ipEndpoint))
-        $hIp = [System.Runtime.InteropServices.GCHandle]::Alloc($ipBytes, [System.Runtime.InteropServices.GCHandleType]::Pinned)
-        $pIp = $hIp.AddrOfPinnedObject()
-
-        $sslSet.KeyDesc = $pIp # IntPtr
-        $sslSet.SslHashLength = 0
-        $sslSet.pSslHash = [System.IntPtr]::Zero
-        $sslSet.pSslCertStoreName = [System.IntPtr]::Zero
-        $sslSet.AppId = $_appId
-
-        if ($_certificate -ne $null) {
-            # Create binding
-            
-            $certBytes = $_certificate.GetCertHash()
-            $hCertBytes = [System.Runtime.InteropServices.GCHandle]::Alloc($certBytes, [System.Runtime.InteropServices.GCHandleType]::Pinned)
-            $pCertBytes = $hCertBytes.AddrOfPinnedObject()
-        
-            $sslSet.SslHashLength = 20
-            $sslSet.pSslHash = $pCertBytes
-            $sslSet.pSslCertStoreName = $StoreName
-
-            $result = [Microsoft.IIS.Administration.Setup.Http]::HttpSetServiceConfiguration([System.IntPtr]::Zero, 
-                      [Microsoft.IIS.Administration.Setup.Http]::HTTP_SERVICE_CONFIG_SSLCERT_INFO,
-                      [ref]$sslSet,
-                      $sslSetSize,
-                      [System.IntPtr]::Zero)  
-        }   
-        else {
-            #Delete binding
-            $result = [Microsoft.IIS.Administration.Setup.Http]::HttpDeleteServiceConfiguration([System.IntPtr]::Zero, 
-                      [Microsoft.IIS.Administration.Setup.Http]::HTTP_SERVICE_CONFIG_SSLCERT_INFO,
-                      [ref]$sslSet,
-                      $sslSetSize,
-                      [System.IntPtr]::Zero)  
-        }  
-
-        if ($result -ne $SUCCESS) {
-            Write-Warning "Error setting Ssl Cert Configuration"
-            throw [System.ComponentModel.Win32Exception] $([System.int32]$result)
-        }
-    }
-    finally {              
-        if ($hIp -ne $null) {
-            $hIp.Free()
-            $hIp = $null
-        }
-        if ($hCertBytes -ne $null) {
-            $hCertBytes.Free()
-            $hCertBytes = $null
-        }
-        TerminateHttpSys| Out-Null
-    }
-}
-
-InitializeInterop
-switch ($Command)
-{
-    "Add-SslBinding"
-    {
-        return Add-SslBinding $IpEndPoint $Certificate $AppId
-    }
-    "Delete-SslBinding"
-    {
-        return Delete-SslBinding $IpEndpoint
-    }
-    "Get-SslBinding"
-    {
-        return Get-SslBinding $IpEndpoint
-    }
-    default
-    {
-        throw "Unknown command"
-    }
-}
\ No newline at end of file
diff --git a/src/Servers/IIS/tools/installancm.ps1 b/src/Servers/IIS/tools/installancm.ps1
deleted file mode 100644
index b54a830d0e..0000000000
--- a/src/Servers/IIS/tools/installancm.ps1
+++ /dev/null
@@ -1,471 +0,0 @@
-<#
-.SYNOPSIS
-    Installs asnetcore to IISExpress and IIS directory
-.DESCRIPTION
-    Installs asnetcore to IISExpress and IIS directory
-.PARAMETER Rollback
-    Default: $false
-    Rollback the updated files with the original files
-.PARAMETER ForceToBackup
-    Default: $false
-    Force to do the initial backup again (this parameter is meaningful only when you want to replace the existing backup file)
-.PARAMETER Extract
-    Default: $false
-    Search ANCM nugetfile and extract the file to the path of the ExtractFilesTo parameter value
-.PARAMETER PackagePath
-    Default: $PSScriptRoot\..\..\artifacts
-    Root path where ANCM nuget package is placed
-.PARAMETER ExtractFilesTo
-    Default: $PSScriptRoot\..\..\artifacts"
-    Output path where aspentcore.dll file is extracted
-
-Example:
-    .\installancm.ps1 "C:\Users\jhkim\AppData\Local\Temp\ihvufnf1.atw\ancm\Debug"
-
-#>
-[cmdletbinding()]
-param(
-   [Parameter(Mandatory=$false, Position = 0)]
-   [string]  $ExtractFilesTo="$PSScriptRoot\..\artifacts\build\AspNetCore\bin\Debug",
-   [Parameter(Mandatory=$false, Position = 1)]
-   [string]  $PackagePath="$PSScriptRoot\..\artifacts\build",
-   [Parameter(Mandatory=$false)]
-   [switch] $Rollback=$false,
-   [Parameter(Mandatory=$false)]
-   [switch] $ForceToBackup=$false,
-   [Parameter(Mandatory=$false)]
-   [switch] $Extract=$false
-)
-
-function Get-ANCMNugetFilePath() { 
-
-    $NugetFilePath = Get-ChildItem $PackagePath -Recurse -Filter Microsoft.AspNetCore.AspNetCoreModule*.nupkg | Select-Object -Last 1
-    return ($NugetFilePath.FullName)
-}
-
-function Check-TargetFiles() { 
-    $functionName = "Check-TargetFiles"
-    $LogHeader = "[$ScriptFileName::$functionName]"
-    $result = $true
-
-    if (-not $isIISExpressInstalled -and -not $isIISInstalled)
-    {
-        Say ("$LogHeader Both IIS and IISExpress does not have aspnetcore.dll file")
-        $result = $false
-    }
-
-    if ($isIISExpressInstalled)
-    {
-        if (-not (Test-Path $aspnetCorex64To))
-        {
-            Say ("$LogHeader Error!!! Failed to find the file $aspnetCorex64To")
-            $result = $false
-        }
-        if (-not (Test-Path $aspnetCoreSchemax64To))
-        {
-            Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemax64To")
-            $result = $false
-        }
-        if ($is64BitMachine)
-        {
-            if (-not (Test-Path $aspnetCoreWin32To))
-            {
-                Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreWin32To")
-                $result = $false
-            }    
-            if (-not (Test-Path $aspnetCoreSchemaWin32To))
-            {
-                Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemaWin32To")
-                $result = $false
-            }  
-        }
-    }
-
-    if ($isIISInstalled)
-    {
-        if (-not (Test-Path $aspnetCorex64IISTo))
-        {
-            Say ("$LogHeader Error!!! Failed to find the file $aspnetCorex64IISTo")
-            $result = $false
-        }
-        if (-not (Test-Path $aspnetCoreSchemax64IISTo))
-        {
-            Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemax64IISTo")
-            $result = $false
-        }
-        if ($is64BitMachine)
-        {
-            if (-not (Test-Path $aspnetCoreWin32IISTo))
-            {
-                Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreWin32IISTo")
-                $result = $false
-            }
-        }
-    }
-
-    return $result
-}
-
-function Check-ExtractedFiles() { 
-    $functionName = "Check-ExtractedFiles"
-    $LogHeader = "[$ScriptFileName::$functionName]"
-    $result = $true
-
-    if (-not (Test-Path $aspnetCorex64From))
-    {
-        Say ("$LogHeader Error!!! Failed to find the file $aspnetCorex64From")
-        $result = $false
-    }
-    if (-not (Test-Path $aspnetCoreWin32From))
-    {
-        Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreWin32From")
-        $result = $false
-    }
-    if (-not (Test-Path $aspnetCoreSchemax64From))
-    {
-        Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemax64From")
-        $result = $false
-    }
-    if (-not (Test-Path $aspnetCoreSchemaWin32From))
-    {
-        Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemaWin32From")
-        $result = $false
-    }
-    return $result
-}
-
-function Extract-ANCMFromNugetPackage() { 
-    $result = $true
-
-    $functionName = "Extract-ANCMFromNugetPackage"
-    $LogHeader = "[$ScriptFileName::$functionName]"
-
-    $backupAncmNugetFilePath = Join-Path $TempExtractFilesTo (get-item $ancmNugetFilePath).Name
-    if (Test-Path $backupAncmNugetFilePath)
-    {
-        Say ("$LogHeader Found backup file at $backupAncmNugetFilePath")
-        if ((get-item $ancmNugetFilePath).LastWriteTime -eq (get-item $backupAncmNugetFilePath).LastWriteTime)
-        {
-            if (Check-ExtractedFiles)
-            {
-                Say ("$LogHeader Skip to extract ANCM files because $ancmNugetFilePath is matched to the backup file $backupAncmNugetFilePath.")
-                return $result
-            }
-        }
-    }
-
-    Add-Type -Assembly System.IO.Compression.FileSystem
-    if (Test-Path $TempExtractFilesTo)
-    {
-        remove-item $TempExtractFilesTo -Force -Recurse -Confirm:$false | out-null
-    }
-    if (Test-Path $TempExtractFilesTo)
-    {
-        Say ("$LogHeader Error!!! Failed to delete $TempExtractFilesTo")
-        $result = $false
-        return $result
-    }
-    else
-    {
-        new-item -Type directory $TempExtractFilesTo | out-null
-    }
-    if (-not (Test-Path $TempExtractFilesTo))
-    {
-        Say ("$LogHeader Error!!! Failed to create $TempExtractFilesTo")
-        $result = $false
-        return $result
-    }
-
-    # 
-    Say ("$LogHeader Extract the ancm nuget file $ancmNugetFilePath to $TempExtractFilesTo ...")
-    [System.IO.Compression.ZipFile]::ExtractToDirectory($ancmNugetFilePath, $TempExtractFilesTo) 
-
-    Say ("$LogHeader Create the backup file of the nuget file to $backupAncmNugetFilePath")
-    copy-item $ancmNugetFilePath $backupAncmNugetFilePath
-
-    return $result
-}
-
-function Update-ANCM() { 
-    
-    $functionName = "Update-ANCM -Rollback:$" + $Rollback.ToString()
-    $LogHeader = "[$ScriptFileName::$functionName]"
-
-    if ($isIISExpressInstalled)
-    {
-        if ($is64BitMachine)
-        {
-            Say ("$LogHeader Start updating ANCM files for IISExpress for amd64 machine...")
-            Update-File $aspnetCorex64From $aspnetCorex64To 
-            Update-File $aspnetCoreWin32From $aspnetCoreWin32To 
-            Update-File $aspnetCoreSchemax64From $aspnetCoreSchemax64To 
-            Update-File $aspnetCoreSchemaWin32From $aspnetCoreSchemaWin32To 
-        }
-        else
-        {
-            Say ("$LogHeader Start updating ANCM files for IISExpress for x86 machine...")
-            Update-File $aspnetCoreWin32From $aspnetCorex64To 
-            Update-File $aspnetCoreSchemaWin32From $aspnetCoreSchemax64To 
-        }
-    }
-    else
-    {
-        Say ("$LogHeader Can't find aspnetcore.dll for IISExpress. Skipping updating ANCM files for IISExpress")
-    }
-
-    if ($isIISInstalled)
-    {
-        if ($is64BitMachine)
-        {
-            Say ("$LogHeader Start updating ANCM files for IIS for amd64 machine...")
-            Update-File $aspnetCorex64From $aspnetCorex64IISTo 
-            Update-File $aspnetCoreWin32From $aspnetCoreWin32IISTo 
-            Update-File $aspnetCoreSchemax64From $aspnetCoreSchemax64IISTo 
-        }
-        else
-        {
-            Say ("$LogHeader Start updating ANCM files for IIS for x86 machine...")
-            Update-File $aspnetCoreWin32IISFrom $aspnetCorex64IISTo 
-            Update-File $aspnetCoreSchemaWin32From $aspnetCoreSchemax64IISTo 
-        }
-    }
-    else
-    {
-        Say ("$LogHeader Can't find aspnetcore.dll for IIS. Skipping updating ANCM files for IIS server")
-    }
-}
-
-function Update-File([string]$SourceFilePath, [string]$DestinationFilePath) { 
-
-    $Source = $SourceFilePath
-    $Destination = $DestinationFilePath
-
-    $BackupFilePath = $Destination + ".ancm_backup"
-    if ($Rollback)
-    {
-        $Source = $BackupFilePath
-    }
-        
-    $functionName = "Update-File -Rollback:$" + $Rollback.ToString()
-    $LogHeader = "[$ScriptFileName::$functionName]"
-
-    if ($ForceToBackup)
-    {
-        if (Test-Path $BackupFilePath)
-        {
-            $backupFileRemoved = $false
-            if ( ((get-item $DestinationFilePath).CreationTime -gt (get-item $BackupFilePath).CreationTime) -and ((get-item $DestinationFilePath).CreationTime -gt (get-item $SourceFilePath).CreationTime) )
-            {
-                $backupFileRemoved = $true
-                Say ('    Delete the existing "$BackupFilePath" because "$DestinationFilePath" is newer than both "$BackupFilePath" and "$SourceFilePath"')
-                Remove-Item $BackupFilePath -Force -Confirm:$false
-            }
-            else
-            {
-                Say-Verbose ('     Skipping to delete the existing backupfile because "$DestinationFilePath" is not newer than $BackupFilePath"')
-            }
-        }
-        if ($backupFileRemoved -and (Test-Path $BackupFilePath))
-        {
-            throw ("$LogHeader Can't delete $BackupFilePath")
-        }
-    }
-
-    # Do the initial back up before updating file
-    if (-Not (Test-Path $BackupFilePath))
-    {
-        Say ("    Create a backup $BackupFilePath")
-        Copy-Item $Destination $BackupFilePath  -Force
-
-        $fileMatched = $null -eq (Compare-Object -ReferenceObject $(Get-Content $Destination) -DifferenceObject $(Get-Content $BackupFilePath))
-        if (-not $fileMatched)
-        {
-            throw ("$LogHeader File not matched!!! $Destination $BackupFilePath")
-        }
-    }
-    if (-Not (Test-Path $BackupFilePath))
-    {
-        throw ("$LogHeader Can't backup $Source to $BackupFilePath")
-    }  
-
-    # Copy file from Source to Destination if those files are different each other
-    if (-Not (Test-Path $Destination))
-    {
-        throw ("$LogHeader Can't find $Destination")
-    }
-    $fileMatched = $null -eq (Compare-Object -ReferenceObject $(Get-Content $Source) -DifferenceObject $(Get-Content $Destination))
-    if (-not $fileMatched)
-    {
-        Say ("    Copying $Source to $Desting...")
-        Copy-Item $Source $Destination -Force
-
-        # check file is correctly copied
-        $fileMatched = $null -eq (Compare-Object -ReferenceObject $(Get-Content $Source) -DifferenceObject $(Get-Content $Destination))
-        if (-not $fileMatched)
-        {
-            throw ("$LogHeader File not matched!!! $Source $Destination")
-        }
-        else
-        {
-            Say-Verbose ("$LogHeader File matched!!! $Source to $Destination")
-        }
-    }
-    else
-    {
-        Say ("    Skipping $Destination that is already identical to $Source ")
-    }
-}
-
-function Say($str) {
-    Write-Host $str
-}
-
-function Say-Verbose($str) {
-    Write-Verbose $str
-}
-
-#######################################################
-# Start execution point
-#######################################################
-
-$EXIT_FAIL = 1
-$EXIT_SUCCESS = 0
-
-$ScriptFileName = "installancm.ps1"
-$LogHeader = "[$ScriptFileName]"
-
-if ($Extract -and (-Not $Rollback))
-{
-    if (-not (Test-Path $PackagePath))
-    {
-        Say ("$LogHeader Error!!! Failed to find the directory $PackagePath")
-        exit $EXIT_FAIL
-    }
-
-    $ancmNugetFilePath = Get-ANCMNugetFilePath
-    if (-not (Test-Path $ancmNugetFilePath))
-    {
-        Say ("$LogHeader Error!!! Failed to find AspNetCoreModule nupkg file under $PackagePath nor its child directories")
-        exit $EXIT_FAIL
-    }
-}
-
-if (-Not $Rollback)
-{
-    if (-not (Test-Path $ExtractFilesTo))
-    {
-        Say ("$LogHeader Error!!! Failed to find the directory $ExtractFilesTo")
-        exit $EXIT_FAIL
-    }
-}
-
-$TempExtractFilesTo = $ExtractFilesTo + "\.ancm"
-$ExtractFilesRootPath = ""
-if ($Extract)
-{
-    $ExtractFilesRootPath = $TempExtractFilesTo + "\ancm\Debug"
-}
-else
-{
-    $ExtractFilesRootPath = $ExtractFilesTo
-}
-
-# Try with solution output path
-$aspnetCorex64From = $ExtractFilesRootPath + "\x64\aspnetcore.dll"
-$aspnetCoreWin32From = $ExtractFilesRootPath + "\Win32\aspnetcore.dll"
-$aspnetCoreSchemax64From = $ExtractFilesRootPath + "\x64\aspnetcore_schema.xml"
-$aspnetCoreSchemaWin32From = $ExtractFilesRootPath + "\Win32\aspnetcore_schema.xml"
-
-$aspnetCorex64To = "$env:ProgramFiles\IIS Express\aspnetcore.dll"
-$aspnetCoreWin32To = "${env:ProgramFiles(x86)}\IIS Express\aspnetcore.dll"
-$aspnetCoreSchemax64To = "$env:ProgramFiles\IIS Express\config\schema\aspnetcore_schema.xml"
-$aspnetCoreSchemaWin32To = "${env:ProgramFiles(x86)}\IIS Express\config\schema\aspnetcore_schema.xml"
-
-$aspnetCorex64IISTo = "$env:windir\system32\inetsrv\aspnetcore.dll"
-$aspnetCoreWin32IISTo = "$env:windir\syswow64\inetsrv\aspnetcore.dll"
-$aspnetCoreSchemax64IISTo = "$env:windir\system32\inetsrv\config\schema\aspnetcore_schema.xml"
-
-# if this is not solution output path, use nuget package directory structure
-if (-not (Test-Path $aspnetCorex64From))
-{
-    $aspnetCorex64From = $ExtractFilesRootPath + "\runtimes\win7-x64\native\aspnetcore.dll"
-    $aspnetCoreWin32From = $ExtractFilesRootPath + "\runtimes\win7-x86\native\aspnetcore.dll"
-    $aspnetCoreSchemax64From = $ExtractFilesRootPath + "\aspnetcore_schema.xml"
-    $aspnetCoreSchemaWin32From = $ExtractFilesRootPath + "\aspnetcore_schema.xml"
-
-    $aspnetCorex64To = "$env:ProgramFiles\IIS Express\aspnetcore.dll"
-    $aspnetCoreWin32To = "${env:ProgramFiles(x86)}\IIS Express\aspnetcore.dll"
-    $aspnetCoreSchemax64To = "$env:ProgramFiles\IIS Express\config\schema\aspnetcore_schema.xml"
-    $aspnetCoreSchemaWin32To = "${env:ProgramFiles(x86)}\IIS Express\config\schema\aspnetcore_schema.xml"
-
-    $aspnetCorex64IISTo = "$env:windir\system32\inetsrv\aspnetcore.dll"
-    $aspnetCoreWin32IISTo = "$env:windir\syswow64\inetsrv\aspnetcore.dll"
-    $aspnetCoreSchemax64IISTo = "$env:windir\system32\inetsrv\config\schema\aspnetcore_schema.xml"
-}
-
-$is64BitMachine = $env:PROCESSOR_ARCHITECTURE.ToLower() -eq "amd64"
-$isIISExpressInstalled = Test-Path $aspnetCorex64To
-$isIISInstalled = Test-Path $aspnetCorex64IISTo
-
-# Check expected files are available on IIS/IISExpress directory
-if (-not (Check-TargetFiles))
-{
-    Say ("$LogHeader Error!!! Failed to update ANCM files because AspnetCore.dll is not installed on IIS/IISExpress directory.")
-    exit $EXIT_FAIL
-}
-
-if ($Extract)
-{
-    # Extrack nuget package when $DoExtract is true
-    if (-not (Extract-ANCMFromNugetPackage))
-    {
-        Say ("$LogHeader Error!!! Failed to extract ANCM file")
-        exit $EXIT_FAIL
-    }
-}
-
-# clean up IIS and IISExpress worker processes and IIS services
-Say ("$LogHeader Stopping w3wp.exe process")
-Stop-Process -Name w3wp -ErrorAction Ignore -Force -Confirm:$false
-
-Say ("$LogHeader Stopping iisexpress.exe process")
-Stop-Process -Name iisexpress -ErrorAction Ignore -Force -Confirm:$false
-
-$w3svcGotStopped = $false
-$w3svcWindowsServce = Get-Service W3SVC -ErrorAction Ignore
-if ($w3svcWindowsServce -and $w3svcWindowsServce.Status -eq "Running")
-{
-    Say ("$LogHeader Stopping w3svc service")
-    $w3svcGotStopped = $true
-    Stop-Service W3SVC -Force -ErrorAction Ignore
-    Say ("$LogHeader Stopping w3logsvc service")
-    Stop-Service W3LOGSVC -Force -ErrorAction Ignore
-}
-
-if ($Rollback)
-{
-    Say ("$LogHeader Rolling back ANCM files...")
-}
-else
-{
-    Say  ("Updating ANCM files...")
-}
-Update-ANCM
-
-# Recover w3svc service 
-if ($w3svcGotStopped)
-{
-    Say ("$LogHeader Starting w3svc service")
-    Start-Service W3SVC -ErrorAction Ignore
-    $w3svcServiceStopped = $false
-
-    $w3svcWindowsServce = Get-Service W3SVC -ErrorAction Ignore
-    if ($w3svcWindowsServce.Status -ne "Running")
-    {
-        Say  ("$LogHeader Error!!! Failed to start w3svc service.")
-        exit $EXIT_FAIL
-    }
-}
-
-Say ("$LogHeader Finished!!!")
-exit $EXIT_SUCCESS
diff --git a/src/Servers/IIS/tools/stresstest.ps1 b/src/Servers/IIS/tools/stresstest.ps1
deleted file mode 100644
index 981c6fcf44..0000000000
--- a/src/Servers/IIS/tools/stresstest.ps1
+++ /dev/null
@@ -1,96 +0,0 @@
-##########################################################
-# NOTE: 
-# For running test automation, following prerequisite required:
-#
-# 1. On Win7, powershell should be upgraded to 4.0
-#    https://social.technet.microsoft.com/wiki/contents/articles/21016.how-to-install-windows-powershell-4-0.aspx
-# 2. url-rewrite should be installed 
-# 3. makecert.exe tools should be available
-##########################################################
-
-# Replace aspnetcore.dll with the latest version
-copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll "C:\Program Files\IIS Express"
-copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.pdb "C:\Program Files\IIS Express"
-
-
-# Enable appverif for IISExpress.exe
-appverif /verify iisexpress.exe
-
-# Set the AspNetCoreModuleTest environment variable with the following command 
-cd C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test
-dotnet restore
-dotnet build
-$aspNetCoreModuleTest="C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test\bin\Debug\net46"
-
-if (Test-Path (Join-Path $aspNetCoreModuleTest aspnetcoremodule.test.dll))
-{
-    # Clean up applicationhost.config of IISExpress
-    del $env:userprofile\documents\iisexpress\config\applicationhost.config -Confirm:$false -Force
-    Start-Process "C:\Program Files\IIS Express\iisexpress.exe"
-    Sleep 3
-    Stop-Process -Name iisexpress
-
-    # Create sites
-    (1..50) | foreach { md ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) 2> out-null } 
-    (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\web.config ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } 
-    (1..50) | foreach { 
-        $path = ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) 
-        $appPath = "/foo"+$_
-         & "C:\Program Files\IIS Express\appcmd.exe" add app /site.name:"WebSite1" /path:$appPath /physicalPath:$path
-    }
-
-    <#(1..50) | foreach { 
-        $configpath = ("WebSite1/foo" + $_)
-        $value = "C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + ".exe"
-        & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value
-    }
-    (1..50) | foreach { copy C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo.exe ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ +".exe") } 
-    (1..50) | foreach { 
-        $configpath = ("WebSite1/foo" + $_)
-        $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\foo" + $_ + ".exe"
-        & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config
-
-        $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\AutobahnTestServer.dll"
-        & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /arguments:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config
-    } 
-    #>
-    
-    # Start IISExpress with running the below command
-    &"C:\Program Files\Debugging Tools for Windows (x64)\windbg.exe" /g /G "C:\Program Files\IIS Express\iisexpress.exe"
-
-
-    # 6. Start stress testing
-    (1..10000) | foreach {
-        if ($_ % 2 -eq 0)
-        {
-            ("Recycling backend only")
-            stop-process -name dotnet 
-            (1..50) | foreach { del ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_  + "\app_offline.htm") -confirm:$false -Force 2> out-null } 
-            stop-process -name dotnet 
-        }
-        else
-        {
-            ("Recycling backedn + enabling appoffline ....")          
-            stop-process -name dotnet
-            (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\app_offline.htm ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } 
-        }
-        Sleep 1
-
-        (1..10) | foreach {
-            (1..50) | foreach { 
-                invoke-webrequest ("http://localhost:8080/foo"+$_) > $null
-            }
-        }
-    }
-
-
-    # Stress test idea
-    # 1. Use Web Stress Tester
-    # 2. Run stop-process -name dotnet
-    # 3. Hit Q command to IISExpress console window
-    # 4. Use app_offline.htm
-    # 5. Save dummy web.config 
-}
-
-// bp aspnetcore!FORWARDING_HANDLER::FORWARDING_HANDLER
-// bp aspnetcore!FORWARDING_HANDLER::~FORWARDING_HANDLER
\ No newline at end of file
diff --git a/src/Servers/IIS/tools/update_schema.ps1 b/src/Servers/IIS/tools/update_schema.ps1
index 2a45a3152c..3437e31571 100644
--- a/src/Servers/IIS/tools/update_schema.ps1
+++ b/src/Servers/IIS/tools/update_schema.ps1
@@ -15,7 +15,7 @@ $ancmSchemaFiles = @(
     "aspnetcore_schema_v2.xml"
 )
 
-$ancmSchemaFileLocation = Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml";
+$ancmSchemaFileLocation = Resolve-Path "$PSScriptRoot\..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml";
 
 [bool]$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")