diff --git a/.gitmodules b/.gitmodules
index f6f9db68928dde7f5342b430526afed6c96d2836..9bf56ea7a65d8897c39ec9770a67c4fbcfb17eec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "modules/EntityFrameworkCore"]
-	path = modules/EntityFrameworkCore
-	url = https://github.com/aspnet/EntityFrameworkCore.git
-	branch = release/2.1
+       path = modules/EntityFrameworkCore
+       url = https://github.com/aspnet/EntityFrameworkCore.git
+       branch = release/2.1
 [submodule "modules/Scaffolding"]
-	path = modules/Scaffolding
-	url = https://github.com/aspnet/Scaffolding.git
-	branch = release/2.1
+       path = modules/Scaffolding
+       url = https://github.com/aspnet/Scaffolding.git
+       branch = release/2.1
\ No newline at end of file
diff --git a/build/artifacts.props b/build/artifacts.props
index 9fc0515f8720010fde5663800eb221c859fb08b0..5d5e60ee42baafe354790e1a0d483cbf6d42ef8d 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -49,7 +49,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Cors" AllMetapackage="true" AppMetapackage="true" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 937df0f56a6e9cc366091851f624706f836b3387..2899757373c0937675baa12e32005a8d63bb3db4 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -10,7 +10,6 @@
     <RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
     <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
     <RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
-    <RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
     <RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
     <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\"  />
diff --git a/build/repo.props b/build/repo.props
index eb668c963c6a96d8353a363cc92371dbfacd4c67..0f267468e75feb54c3657ab11d92c951ba4ce3e0 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -75,6 +75,7 @@
                       $(RepositoryRoot)src\Html\**\*.*proj;
                       $(RepositoryRoot)src\Servers\**\*.csproj;
                       $(RepositoryRoot)src\Servers\**\*.pkgproj;
+                      $(RepositoryRoot)src\Security\**\*.*proj;
                       $(RepositoryRoot)src\Shared\**\*.*proj;
                       $(RepositoryRoot)src\Tools\**\*.*proj;
                       $(RepositoryRoot)src\Middleware\**\*.*proj;
diff --git a/build/submodules.props b/build/submodules.props
index 7c390ff8704c1b0e33156ae726b7bdcfe3379f1f..3521bb4a9287ee0023f92ea971f50e9c92d33a3e 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -55,7 +55,6 @@
     <ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
     <ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
     <ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
-    <ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
     <ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
   </ItemGroup>
 </Project>
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index ec7d5961c02266a623724890d67129de9b647c22..f4feda3691f9953a375aea6bd8ef2bbd40e4ae53 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -57,6 +57,19 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -66,6 +79,13 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.Cookies-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Core' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -75,6 +95,83 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.Facebook-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.Google-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.JwtBearer-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
+    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.2.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.MicrosoftAccount-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.OAuth-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OAuth' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OAuth' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.OpenIdConnect-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
+    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.2.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.Twitter-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.WsFederation-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
+    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[5.2.0, )" />
+    <BaselinePackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[5.2.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authorization-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authorization.Policy-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.2, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
     <BaselinePackageVersion>2.1.3</BaselinePackageVersion>
@@ -83,6 +180,15 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[2.1.1, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.CookiePolicy-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Cors-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cors' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -591,4 +697,12 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />
     <BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.Owin.Security.Interop-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' ">
+    <BaselinePackageVersion>2.1.2</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' AND '$(TargetFramework)' == 'net461' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Owin.Security" Version="[3.0.1, )" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index e27da11e3a618c42223f4b84ef7bfcc84cbea579..1abf801fc9c446ab7e1e9ac74bf675f5062bed81 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -11,9 +11,22 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="dotnet-watch" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore" Version="2.1.6" />
   <Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.OAuth" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authorization" Version="2.1.2" />
+  <Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
+  <Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.2" />
   <Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
@@ -64,4 +77,5 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
   <Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
+  <Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
 </Baseline>
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 39c05aae060d2babc5d649863bca7b86c1fac656..80c3757705ef9ebbd0ad6de1b6949e8081fabe92 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -50,11 +50,15 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Owin.Security.Cookies" Version="$(MicrosoftOwinSecurityCookiesPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
     <LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
     <LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
@@ -68,6 +72,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
     <LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
     <LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
+
   </ItemGroup>
 
   <ItemGroup Label="External dependencies">
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 2b71425adf5dd6165e12f4ca0329c47d2ec8059a..944909a34b3436532c853727aabb326a64c3c415 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -44,6 +44,20 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Transport.Libuv\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Cookies" ProjectPath="$(RepositoryRoot)src\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication" ProjectPath="$(RepositoryRoot)src\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Facebook" ProjectPath="$(RepositoryRoot)src\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Google" ProjectPath="$(RepositoryRoot)src\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.JwtBearer" ProjectPath="$(RepositoryRoot)src\Security\Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" ProjectPath="$(RepositoryRoot)src\Security\Authentication\MicrosoftAccount\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.OAuth" ProjectPath="$(RepositoryRoot)src\Security\Authentication\OAuth\src\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" ProjectPath="$(RepositoryRoot)src\Security\Authentication\OpenIdConnect\src\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Twitter" ProjectPath="$(RepositoryRoot)src\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.WsFederation" ProjectPath="$(RepositoryRoot)src\Security\Authentication\WsFederation\src\Microsoft.AspNetCore.Authentication.WsFederation.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authorization" ProjectPath="$(RepositoryRoot)src\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authorization.Policy" ProjectPath="$(RepositoryRoot)src\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.CookiePolicy" ProjectPath="$(RepositoryRoot)src\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Owin.Security.Interop" ProjectPath="$(RepositoryRoot)src\Security\Interop\src\Microsoft.Owin.Security.Interop.csproj" />
     <ProjectReferenceProvider Include="dotnet-dev-certs" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-dev-certs\src\dotnet-dev-certs.csproj" />
     <ProjectReferenceProvider Include="dotnet-sql-cache" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-sql-cache\src\dotnet-sql-cache.csproj" />
     <ProjectReferenceProvider Include="dotnet-user-secrets" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-user-secrets\src\dotnet-user-secrets.csproj" />
diff --git a/src/Mvc/build/dependencies.props b/src/Mvc/build/dependencies.props
index 3b46192a78521b6060b4b863f328dd7291ea2cb5..ffd2ec5af6bbdfe229e71ef5d164d82146a18a58 100644
--- a/src/Mvc/build/dependencies.props
+++ b/src/Mvc/build/dependencies.props
@@ -39,7 +39,6 @@
     <MicrosoftAspNetCoreAuthenticationPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationPackageVersion>
     <MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>2.1.1</MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>
     <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion>
     <MicrosoftAspNetCoreCookiePolicyPackageVersion>2.1.1</MicrosoftAspNetCoreCookiePolicyPackageVersion>
     <MicrosoftAspNetCoreCorsPackageVersion>2.1.1</MicrosoftAspNetCoreCorsPackageVersion>
     <MicrosoftAspNetCoreDiagnosticsAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreDiagnosticsAbstractionsPackageVersion>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
index 54a2f8e04201a29bb0d6c91ca7ef375cc889d987..1de4dbbd81a4e0e45f30ff27ccd426f4d6784920 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -14,6 +14,7 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)ChunkingCookieManager\**\*.cs" />
     <Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\*.cs" />
     <Compile Include="$(SharedSourceRoot)CopyOnWriteDictionary\*.cs" />
     <Compile Include="$(SharedSourceRoot)ObjectMethodExecutor\*.cs" />
@@ -27,7 +28,6 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
     <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
 
     <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="$(MicrosoftAspNetCoreAntiforgeryPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="$(MicrosoftAspNetCoreDiagnosticsAbstractionsPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
index 954ef92727e27d8015fce725cbb94e0721a00298..6fce319b2aca2202992d7b66c3aaec8d2a5f6901 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -24,6 +24,10 @@
     <WebApplicationFactoryContentRootAttribute Include="FiltersWebSite" AssemblyName="FiltersWebSite" ContentRootPath="/../WebSites/FiltersWebSite" ContentRootTest="Incorrect.csproj" Priority="-1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)ChunkingCookieManager\**\*.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj" />
     <ProjectReference Include="..\WebSites\ApiExplorerWebSite\ApiExplorerWebSite.csproj" />
@@ -50,7 +54,6 @@
     <ProjectReference Include="..\WebSites\XmlFormattersWebSite\XmlFormattersWebSite.csproj" />
 
     <PackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
diff --git a/src/Security/.gitignore b/src/Security/.gitignore
deleted file mode 100644
index d5717b3f3fd2654edf6fb434b6628ed993b1a61a..0000000000000000000000000000000000000000
--- a/src/Security/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-[Oo]bj/
-[Bb]in/
-TestResults/
-.nuget/
-_ReSharper.*/
-packages/
-artifacts/
-PublishProfiles/
-*.user
-*.suo
-*.cache
-*.docstates
-_ReSharper.*
-nuget.exe
-*net45.csproj
-*net451.csproj
-*k10.csproj
-*.psess
-*.vsp
-*.pidb
-*.userprefs
-*DS_Store
-*.ncrunchsolution
-*.*sdf
-*.ipch
-*.sln.ide
-project.lock.json
-.build/
-.testPublish/
-/.vs/
-.vscode/
-global.json
diff --git a/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj b/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..795814b64930f1070f700189ead18e23b544347a
--- /dev/null
+++ b/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/CookieSample/Program.cs b/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs
similarity index 100%
rename from src/Security/samples/CookieSample/Program.cs
rename to src/Security/Authentication/Cookies/samples/CookieSample/Program.cs
diff --git a/src/Security/samples/CookieSample/Startup.cs b/src/Security/Authentication/Cookies/samples/CookieSample/Startup.cs
similarity index 100%
rename from src/Security/samples/CookieSample/Startup.cs
rename to src/Security/Authentication/Cookies/samples/CookieSample/Startup.cs
diff --git a/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj b/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..6966acf3b34b56017ce70753b84758da44199633
--- /dev/null
+++ b/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.Extensions.Caching.Memory" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/CookieSessionSample/MemoryCacheTicketStore.cs b/src/Security/Authentication/Cookies/samples/CookieSessionSample/MemoryCacheTicketStore.cs
similarity index 100%
rename from src/Security/samples/CookieSessionSample/MemoryCacheTicketStore.cs
rename to src/Security/Authentication/Cookies/samples/CookieSessionSample/MemoryCacheTicketStore.cs
diff --git a/src/Security/samples/CookieSessionSample/Program.cs b/src/Security/Authentication/Cookies/samples/CookieSessionSample/Program.cs
similarity index 100%
rename from src/Security/samples/CookieSessionSample/Program.cs
rename to src/Security/Authentication/Cookies/samples/CookieSessionSample/Program.cs
diff --git a/src/Security/samples/CookieSessionSample/Startup.cs b/src/Security/Authentication/Cookies/samples/CookieSessionSample/Startup.cs
similarity index 100%
rename from src/Security/samples/CookieSessionSample/Startup.cs
rename to src/Security/Authentication/Cookies/samples/CookieSessionSample/Startup.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Constants.cs b/src/Security/Authentication/Cookies/src/Constants.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Constants.cs
rename to src/Security/Authentication/Cookies/src/Constants.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAppBuilderExtensions.cs b/src/Security/Authentication/Cookies/src/CookieAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAppBuilderExtensions.cs
rename to src/Security/Authentication/Cookies/src/CookieAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAuthenticationDefaults.cs b/src/Security/Authentication/Cookies/src/CookieAuthenticationDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAuthenticationDefaults.cs
rename to src/Security/Authentication/Cookies/src/CookieAuthenticationDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieAuthenticationEvents.cs b/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieAuthenticationEvents.cs
rename to src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAuthenticationHandler.cs b/src/Security/Authentication/Cookies/src/CookieAuthenticationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAuthenticationHandler.cs
rename to src/Security/Authentication/Cookies/src/CookieAuthenticationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAuthenticationOptions.cs b/src/Security/Authentication/Cookies/src/CookieAuthenticationOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieAuthenticationOptions.cs
rename to src/Security/Authentication/Cookies/src/CookieAuthenticationOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieExtensions.cs b/src/Security/Authentication/Cookies/src/CookieExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/CookieExtensions.cs
rename to src/Security/Authentication/Cookies/src/CookieExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieSignedInContext.cs b/src/Security/Authentication/Cookies/src/CookieSignedInContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieSignedInContext.cs
rename to src/Security/Authentication/Cookies/src/CookieSignedInContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieSigningInContext.cs b/src/Security/Authentication/Cookies/src/CookieSigningInContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieSigningInContext.cs
rename to src/Security/Authentication/Cookies/src/CookieSigningInContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieSigningOutContext.cs b/src/Security/Authentication/Cookies/src/CookieSigningOutContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieSigningOutContext.cs
rename to src/Security/Authentication/Cookies/src/CookieSigningOutContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieValidatePrincipalContext.cs b/src/Security/Authentication/Cookies/src/CookieValidatePrincipalContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Events/CookieValidatePrincipalContext.cs
rename to src/Security/Authentication/Cookies/src/CookieValidatePrincipalContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/ICookieManager.cs b/src/Security/Authentication/Cookies/src/ICookieManager.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/ICookieManager.cs
rename to src/Security/Authentication/Cookies/src/ICookieManager.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/ITicketStore.cs b/src/Security/Authentication/Cookies/src/ITicketStore.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/ITicketStore.cs
rename to src/Security/Authentication/Cookies/src/ITicketStore.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/LoggingExtensions.cs b/src/Security/Authentication/Cookies/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/LoggingExtensions.cs
rename to src/Security/Authentication/Cookies/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj
similarity index 72%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
rename to src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj
index b188a58e085973c6413bab1c46514b3bf7d04898..34ebf518fa04c2a217c4bb1395a91d73da3b7013 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
+++ b/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\shared\Microsoft.AspNetCore.ChunkingCookieManager.Sources\**\*.cs" />
+    <Compile Include="$(SharedSourceRoot)ChunkingCookieManager\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/PostConfigureCookieAuthenticationOptions.cs b/src/Security/Authentication/Cookies/src/PostConfigureCookieAuthenticationOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/PostConfigureCookieAuthenticationOptions.cs
rename to src/Security/Authentication/Cookies/src/PostConfigureCookieAuthenticationOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/baseline.netcore.json b/src/Security/Authentication/Cookies/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Cookies/baseline.netcore.json
rename to src/Security/Authentication/Cookies/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/AuthAppBuilderExtensions.cs b/src/Security/Authentication/Core/src/AuthAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/AuthAppBuilderExtensions.cs
rename to src/Security/Authentication/Core/src/AuthAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationBuilder.cs b/src/Security/Authentication/Core/src/AuthenticationBuilder.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationBuilder.cs
rename to src/Security/Authentication/Core/src/AuthenticationBuilder.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationHandler.cs b/src/Security/Authentication/Core/src/AuthenticationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationHandler.cs
rename to src/Security/Authentication/Core/src/AuthenticationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationMiddleware.cs b/src/Security/Authentication/Core/src/AuthenticationMiddleware.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationMiddleware.cs
rename to src/Security/Authentication/Core/src/AuthenticationMiddleware.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationSchemeOptions.cs b/src/Security/Authentication/Core/src/AuthenticationSchemeOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationSchemeOptions.cs
rename to src/Security/Authentication/Core/src/AuthenticationSchemeOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationServiceCollectionExtensions.cs b/src/Security/Authentication/Core/src/AuthenticationServiceCollectionExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/AuthenticationServiceCollectionExtensions.cs
rename to src/Security/Authentication/Core/src/AuthenticationServiceCollectionExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/BaseContext.cs b/src/Security/Authentication/Core/src/Events/BaseContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/BaseContext.cs
rename to src/Security/Authentication/Core/src/Events/BaseContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/HandleRequestContext.cs b/src/Security/Authentication/Core/src/Events/HandleRequestContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/HandleRequestContext.cs
rename to src/Security/Authentication/Core/src/Events/HandleRequestContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/PrincipalContext.cs b/src/Security/Authentication/Core/src/Events/PrincipalContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/PrincipalContext.cs
rename to src/Security/Authentication/Core/src/Events/PrincipalContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/PropertiesContext.cs b/src/Security/Authentication/Core/src/Events/PropertiesContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/PropertiesContext.cs
rename to src/Security/Authentication/Core/src/Events/PropertiesContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/RedirectContext.cs b/src/Security/Authentication/Core/src/Events/RedirectContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/RedirectContext.cs
rename to src/Security/Authentication/Core/src/Events/RedirectContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/RemoteAuthenticationContext.cs b/src/Security/Authentication/Core/src/Events/RemoteAuthenticationContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/RemoteAuthenticationContext.cs
rename to src/Security/Authentication/Core/src/Events/RemoteAuthenticationContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/RemoteAuthenticationEvents.cs b/src/Security/Authentication/Core/src/Events/RemoteAuthenticationEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/RemoteAuthenticationEvents.cs
rename to src/Security/Authentication/Core/src/Events/RemoteAuthenticationEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/RemoteFailureContext.cs b/src/Security/Authentication/Core/src/Events/RemoteFailureContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/RemoteFailureContext.cs
rename to src/Security/Authentication/Core/src/Events/RemoteFailureContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/ResultContext.cs b/src/Security/Authentication/Core/src/Events/ResultContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/ResultContext.cs
rename to src/Security/Authentication/Core/src/Events/ResultContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Events/TicketReceivedContext.cs b/src/Security/Authentication/Core/src/Events/TicketReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Events/TicketReceivedContext.cs
rename to src/Security/Authentication/Core/src/Events/TicketReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/HandleRequestResult.cs b/src/Security/Authentication/Core/src/HandleRequestResult.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/HandleRequestResult.cs
rename to src/Security/Authentication/Core/src/HandleRequestResult.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/IDataSerializer.cs b/src/Security/Authentication/Core/src/IDataSerializer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/IDataSerializer.cs
rename to src/Security/Authentication/Core/src/IDataSerializer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/ISecureDataFormat.cs b/src/Security/Authentication/Core/src/ISecureDataFormat.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/ISecureDataFormat.cs
rename to src/Security/Authentication/Core/src/ISecureDataFormat.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/ISystemClock.cs b/src/Security/Authentication/Core/src/ISystemClock.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/ISystemClock.cs
rename to src/Security/Authentication/Core/src/ISystemClock.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Internal/RequestPathBaseCookieBuilder.cs b/src/Security/Authentication/Core/src/Internal/RequestPathBaseCookieBuilder.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Internal/RequestPathBaseCookieBuilder.cs
rename to src/Security/Authentication/Core/src/Internal/RequestPathBaseCookieBuilder.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/LoggingExtensions.cs b/src/Security/Authentication/Core/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/LoggingExtensions.cs
rename to src/Security/Authentication/Core/src/LoggingExtensions.cs
diff --git a/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj b/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..34647be96eadab6333a80cc782b63a795a7a902d
--- /dev/null
+++ b/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;authentication;security</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)SecurityHelper\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Core" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Options" />
+    <Reference Include="Microsoft.Extensions.WebEncoders" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/PolicySchemeHandler.cs b/src/Security/Authentication/Core/src/PolicySchemeHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/PolicySchemeHandler.cs
rename to src/Security/Authentication/Core/src/PolicySchemeHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/PolicySchemeOptions.cs b/src/Security/Authentication/Core/src/PolicySchemeOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/PolicySchemeOptions.cs
rename to src/Security/Authentication/Core/src/PolicySchemeOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Properties/Resources.Designer.cs b/src/Security/Authentication/Core/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Properties/Resources.Designer.cs
rename to src/Security/Authentication/Core/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/PropertiesDataFormat.cs b/src/Security/Authentication/Core/src/PropertiesDataFormat.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/PropertiesDataFormat.cs
rename to src/Security/Authentication/Core/src/PropertiesDataFormat.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/PropertiesSerializer.cs b/src/Security/Authentication/Core/src/PropertiesSerializer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/PropertiesSerializer.cs
rename to src/Security/Authentication/Core/src/PropertiesSerializer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationHandler.cs b/src/Security/Authentication/Core/src/RemoteAuthenticationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationHandler.cs
rename to src/Security/Authentication/Core/src/RemoteAuthenticationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationOptions.cs b/src/Security/Authentication/Core/src/RemoteAuthenticationOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/RemoteAuthenticationOptions.cs
rename to src/Security/Authentication/Core/src/RemoteAuthenticationOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Resources.resx b/src/Security/Authentication/Core/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Resources.resx
rename to src/Security/Authentication/Core/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/SecureDataFormat.cs b/src/Security/Authentication/Core/src/SecureDataFormat.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/SecureDataFormat.cs
rename to src/Security/Authentication/Core/src/SecureDataFormat.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/SignInAuthenticationHandler.cs b/src/Security/Authentication/Core/src/SignInAuthenticationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/SignInAuthenticationHandler.cs
rename to src/Security/Authentication/Core/src/SignInAuthenticationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/SignOutAuthenticationHandler.cs b/src/Security/Authentication/Core/src/SignOutAuthenticationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/SignOutAuthenticationHandler.cs
rename to src/Security/Authentication/Core/src/SignOutAuthenticationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/SystemClock.cs b/src/Security/Authentication/Core/src/SystemClock.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/SystemClock.cs
rename to src/Security/Authentication/Core/src/SystemClock.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/TextEncoder.cs b/src/Security/Authentication/Core/src/TextEncoder.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/TextEncoder.cs
rename to src/Security/Authentication/Core/src/TextEncoder.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/TicketDataFormat.cs b/src/Security/Authentication/Core/src/TicketDataFormat.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/TicketDataFormat.cs
rename to src/Security/Authentication/Core/src/TicketDataFormat.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Data/TicketSerializer.cs b/src/Security/Authentication/Core/src/TicketSerializer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/Data/TicketSerializer.cs
rename to src/Security/Authentication/Core/src/TicketSerializer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/baseline.netcore.json b/src/Security/Authentication/Core/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication/baseline.netcore.json
rename to src/Security/Authentication/Core/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookAppBuilderExtensions.cs b/src/Security/Authentication/Facebook/src/FacebookAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookAppBuilderExtensions.cs
rename to src/Security/Authentication/Facebook/src/FacebookAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookDefaults.cs b/src/Security/Authentication/Facebook/src/FacebookDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookDefaults.cs
rename to src/Security/Authentication/Facebook/src/FacebookDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookExtensions.cs b/src/Security/Authentication/Facebook/src/FacebookExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookExtensions.cs
rename to src/Security/Authentication/Facebook/src/FacebookExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookHandler.cs b/src/Security/Authentication/Facebook/src/FacebookHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookHandler.cs
rename to src/Security/Authentication/Facebook/src/FacebookHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookOptions.cs b/src/Security/Authentication/Facebook/src/FacebookOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/FacebookOptions.cs
rename to src/Security/Authentication/Facebook/src/FacebookOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj
similarity index 78%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
rename to src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj
index 62aee1367fe4bd1e1c2bc52d11ca82138ed5ce74..b1d9aa2c1adceda294d3980f16bf18e66b95fb76 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
+++ b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OAuth" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Properties/Resources.Designer.cs b/src/Security/Authentication/Facebook/src/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Properties/Resources.Designer.cs
rename to src/Security/Authentication/Facebook/src/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Resources.resx b/src/Security/Authentication/Facebook/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/Resources.resx
rename to src/Security/Authentication/Facebook/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/baseline.netcore.json b/src/Security/Authentication/Facebook/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Facebook/baseline.netcore.json
rename to src/Security/Authentication/Facebook/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleAppBuilderExtensions.cs b/src/Security/Authentication/Google/src/GoogleAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleAppBuilderExtensions.cs
rename to src/Security/Authentication/Google/src/GoogleAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleChallengeProperties.cs b/src/Security/Authentication/Google/src/GoogleChallengeProperties.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleChallengeProperties.cs
rename to src/Security/Authentication/Google/src/GoogleChallengeProperties.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleDefaults.cs b/src/Security/Authentication/Google/src/GoogleDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleDefaults.cs
rename to src/Security/Authentication/Google/src/GoogleDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleExtensions.cs b/src/Security/Authentication/Google/src/GoogleExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleExtensions.cs
rename to src/Security/Authentication/Google/src/GoogleExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleHandler.cs b/src/Security/Authentication/Google/src/GoogleHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleHandler.cs
rename to src/Security/Authentication/Google/src/GoogleHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleHelper.cs b/src/Security/Authentication/Google/src/GoogleHelper.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleHelper.cs
rename to src/Security/Authentication/Google/src/GoogleHelper.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleOptions.cs b/src/Security/Authentication/Google/src/GoogleOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/GoogleOptions.cs
rename to src/Security/Authentication/Google/src/GoogleOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
similarity index 78%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
rename to src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
index de8867f91adf7a24501d583df0fbe053499f8774..5e5888d0f819fb1a99c57e96be7a670d1c0d6b2e 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
+++ b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OAuth" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/Properties/Resources.Designer.cs b/src/Security/Authentication/Google/src/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/Properties/Resources.Designer.cs
rename to src/Security/Authentication/Google/src/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/Resources.resx b/src/Security/Authentication/Google/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/Resources.resx
rename to src/Security/Authentication/Google/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Google/baseline.netcore.json b/src/Security/Authentication/Google/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Google/baseline.netcore.json
rename to src/Security/Authentication/Google/src/baseline.netcore.json
diff --git a/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..d76de243da6c1c0452d312e7dc91e640f90ee766
--- /dev/null
+++ b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <UserSecretsId>aspnet5-JwtBearerSample-20151210102827</UserSecretsId>
+ </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/JwtBearerSample/Program.cs b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Program.cs
similarity index 100%
rename from src/Security/samples/JwtBearerSample/Program.cs
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Program.cs
diff --git a/src/Security/samples/JwtBearerSample/Startup.cs b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Startup.cs
similarity index 100%
rename from src/Security/samples/JwtBearerSample/Startup.cs
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Startup.cs
diff --git a/src/Security/samples/JwtBearerSample/Todo.cs b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Todo.cs
similarity index 100%
rename from src/Security/samples/JwtBearerSample/Todo.cs
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Todo.cs
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/app.js b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/app.js
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/app.js
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/app.js
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/homeCtrl.js b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/homeCtrl.js
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/homeCtrl.js
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/homeCtrl.js
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/indexCtrl.js b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/indexCtrl.js
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/indexCtrl.js
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/indexCtrl.js
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/todoListCtrl.js b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/todoListCtrl.js
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/todoListCtrl.js
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/todoListCtrl.js
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/todoListSvc.js b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/todoListSvc.js
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/todoListSvc.js
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/todoListSvc.js
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/userDataCtrl.js b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/userDataCtrl.js
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Scripts/userDataCtrl.js
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Scripts/userDataCtrl.js
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Views/Home.html b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Views/Home.html
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Views/Home.html
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Views/Home.html
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Views/TodoList.html b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Views/TodoList.html
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Views/TodoList.html
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Views/TodoList.html
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/App/Views/UserData.html b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Views/UserData.html
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/App/Views/UserData.html
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/App/Views/UserData.html
diff --git a/src/Security/samples/JwtBearerSample/wwwroot/index.html b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/index.html
similarity index 100%
rename from src/Security/samples/JwtBearerSample/wwwroot/index.html
rename to src/Security/Authentication/JwtBearer/samples/JwtBearerSample/wwwroot/index.html
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/AuthenticationFailedContext.cs b/src/Security/Authentication/JwtBearer/src/AuthenticationFailedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/AuthenticationFailedContext.cs
rename to src/Security/Authentication/JwtBearer/src/AuthenticationFailedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerAppBuilderExtensions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerAppBuilderExtensions.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/JwtBearerChallengeContext.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerChallengeContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/JwtBearerChallengeContext.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerChallengeContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerDefaults.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerDefaults.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/JwtBearerEvents.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/JwtBearerEvents.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerExtensions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerExtensions.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerHandler.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerHandler.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerOptions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerOptions.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerPostConfigureOptions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerPostConfigureOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerPostConfigureOptions.cs
rename to src/Security/Authentication/JwtBearer/src/JwtBearerPostConfigureOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/LoggingExtensions.cs b/src/Security/Authentication/JwtBearer/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/LoggingExtensions.cs
rename to src/Security/Authentication/JwtBearer/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/MessageReceivedContext.cs b/src/Security/Authentication/JwtBearer/src/MessageReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/MessageReceivedContext.cs
rename to src/Security/Authentication/JwtBearer/src/MessageReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
similarity index 60%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
rename to src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
index e5bae5a3da28dafa92905c133007034e03e6c76d..52d3d5f5577f5fcc6f0f9b5adc52853296669d03 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
+++ b/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
@@ -9,11 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Authentication" />
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Properties/Resources.Designer.cs b/src/Security/Authentication/JwtBearer/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Properties/Resources.Designer.cs
rename to src/Security/Authentication/JwtBearer/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Resources.resx b/src/Security/Authentication/JwtBearer/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Resources.resx
rename to src/Security/Authentication/JwtBearer/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/TokenValidatedContext.cs b/src/Security/Authentication/JwtBearer/src/TokenValidatedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/Events/TokenValidatedContext.cs
rename to src/Security/Authentication/JwtBearer/src/TokenValidatedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/baseline.netcore.json b/src/Security/Authentication/JwtBearer/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/baseline.netcore.json
rename to src/Security/Authentication/JwtBearer/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
similarity index 78%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
rename to src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
index 0eddc6f76443361d6f691370234b97f823492dcd..2fd1993ac01c9b7f6df4641a8f117ead1cd914ac 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
+++ b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OAuth" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs
rename to src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountDefaults.cs b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountDefaults.cs
rename to src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountExtensions.cs b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountExtensions.cs
rename to src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountHandler.cs b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountHandler.cs
rename to src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountOptions.cs b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountOptions.cs
rename to src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Properties/Resources.Designer.cs b/src/Security/Authentication/MicrosoftAccount/src/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Properties/Resources.Designer.cs
rename to src/Security/Authentication/MicrosoftAccount/src/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Resources.resx b/src/Security/Authentication/MicrosoftAccount/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Resources.resx
rename to src/Security/Authentication/MicrosoftAccount/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/baseline.netcore.json b/src/Security/Authentication/MicrosoftAccount/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/baseline.netcore.json
rename to src/Security/Authentication/MicrosoftAccount/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/ClaimAction.cs b/src/Security/Authentication/OAuth/src/ClaimAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/ClaimAction.cs
rename to src/Security/Authentication/OAuth/src/ClaimAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/ClaimActionCollection.cs b/src/Security/Authentication/OAuth/src/ClaimActionCollection.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/ClaimActionCollection.cs
rename to src/Security/Authentication/OAuth/src/ClaimActionCollection.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/ClaimActionCollectionMapExtensions.cs b/src/Security/Authentication/OAuth/src/ClaimActionCollectionMapExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/ClaimActionCollectionMapExtensions.cs
rename to src/Security/Authentication/OAuth/src/ClaimActionCollectionMapExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/CustomJsonClaimAction.cs b/src/Security/Authentication/OAuth/src/CustomJsonClaimAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/CustomJsonClaimAction.cs
rename to src/Security/Authentication/OAuth/src/CustomJsonClaimAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/DeleteClaimAction.cs b/src/Security/Authentication/OAuth/src/DeleteClaimAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/DeleteClaimAction.cs
rename to src/Security/Authentication/OAuth/src/DeleteClaimAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Events/OAuthCreatingTicketContext.cs b/src/Security/Authentication/OAuth/src/Events/OAuthCreatingTicketContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Events/OAuthCreatingTicketContext.cs
rename to src/Security/Authentication/OAuth/src/Events/OAuthCreatingTicketContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Events/OAuthEvents.cs b/src/Security/Authentication/OAuth/src/Events/OAuthEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Events/OAuthEvents.cs
rename to src/Security/Authentication/OAuth/src/Events/OAuthEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/JsonKeyClaimAction.cs b/src/Security/Authentication/OAuth/src/JsonKeyClaimAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/JsonKeyClaimAction.cs
rename to src/Security/Authentication/OAuth/src/JsonKeyClaimAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/JsonSubKeyClaimAction.cs b/src/Security/Authentication/OAuth/src/JsonSubKeyClaimAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/JsonSubKeyClaimAction.cs
rename to src/Security/Authentication/OAuth/src/JsonSubKeyClaimAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/MapAllClaimsAction.cs b/src/Security/Authentication/OAuth/src/MapAllClaimsAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Claims/MapAllClaimsAction.cs
rename to src/Security/Authentication/OAuth/src/MapAllClaimsAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj
similarity index 66%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
rename to src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj
index 5c8a5e3a960214bfa97e71014db05e05705decc3..746b9506710f81da6ed5f2443d2f1417034727b4 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
+++ b/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj
@@ -9,11 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Authentication" />
+    <Reference Include="Newtonsoft.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthAppBuilderExtensions.cs b/src/Security/Authentication/OAuth/src/OAuthAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthAppBuilderExtensions.cs
rename to src/Security/Authentication/OAuth/src/OAuthAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthChallengeProperties.cs b/src/Security/Authentication/OAuth/src/OAuthChallengeProperties.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthChallengeProperties.cs
rename to src/Security/Authentication/OAuth/src/OAuthChallengeProperties.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthDefaults.cs b/src/Security/Authentication/OAuth/src/OAuthDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthDefaults.cs
rename to src/Security/Authentication/OAuth/src/OAuthDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthExtensions.cs b/src/Security/Authentication/OAuth/src/OAuthExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthExtensions.cs
rename to src/Security/Authentication/OAuth/src/OAuthExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthHandler.cs b/src/Security/Authentication/OAuth/src/OAuthHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthHandler.cs
rename to src/Security/Authentication/OAuth/src/OAuthHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthOptions.cs b/src/Security/Authentication/OAuth/src/OAuthOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthOptions.cs
rename to src/Security/Authentication/OAuth/src/OAuthOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthPostConfigureOptions.cs b/src/Security/Authentication/OAuth/src/OAuthPostConfigureOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthPostConfigureOptions.cs
rename to src/Security/Authentication/OAuth/src/OAuthPostConfigureOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthTokenResponse.cs b/src/Security/Authentication/OAuth/src/OAuthTokenResponse.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/OAuthTokenResponse.cs
rename to src/Security/Authentication/OAuth/src/OAuthTokenResponse.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Properties/Resources.Designer.cs b/src/Security/Authentication/OAuth/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Properties/Resources.Designer.cs
rename to src/Security/Authentication/OAuth/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Resources.resx b/src/Security/Authentication/OAuth/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/Resources.resx
rename to src/Security/Authentication/OAuth/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/baseline.netcore.json b/src/Security/Authentication/OAuth/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OAuth/baseline.netcore.json
rename to src/Security/Authentication/OAuth/src/baseline.netcore.json
diff --git a/src/Security/samples/OpenIdConnect.AzureAdSample/AuthPropertiesTokenCache.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/AuthPropertiesTokenCache.cs
similarity index 100%
rename from src/Security/samples/OpenIdConnect.AzureAdSample/AuthPropertiesTokenCache.cs
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/AuthPropertiesTokenCache.cs
diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..724448ab8bbc374846f00880f6e7a594a844acec
--- /dev/null
+++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/OpenIdConnect.AzureAdSample/Program.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Program.cs
similarity index 100%
rename from src/Security/samples/OpenIdConnect.AzureAdSample/Program.cs
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Program.cs
diff --git a/src/Security/samples/OpenIdConnect.AzureAdSample/Readme.md b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Readme.md
similarity index 100%
rename from src/Security/samples/OpenIdConnect.AzureAdSample/Readme.md
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Readme.md
diff --git a/src/Security/samples/OpenIdConnect.AzureAdSample/Startup.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Startup.cs
similarity index 100%
rename from src/Security/samples/OpenIdConnect.AzureAdSample/Startup.cs
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Startup.cs
diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..6b34fabc6c8ba293466461643cc5a4967d709ff7
--- /dev/null
+++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="compiler\resources\cert.pfx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="compiler\resources\cert.pfx" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/OpenIdConnectSample/Program.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Program.cs
similarity index 100%
rename from src/Security/samples/OpenIdConnectSample/Program.cs
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Program.cs
diff --git a/src/Security/samples/OpenIdConnectSample/Readme.md b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Readme.md
similarity index 100%
rename from src/Security/samples/OpenIdConnectSample/Readme.md
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Readme.md
diff --git a/src/Security/samples/OpenIdConnectSample/Startup.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs
similarity index 100%
rename from src/Security/samples/OpenIdConnectSample/Startup.cs
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs
diff --git a/src/Security/samples/OpenIdConnectSample/compiler/resources/cert.pfx b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/compiler/resources/cert.pfx
similarity index 100%
rename from src/Security/samples/OpenIdConnectSample/compiler/resources/cert.pfx
rename to src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/compiler/resources/cert.pfx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Claims/ClaimActionCollectionUniqueExtensions.cs b/src/Security/Authentication/OpenIdConnect/src/ClaimActionCollectionUniqueExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Claims/ClaimActionCollectionUniqueExtensions.cs
rename to src/Security/Authentication/OpenIdConnect/src/ClaimActionCollectionUniqueExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/AuthenticationFailedContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/AuthenticationFailedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/AuthenticationFailedContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/AuthenticationFailedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/AuthorizationCodeReceivedContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/AuthorizationCodeReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/AuthorizationCodeReceivedContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/AuthorizationCodeReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/MessageReceivedContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/MessageReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/MessageReceivedContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/MessageReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/OpenIdConnectEvents.cs b/src/Security/Authentication/OpenIdConnect/src/Events/OpenIdConnectEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/OpenIdConnectEvents.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/OpenIdConnectEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/RedirectContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/RedirectContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/RedirectContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/RedirectContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/RemoteSignoutContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/RemoteSignoutContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/RemoteSignoutContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/RemoteSignoutContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/TokenResponseReceivedContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/TokenResponseReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/TokenResponseReceivedContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/TokenResponseReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/TokenValidatedContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/TokenValidatedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/TokenValidatedContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/TokenValidatedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/UserInformationReceivedContext.cs b/src/Security/Authentication/OpenIdConnect/src/Events/UserInformationReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Events/UserInformationReceivedContext.cs
rename to src/Security/Authentication/OpenIdConnect/src/Events/UserInformationReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/LoggingExtensions.cs b/src/Security/Authentication/OpenIdConnect/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/LoggingExtensions.cs
rename to src/Security/Authentication/OpenIdConnect/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
similarity index 60%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
rename to src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
index b7f4c1704a9fd8bcf317a06cfad6e56a3c3b95d0..e907999b863a7afbe9be60ab9465a0f743b97ff6 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
+++ b/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
@@ -9,11 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OAuth" />
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectAppBuilderExtensions.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectAppBuilderExtensions.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectChallengeProperties.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectChallengeProperties.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectChallengeProperties.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectChallengeProperties.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectDefaults.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectDefaults.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectPostConfigureOptions.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectPostConfigureOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectPostConfigureOptions.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectPostConfigureOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectRedirectBehavior.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectRedirectBehavior.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectRedirectBehavior.cs
rename to src/Security/Authentication/OpenIdConnect/src/OpenIdConnectRedirectBehavior.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Properties/Resources.Designer.cs b/src/Security/Authentication/OpenIdConnect/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Properties/Resources.Designer.cs
rename to src/Security/Authentication/OpenIdConnect/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Resources.resx b/src/Security/Authentication/OpenIdConnect/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Resources.resx
rename to src/Security/Authentication/OpenIdConnect/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Claims/UniqueJsonKeyClaimAction.cs b/src/Security/Authentication/OpenIdConnect/src/UniqueJsonKeyClaimAction.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Claims/UniqueJsonKeyClaimAction.cs
rename to src/Security/Authentication/OpenIdConnect/src/UniqueJsonKeyClaimAction.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/baseline.netcore.json b/src/Security/Authentication/OpenIdConnect/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/baseline.netcore.json
rename to src/Security/Authentication/OpenIdConnect/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/LoggingExtensions.cs b/src/Security/Authentication/Twitter/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/LoggingExtensions.cs
rename to src/Security/Authentication/Twitter/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Messages/AccessToken.cs b/src/Security/Authentication/Twitter/src/Messages/AccessToken.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Messages/AccessToken.cs
rename to src/Security/Authentication/Twitter/src/Messages/AccessToken.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Messages/RequestToken.cs b/src/Security/Authentication/Twitter/src/Messages/RequestToken.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Messages/RequestToken.cs
rename to src/Security/Authentication/Twitter/src/Messages/RequestToken.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Messages/RequestTokenSerializer.cs b/src/Security/Authentication/Twitter/src/Messages/RequestTokenSerializer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Messages/RequestTokenSerializer.cs
rename to src/Security/Authentication/Twitter/src/Messages/RequestTokenSerializer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj
similarity index 78%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
rename to src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj
index f720d08f042a5c36866118e366010c7f2b28bd0f..c5093d38a8b3a5f98b1f4b0b8a6a9b69a5269cd5 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
+++ b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OAuth" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Properties/Resources.Designer.cs b/src/Security/Authentication/Twitter/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Properties/Resources.Designer.cs
rename to src/Security/Authentication/Twitter/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Resources.resx b/src/Security/Authentication/Twitter/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Resources.resx
rename to src/Security/Authentication/Twitter/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterAppBuilderExtensions.cs b/src/Security/Authentication/Twitter/src/TwitterAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterAppBuilderExtensions.cs
rename to src/Security/Authentication/Twitter/src/TwitterAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Events/TwitterCreatingTicketContext.cs b/src/Security/Authentication/Twitter/src/TwitterCreatingTicketContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Events/TwitterCreatingTicketContext.cs
rename to src/Security/Authentication/Twitter/src/TwitterCreatingTicketContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterDefaults.cs b/src/Security/Authentication/Twitter/src/TwitterDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterDefaults.cs
rename to src/Security/Authentication/Twitter/src/TwitterDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Events/TwitterEvents.cs b/src/Security/Authentication/Twitter/src/TwitterEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/Events/TwitterEvents.cs
rename to src/Security/Authentication/Twitter/src/TwitterEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterExtensions.cs b/src/Security/Authentication/Twitter/src/TwitterExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterExtensions.cs
rename to src/Security/Authentication/Twitter/src/TwitterExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterHandler.cs b/src/Security/Authentication/Twitter/src/TwitterHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterHandler.cs
rename to src/Security/Authentication/Twitter/src/TwitterHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterOptions.cs b/src/Security/Authentication/Twitter/src/TwitterOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterOptions.cs
rename to src/Security/Authentication/Twitter/src/TwitterOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterPostConfigureOptions.cs b/src/Security/Authentication/Twitter/src/TwitterPostConfigureOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/TwitterPostConfigureOptions.cs
rename to src/Security/Authentication/Twitter/src/TwitterPostConfigureOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/baseline.netcore.json b/src/Security/Authentication/Twitter/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.Twitter/baseline.netcore.json
rename to src/Security/Authentication/Twitter/src/baseline.netcore.json
diff --git a/src/Security/samples/WsFedSample/Program.cs b/src/Security/Authentication/WsFederation/samples/WsFedSample/Program.cs
similarity index 100%
rename from src/Security/samples/WsFedSample/Program.cs
rename to src/Security/Authentication/WsFederation/samples/WsFedSample/Program.cs
diff --git a/src/Security/samples/WsFedSample/Startup.cs b/src/Security/Authentication/WsFederation/samples/WsFedSample/Startup.cs
similarity index 100%
rename from src/Security/samples/WsFedSample/Startup.cs
rename to src/Security/Authentication/WsFederation/samples/WsFedSample/Startup.cs
diff --git a/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj b/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..684f104da10a415dfea404bde3755641c3d96ed6
--- /dev/null
+++ b/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.WsFederation" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="compiler\resources\cert.pfx" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/SocialSample/compiler/resources/cert.pfx b/src/Security/Authentication/WsFederation/samples/WsFedSample/compiler/resources/cert.pfx
similarity index 100%
rename from src/Security/samples/SocialSample/compiler/resources/cert.pfx
rename to src/Security/Authentication/WsFederation/samples/WsFedSample/compiler/resources/cert.pfx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/AuthenticationFailedContext.cs b/src/Security/Authentication/WsFederation/src/AuthenticationFailedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/AuthenticationFailedContext.cs
rename to src/Security/Authentication/WsFederation/src/AuthenticationFailedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/LoggingExtensions.cs b/src/Security/Authentication/WsFederation/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/LoggingExtensions.cs
rename to src/Security/Authentication/WsFederation/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/MessageReceivedContext.cs b/src/Security/Authentication/WsFederation/src/MessageReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/MessageReceivedContext.cs
rename to src/Security/Authentication/WsFederation/src/MessageReceivedContext.cs
diff --git a/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..f83c6655f8d40ea40ed1d3b588b317e7d52554ca
--- /dev/null
+++ b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core middleware that enables an application to support the WsFederation authentication workflow.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;authentication;security</PackageTags>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication" />
+    <Reference Include="Microsoft.IdentityModel.Protocols.WsFederation" />
+    <Reference Include="System.IdentityModel.Tokens.Jwt" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Properties/Resources.Designer.cs b/src/Security/Authentication/WsFederation/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Properties/Resources.Designer.cs
rename to src/Security/Authentication/WsFederation/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/RedirectContext.cs b/src/Security/Authentication/WsFederation/src/RedirectContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/RedirectContext.cs
rename to src/Security/Authentication/WsFederation/src/RedirectContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/RemoteSignoutContext.cs b/src/Security/Authentication/WsFederation/src/RemoteSignoutContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/RemoteSignoutContext.cs
rename to src/Security/Authentication/WsFederation/src/RemoteSignoutContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Resources.resx b/src/Security/Authentication/WsFederation/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Resources.resx
rename to src/Security/Authentication/WsFederation/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/SecurityTokenReceivedContext.cs b/src/Security/Authentication/WsFederation/src/SecurityTokenReceivedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/SecurityTokenReceivedContext.cs
rename to src/Security/Authentication/WsFederation/src/SecurityTokenReceivedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/SecurityTokenValidatedContext.cs b/src/Security/Authentication/WsFederation/src/SecurityTokenValidatedContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/SecurityTokenValidatedContext.cs
rename to src/Security/Authentication/WsFederation/src/SecurityTokenValidatedContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationDefaults.cs b/src/Security/Authentication/WsFederation/src/WsFederationDefaults.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationDefaults.cs
rename to src/Security/Authentication/WsFederation/src/WsFederationDefaults.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/WsFederationEvents.cs b/src/Security/Authentication/WsFederation/src/WsFederationEvents.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Events/WsFederationEvents.cs
rename to src/Security/Authentication/WsFederation/src/WsFederationEvents.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationExtensions.cs b/src/Security/Authentication/WsFederation/src/WsFederationExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationExtensions.cs
rename to src/Security/Authentication/WsFederation/src/WsFederationExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationHandler.cs b/src/Security/Authentication/WsFederation/src/WsFederationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationHandler.cs
rename to src/Security/Authentication/WsFederation/src/WsFederationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationOptions.cs b/src/Security/Authentication/WsFederation/src/WsFederationOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationOptions.cs
rename to src/Security/Authentication/WsFederation/src/WsFederationOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationPostConfigureOptions.cs b/src/Security/Authentication/WsFederation/src/WsFederationPostConfigureOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/WsFederationPostConfigureOptions.cs
rename to src/Security/Authentication/WsFederation/src/WsFederationPostConfigureOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/baseline.netcore.json b/src/Security/Authentication/WsFederation/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/baseline.netcore.json
rename to src/Security/Authentication/WsFederation/src/baseline.netcore.json
diff --git a/src/Security/samples/SocialSample/Program.cs b/src/Security/Authentication/samples/SocialSample/Program.cs
similarity index 100%
rename from src/Security/samples/SocialSample/Program.cs
rename to src/Security/Authentication/samples/SocialSample/Program.cs
diff --git a/src/Security/Authentication/samples/SocialSample/SocialSample.csproj b/src/Security/Authentication/samples/SocialSample/SocialSample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..701d5b93f7db35ce81329053f97f109c5a00efa5
--- /dev/null
+++ b/src/Security/Authentication/samples/SocialSample/SocialSample.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <UserSecretsId>aspnet5-SocialSample-20151210111056</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="compiler\resources\cert.pfx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="compiler\resources\cert.pfx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Facebook" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Google" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Twitter" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/SocialSample/Startup.cs b/src/Security/Authentication/samples/SocialSample/Startup.cs
similarity index 100%
rename from src/Security/samples/SocialSample/Startup.cs
rename to src/Security/Authentication/samples/SocialSample/Startup.cs
diff --git a/src/Security/samples/WsFedSample/compiler/resources/cert.pfx b/src/Security/Authentication/samples/SocialSample/compiler/resources/cert.pfx
similarity index 100%
rename from src/Security/samples/WsFedSample/compiler/resources/cert.pfx
rename to src/Security/Authentication/samples/SocialSample/compiler/resources/cert.pfx
diff --git a/src/Security/samples/SocialSample/web.config b/src/Security/Authentication/samples/SocialSample/web.config
similarity index 100%
rename from src/Security/samples/SocialSample/web.config
rename to src/Security/Authentication/samples/SocialSample/web.config
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/AuthenticationMiddlewareTests.cs b/src/Security/Authentication/test/AuthenticationMiddlewareTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/AuthenticationMiddlewareTests.cs
rename to src/Security/Authentication/test/AuthenticationMiddlewareTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/Base64UrlTextEncoderTests.cs b/src/Security/Authentication/test/Base64UrlTextEncoderTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/Base64UrlTextEncoderTests.cs
rename to src/Security/Authentication/test/Base64UrlTextEncoderTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/ClaimActionTests.cs b/src/Security/Authentication/test/ClaimActionTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/ClaimActionTests.cs
rename to src/Security/Authentication/test/ClaimActionTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/CookieTests.cs b/src/Security/Authentication/test/CookieTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/CookieTests.cs
rename to src/Security/Authentication/test/CookieTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/DynamicSchemeTests.cs b/src/Security/Authentication/test/DynamicSchemeTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/DynamicSchemeTests.cs
rename to src/Security/Authentication/test/DynamicSchemeTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/FacebookTests.cs b/src/Security/Authentication/test/FacebookTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/FacebookTests.cs
rename to src/Security/Authentication/test/FacebookTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/GoogleTests.cs b/src/Security/Authentication/test/GoogleTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/GoogleTests.cs
rename to src/Security/Authentication/test/GoogleTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/JwtBearerTests.cs b/src/Security/Authentication/test/JwtBearerTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/JwtBearerTests.cs
rename to src/Security/Authentication/test/JwtBearerTests.cs
diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..7aa4ec18062f50eabba9ea8be8fe4ed6a8c2d315
--- /dev/null
+++ b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="OpenIdConnect\wellknownconfig.json" />
+    <None Remove="OpenIdConnect\wellknownkeys.json" />
+    <None Remove="WsFederation\federationmetadata.xml" />
+    <None Remove="WsFederation\InvalidToken.xml" />
+    <None Remove="WsFederation\ValidToken.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="WsFederation\federationmetadata.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="WsFederation\InvalidToken.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="WsFederation\ValidToken.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="OpenIdConnect\wellknownconfig.json" />
+    <EmbeddedResource Include="OpenIdConnect\wellknownkeys.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Facebook" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Google" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Twitter" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.WsFederation" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/MicrosoftAccountTests.cs b/src/Security/Authentication/test/MicrosoftAccountTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/MicrosoftAccountTests.cs
rename to src/Security/Authentication/test/MicrosoftAccountTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OAuthChallengePropertiesTest.cs b/src/Security/Authentication/test/OAuthChallengePropertiesTest.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OAuthChallengePropertiesTest.cs
rename to src/Security/Authentication/test/OAuthChallengePropertiesTest.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OAuthTests.cs b/src/Security/Authentication/test/OAuthTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OAuthTests.cs
rename to src/Security/Authentication/test/OAuthTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/MockOpenIdConnectMessage.cs b/src/Security/Authentication/test/OpenIdConnect/MockOpenIdConnectMessage.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/MockOpenIdConnectMessage.cs
rename to src/Security/Authentication/test/OpenIdConnect/MockOpenIdConnectMessage.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectChallengeTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectChallengeTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectChallengeTests.cs
rename to src/Security/Authentication/test/OpenIdConnect/OpenIdConnectChallengeTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectConfigurationTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
rename to src/Security/Authentication/test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectEventTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectEventTests.cs
rename to src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectTests.cs
rename to src/Security/Authentication/test/OpenIdConnect/OpenIdConnectTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestServerBuilder.cs b/src/Security/Authentication/test/OpenIdConnect/TestServerBuilder.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestServerBuilder.cs
rename to src/Security/Authentication/test/OpenIdConnect/TestServerBuilder.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestServerExtensions.cs b/src/Security/Authentication/test/OpenIdConnect/TestServerExtensions.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestServerExtensions.cs
rename to src/Security/Authentication/test/OpenIdConnect/TestServerExtensions.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs b/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
rename to src/Security/Authentication/test/OpenIdConnect/TestSettings.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestTransaction.cs b/src/Security/Authentication/test/OpenIdConnect/TestTransaction.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestTransaction.cs
rename to src/Security/Authentication/test/OpenIdConnect/TestTransaction.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/wellknownconfig.json b/src/Security/Authentication/test/OpenIdConnect/wellknownconfig.json
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/wellknownconfig.json
rename to src/Security/Authentication/test/OpenIdConnect/wellknownconfig.json
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/wellknownkeys.json b/src/Security/Authentication/test/OpenIdConnect/wellknownkeys.json
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/wellknownkeys.json
rename to src/Security/Authentication/test/OpenIdConnect/wellknownkeys.json
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/PolicyTests.cs b/src/Security/Authentication/test/PolicyTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/PolicyTests.cs
rename to src/Security/Authentication/test/PolicyTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/SecureDataFormatTests.cs b/src/Security/Authentication/test/SecureDataFormatTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/SecureDataFormatTests.cs
rename to src/Security/Authentication/test/SecureDataFormatTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestClock.cs b/src/Security/Authentication/test/TestClock.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestClock.cs
rename to src/Security/Authentication/test/TestClock.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestExtensions.cs b/src/Security/Authentication/test/TestExtensions.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestExtensions.cs
rename to src/Security/Authentication/test/TestExtensions.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestHandlers.cs b/src/Security/Authentication/test/TestHandlers.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestHandlers.cs
rename to src/Security/Authentication/test/TestHandlers.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestHttpMessageHandler.cs b/src/Security/Authentication/test/TestHttpMessageHandler.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TestHttpMessageHandler.cs
rename to src/Security/Authentication/test/TestHttpMessageHandler.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TicketSerializerTests.cs b/src/Security/Authentication/test/TicketSerializerTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TicketSerializerTests.cs
rename to src/Security/Authentication/test/TicketSerializerTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TokenExtensionTests.cs b/src/Security/Authentication/test/TokenExtensionTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TokenExtensionTests.cs
rename to src/Security/Authentication/test/TokenExtensionTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/Transaction.cs b/src/Security/Authentication/test/Transaction.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/Transaction.cs
rename to src/Security/Authentication/test/Transaction.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/TwitterTests.cs b/src/Security/Authentication/test/TwitterTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/TwitterTests.cs
rename to src/Security/Authentication/test/TwitterTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/CustomStateDataFormat.cs b/src/Security/Authentication/test/WsFederation/CustomStateDataFormat.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/CustomStateDataFormat.cs
rename to src/Security/Authentication/test/WsFederation/CustomStateDataFormat.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/InvalidToken.xml b/src/Security/Authentication/test/WsFederation/InvalidToken.xml
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/InvalidToken.xml
rename to src/Security/Authentication/test/WsFederation/InvalidToken.xml
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/TestSecurityToken.cs b/src/Security/Authentication/test/WsFederation/TestSecurityToken.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/TestSecurityToken.cs
rename to src/Security/Authentication/test/WsFederation/TestSecurityToken.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/TestSecurityTokenValidator.cs b/src/Security/Authentication/test/WsFederation/TestSecurityTokenValidator.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/TestSecurityTokenValidator.cs
rename to src/Security/Authentication/test/WsFederation/TestSecurityTokenValidator.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/ValidToken.xml b/src/Security/Authentication/test/WsFederation/ValidToken.xml
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/ValidToken.xml
rename to src/Security/Authentication/test/WsFederation/ValidToken.xml
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/WsFederationTest.cs b/src/Security/Authentication/test/WsFederation/WsFederationTest.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/WsFederationTest.cs
rename to src/Security/Authentication/test/WsFederation/WsFederationTest.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/federationmetadata.xml b/src/Security/Authentication/test/WsFederation/federationmetadata.xml
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/WsFederation/federationmetadata.xml
rename to src/Security/Authentication/test/WsFederation/federationmetadata.xml
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/katanatest.redmond.corp.microsoft.com.cer b/src/Security/Authentication/test/katanatest.redmond.corp.microsoft.com.cer
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/katanatest.redmond.corp.microsoft.com.cer
rename to src/Security/Authentication/test/katanatest.redmond.corp.microsoft.com.cer
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/selfSigned.cer b/src/Security/Authentication/test/selfSigned.cer
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authentication.Test/selfSigned.cer
rename to src/Security/Authentication/test/selfSigned.cer
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AllowAnonymousAttribute.cs b/src/Security/Authorization/Core/src/AllowAnonymousAttribute.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AllowAnonymousAttribute.cs
rename to src/Security/Authorization/Core/src/AllowAnonymousAttribute.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/AssertionRequirement.cs b/src/Security/Authorization/Core/src/AssertionRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/AssertionRequirement.cs
rename to src/Security/Authorization/Core/src/AssertionRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationFailure.cs b/src/Security/Authorization/Core/src/AuthorizationFailure.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationFailure.cs
rename to src/Security/Authorization/Core/src/AuthorizationFailure.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationHandler.cs b/src/Security/Authorization/Core/src/AuthorizationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationHandler.cs
rename to src/Security/Authorization/Core/src/AuthorizationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationHandlerContext.cs b/src/Security/Authorization/Core/src/AuthorizationHandlerContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationHandlerContext.cs
rename to src/Security/Authorization/Core/src/AuthorizationHandlerContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationOptions.cs b/src/Security/Authorization/Core/src/AuthorizationOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationOptions.cs
rename to src/Security/Authorization/Core/src/AuthorizationOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicy.cs b/src/Security/Authorization/Core/src/AuthorizationPolicy.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicy.cs
rename to src/Security/Authorization/Core/src/AuthorizationPolicy.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicyBuilder.cs b/src/Security/Authorization/Core/src/AuthorizationPolicyBuilder.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicyBuilder.cs
rename to src/Security/Authorization/Core/src/AuthorizationPolicyBuilder.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationResult.cs b/src/Security/Authorization/Core/src/AuthorizationResult.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationResult.cs
rename to src/Security/Authorization/Core/src/AuthorizationResult.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationServiceCollectionExtensions.cs b/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationServiceCollectionExtensions.cs
rename to src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationServiceExtensions.cs b/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizationServiceExtensions.cs
rename to src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizeAttribute.cs b/src/Security/Authorization/Core/src/AuthorizeAttribute.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/AuthorizeAttribute.cs
rename to src/Security/Authorization/Core/src/AuthorizeAttribute.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/ClaimsAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/ClaimsAuthorizationRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/ClaimsAuthorizationRequirement.cs
rename to src/Security/Authorization/Core/src/ClaimsAuthorizationRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationEvaluator.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationEvaluator.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationEvaluator.cs
rename to src/Security/Authorization/Core/src/DefaultAuthorizationEvaluator.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationHandlerContextFactory.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationHandlerContextFactory.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationHandlerContextFactory.cs
rename to src/Security/Authorization/Core/src/DefaultAuthorizationHandlerContextFactory.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationHandlerProvider.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationHandlerProvider.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationHandlerProvider.cs
rename to src/Security/Authorization/Core/src/DefaultAuthorizationHandlerProvider.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationPolicyProvider.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationPolicyProvider.cs
rename to src/Security/Authorization/Core/src/DefaultAuthorizationPolicyProvider.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationService.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationService.cs
rename to src/Security/Authorization/Core/src/DefaultAuthorizationService.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/DenyAnonymousAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/DenyAnonymousAuthorizationRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/DenyAnonymousAuthorizationRequirement.cs
rename to src/Security/Authorization/Core/src/DenyAnonymousAuthorizationRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAllowAnonymous.cs b/src/Security/Authorization/Core/src/IAllowAnonymous.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAllowAnonymous.cs
rename to src/Security/Authorization/Core/src/IAllowAnonymous.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationEvaluator.cs b/src/Security/Authorization/Core/src/IAuthorizationEvaluator.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationEvaluator.cs
rename to src/Security/Authorization/Core/src/IAuthorizationEvaluator.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandler.cs b/src/Security/Authorization/Core/src/IAuthorizationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandler.cs
rename to src/Security/Authorization/Core/src/IAuthorizationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandlerContextFactory.cs b/src/Security/Authorization/Core/src/IAuthorizationHandlerContextFactory.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandlerContextFactory.cs
rename to src/Security/Authorization/Core/src/IAuthorizationHandlerContextFactory.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandlerProvider.cs b/src/Security/Authorization/Core/src/IAuthorizationHandlerProvider.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandlerProvider.cs
rename to src/Security/Authorization/Core/src/IAuthorizationHandlerProvider.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationPolicyProvider.cs b/src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationPolicyProvider.cs
rename to src/Security/Authorization/Core/src/IAuthorizationPolicyProvider.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/IAuthorizationRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationRequirement.cs
rename to src/Security/Authorization/Core/src/IAuthorizationRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationService.cs b/src/Security/Authorization/Core/src/IAuthorizationService.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizationService.cs
rename to src/Security/Authorization/Core/src/IAuthorizationService.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizeData.cs b/src/Security/Authorization/Core/src/IAuthorizeData.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/IAuthorizeData.cs
rename to src/Security/Authorization/Core/src/IAuthorizeData.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/LoggingExtensions.cs b/src/Security/Authorization/Core/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/LoggingExtensions.cs
rename to src/Security/Authorization/Core/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
similarity index 68%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
rename to src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
index ac4aa6c320ad5d284fffd1b5a0b9656f13aae7bc..7939ec287cf684d5ec10b246ef8087f2284e889d 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
+++ b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
@@ -13,8 +13,8 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/NameAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/NameAuthorizationRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/NameAuthorizationRequirement.cs
rename to src/Security/Authorization/Core/src/NameAuthorizationRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/OperationAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/OperationAuthorizationRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/OperationAuthorizationRequirement.cs
rename to src/Security/Authorization/Core/src/OperationAuthorizationRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/PassThroughAuthorizationHandler.cs b/src/Security/Authorization/Core/src/PassThroughAuthorizationHandler.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/PassThroughAuthorizationHandler.cs
rename to src/Security/Authorization/Core/src/PassThroughAuthorizationHandler.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Properties/Resources.Designer.cs b/src/Security/Authorization/Core/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Properties/Resources.Designer.cs
rename to src/Security/Authorization/Core/src/Properties/Resources.Designer.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Resources.resx b/src/Security/Authorization/Core/src/Resources.resx
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Resources.resx
rename to src/Security/Authorization/Core/src/Resources.resx
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/RolesAuthorizationRequirement.cs b/src/Security/Authorization/Core/src/RolesAuthorizationRequirement.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/Infrastructure/RolesAuthorizationRequirement.cs
rename to src/Security/Authorization/Core/src/RolesAuthorizationRequirement.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization/baseline.netcore.json b/src/Security/Authorization/Core/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization/baseline.netcore.json
rename to src/Security/Authorization/Core/src/baseline.netcore.json
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/IPolicyEvaluator.cs b/src/Security/Authorization/Policy/src/IPolicyEvaluator.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization.Policy/IPolicyEvaluator.cs
rename to src/Security/Authorization/Policy/src/IPolicyEvaluator.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
similarity index 62%
rename from src/Security/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
rename to src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
index 9516b08388669a2ad3fc59c58b9f53d8c043c0c6..e8e9093ca98a1d8cee64f70d6281eb914f616555 100644
--- a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
+++ b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj
@@ -13,11 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authorization\Microsoft.AspNetCore.Authorization.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="$(MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/PolicyAuthorizationResult.cs b/src/Security/Authorization/Policy/src/PolicyAuthorizationResult.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization.Policy/PolicyAuthorizationResult.cs
rename to src/Security/Authorization/Policy/src/PolicyAuthorizationResult.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/PolicyEvaluator.cs b/src/Security/Authorization/Policy/src/PolicyEvaluator.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization.Policy/PolicyEvaluator.cs
rename to src/Security/Authorization/Policy/src/PolicyEvaluator.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/PolicyServiceCollectionExtensions.cs b/src/Security/Authorization/Policy/src/PolicyServiceCollectionExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization.Policy/PolicyServiceCollectionExtensions.cs
rename to src/Security/Authorization/Policy/src/PolicyServiceCollectionExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.Authorization.Policy/baseline.netcore.json b/src/Security/Authorization/Policy/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.Authorization.Policy/baseline.netcore.json
rename to src/Security/Authorization/Policy/src/baseline.netcore.json
diff --git a/src/Security/test/Microsoft.AspNetCore.Authorization.Test/AuthorizationPolicyFacts.cs b/src/Security/Authorization/test/AuthorizationPolicyFacts.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authorization.Test/AuthorizationPolicyFacts.cs
rename to src/Security/Authorization/test/AuthorizationPolicyFacts.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.Authorization.Test/DefaultAuthorizationServiceTests.cs b/src/Security/Authorization/test/DefaultAuthorizationServiceTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authorization.Test/DefaultAuthorizationServiceTests.cs
rename to src/Security/Authorization/test/DefaultAuthorizationServiceTests.cs
diff --git a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..7e393358d35d36993bf2f991b8302de44a0150bf
--- /dev/null
+++ b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.Authorization.Policy" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Logging" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.Authorization.Test/PolicyEvaluatorTests.cs b/src/Security/Authorization/test/PolicyEvaluatorTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.Authorization.Test/PolicyEvaluatorTests.cs
rename to src/Security/Authorization/test/PolicyEvaluatorTests.cs
diff --git a/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj b/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..4601ca63bada93231ec94bffbc99ab2cf5bdbc78
--- /dev/null
+++ b/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.CookiePolicy" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/samples/CookiePolicySample/Program.cs b/src/Security/CookiePolicy/samples/CookiePolicySample/Program.cs
similarity index 100%
rename from src/Security/samples/CookiePolicySample/Program.cs
rename to src/Security/CookiePolicy/samples/CookiePolicySample/Program.cs
diff --git a/src/Security/samples/CookiePolicySample/Startup.cs b/src/Security/CookiePolicy/samples/CookiePolicySample/Startup.cs
similarity index 100%
rename from src/Security/samples/CookiePolicySample/Startup.cs
rename to src/Security/CookiePolicy/samples/CookiePolicySample/Startup.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/AppendCookieContext.cs b/src/Security/CookiePolicy/src/AppendCookieContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/AppendCookieContext.cs
rename to src/Security/CookiePolicy/src/AppendCookieContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyAppBuilderExtensions.cs b/src/Security/CookiePolicy/src/CookiePolicyAppBuilderExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyAppBuilderExtensions.cs
rename to src/Security/CookiePolicy/src/CookiePolicyAppBuilderExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyMiddleware.cs b/src/Security/CookiePolicy/src/CookiePolicyMiddleware.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyMiddleware.cs
rename to src/Security/CookiePolicy/src/CookiePolicyMiddleware.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyOptions.cs b/src/Security/CookiePolicy/src/CookiePolicyOptions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/CookiePolicyOptions.cs
rename to src/Security/CookiePolicy/src/CookiePolicyOptions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/DeleteCookieContext.cs b/src/Security/CookiePolicy/src/DeleteCookieContext.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/DeleteCookieContext.cs
rename to src/Security/CookiePolicy/src/DeleteCookieContext.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/HttpOnlyPolicy.cs b/src/Security/CookiePolicy/src/HttpOnlyPolicy.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/HttpOnlyPolicy.cs
rename to src/Security/CookiePolicy/src/HttpOnlyPolicy.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/LoggingExtensions.cs b/src/Security/CookiePolicy/src/LoggingExtensions.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/LoggingExtensions.cs
rename to src/Security/CookiePolicy/src/LoggingExtensions.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj
similarity index 52%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
rename to src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj
index 40f97633aed939e9222cecd8289ed1907fbca6d0..4eda46b037b62a1855bf53ca7cfad1d432273b95 100644
--- a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
+++ b/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/ResponseCookiesWrapper.cs b/src/Security/CookiePolicy/src/ResponseCookiesWrapper.cs
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/ResponseCookiesWrapper.cs
rename to src/Security/CookiePolicy/src/ResponseCookiesWrapper.cs
diff --git a/src/Security/src/Microsoft.AspNetCore.CookiePolicy/baseline.netcore.json b/src/Security/CookiePolicy/src/baseline.netcore.json
similarity index 100%
rename from src/Security/src/Microsoft.AspNetCore.CookiePolicy/baseline.netcore.json
rename to src/Security/CookiePolicy/src/baseline.netcore.json
diff --git a/src/Security/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/CookieChunkingTests.cs b/src/Security/CookiePolicy/test/CookieChunkingTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/CookieChunkingTests.cs
rename to src/Security/CookiePolicy/test/CookieChunkingTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/CookieConsentTests.cs b/src/Security/CookiePolicy/test/CookieConsentTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/CookieConsentTests.cs
rename to src/Security/CookiePolicy/test/CookieConsentTests.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/CookiePolicyTests.cs b/src/Security/CookiePolicy/test/CookiePolicyTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/CookiePolicyTests.cs
rename to src/Security/CookiePolicy/test/CookiePolicyTests.cs
diff --git a/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..03540dd92de6e48462adb57a8ff235e99a1a5c94
--- /dev/null
+++ b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)ChunkingCookieManager\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.CookiePolicy" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/TestExtensions.cs b/src/Security/CookiePolicy/test/TestExtensions.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/TestExtensions.cs
rename to src/Security/CookiePolicy/test/TestExtensions.cs
diff --git a/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/Transaction.cs b/src/Security/CookiePolicy/test/Transaction.cs
similarity index 100%
rename from src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/Transaction.cs
rename to src/Security/CookiePolicy/test/Transaction.cs
diff --git a/src/Security/Directory.Build.props b/src/Security/Directory.Build.props
deleted file mode 100644
index f1986d9953cfff83503773fac3b190273f9cc174..0000000000000000000000000000000000000000
--- a/src/Security/Directory.Build.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project>
-  <Import
-    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
-    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
-
-  <Import Project="version.props" />
-  <Import Project="build\dependencies.props" />
-  <Import Project="build\sources.props" />
-
-  <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-</Project>
diff --git a/src/Security/Directory.Build.targets b/src/Security/Directory.Build.targets
deleted file mode 100644
index 53b3f6e1dabae0bb4e5f8a2cdf3ce1cea06375c1..0000000000000000000000000000000000000000
--- a/src/Security/Directory.Build.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
-    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/AspNetTicketDataFormat.cs b/src/Security/Interop/src/AspNetTicketDataFormat.cs
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/AspNetTicketDataFormat.cs
rename to src/Security/Interop/src/AspNetTicketDataFormat.cs
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/AspNetTicketSerializer.cs b/src/Security/Interop/src/AspNetTicketSerializer.cs
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/AspNetTicketSerializer.cs
rename to src/Security/Interop/src/AspNetTicketSerializer.cs
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/ChunkingCookieManager.cs b/src/Security/Interop/src/ChunkingCookieManager.cs
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/ChunkingCookieManager.cs
rename to src/Security/Interop/src/ChunkingCookieManager.cs
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/Constants.cs b/src/Security/Interop/src/Constants.cs
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/Constants.cs
rename to src/Security/Interop/src/Constants.cs
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/DataProtectorShim.cs b/src/Security/Interop/src/DataProtectorShim.cs
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/DataProtectorShim.cs
rename to src/Security/Interop/src/DataProtectorShim.cs
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj b/src/Security/Interop/src/Microsoft.Owin.Security.Interop.csproj
similarity index 65%
rename from src/Security/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj
rename to src/Security/Interop/src/Microsoft.Owin.Security.Interop.csproj
index a12bc6563772cee197069d22a20e90a21f8783b9..1321c626647fd2c8e558537e494d36afd25e81ca 100644
--- a/src/Security/src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj
+++ b/src/Security/Interop/src/Microsoft.Owin.Security.Interop.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Owin.Security" Version="$(MicrosoftOwinSecurityPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+    <Reference Include="Microsoft.Owin.Security" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/Properties/AssemblyInfo.cs b/src/Security/Interop/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/Properties/AssemblyInfo.cs
rename to src/Security/Interop/src/Properties/AssemblyInfo.cs
diff --git a/src/Security/src/Microsoft.Owin.Security.Interop/baseline.netframework.json b/src/Security/Interop/src/baseline.netframework.json
similarity index 100%
rename from src/Security/src/Microsoft.Owin.Security.Interop/baseline.netframework.json
rename to src/Security/Interop/src/baseline.netframework.json
diff --git a/src/Security/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs b/src/Security/Interop/test/CookieInteropTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
rename to src/Security/Interop/test/CookieInteropTests.cs
diff --git a/src/Security/Interop/test/Microsoft.Owin.Security.Interop.Test.csproj b/src/Security/Interop/test/Microsoft.Owin.Security.Interop.Test.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..0840bd0c00cf6bdeca2f1f739e49cc991d8031f6
--- /dev/null
+++ b/src/Security/Interop/test/Microsoft.Owin.Security.Interop.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.Owin.Security.Interop" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+    <Reference Include="Microsoft.Owin.Security.Cookies" />
+    <Reference Include="Microsoft.Owin.Testing" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Security/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs b/src/Security/Interop/test/TicketInteropTests.cs
similarity index 100%
rename from src/Security/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
rename to src/Security/Interop/test/TicketInteropTests.cs
diff --git a/src/Security/NuGetPackageVerifier.json b/src/Security/NuGetPackageVerifier.json
deleted file mode 100644
index 974eb365c92ba375d043ecf8637f21536b959673..0000000000000000000000000000000000000000
--- a/src/Security/NuGetPackageVerifier.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "adx-nonshipping": {
-    "rules": [],
-    "packages": {
-      "Microsoft.AspNetCore.ChunkingCookieManager.Sources": {}
-    }
-  },
-  "Default": {
-    "rules": [
-      "DefaultCompositeRule"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/Security/README.md b/src/Security/README.md
index e8e64c293676d9150ccb92255c45aaf5119506a6..d0f410fefc39c1aceac150833ee8ec893944729e 100644
--- a/src/Security/README.md
+++ b/src/Security/README.md
@@ -1,10 +1,6 @@
-ASP.NET Security
+Security
 ========
 
-AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/fujhh8n956v5ohfd/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Security/branch/dev)
-
-Travis:   [![Travis](https://travis-ci.org/aspnet/Security.svg?branch=dev)](https://travis-ci.org/aspnet/Security)
-
 Contains the security and authorization middlewares for ASP.NET Core.
 
 A list of community projects related to authentication and security for ASP.NET Core are listed in the [documentation](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/community).
@@ -12,6 +8,3 @@ A list of community projects related to authentication and security for ASP.NET
 ### Notes
 
 ASP.NET Security will not include Basic Authentication middleware due to its potential insecurity and performance problems. If you host under IIS you can enable it via IIS configuration.
-
-
-This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
diff --git a/src/Security/Security.sln b/src/Security/Security.sln
index 3df759651bbb4e8844de293345b92efb7cbb4dfe..da54b2161ce1e9a0885154929b2fc6cf2e3927a9 100644
--- a/src/Security/Security.sln
+++ b/src/Security/Security.sln
@@ -2,553 +2,302 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 15.0.26730.03
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4D2B6A51-2F9F-44F5-8131-EA5CAC053652}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authorization", "Authorization", "{F6A3381D-978A-4CBF-BC72-862FB75CD6AF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{79C549BA-2932-450A-B87D-635879361343}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieSample", "samples\CookieSample\CookieSample.csproj", "{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interop", "Interop", "{4F43243E-75D3-4979-8716-A13E34114959}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7BF11F3A-60B6-4796-B504-579C67FFBA34}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CookiePolicy", "CookiePolicy", "{92358ECF-92AE-4F7F-A891-9FA603B77352}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocialSample", "samples\SocialSample\SocialSample.csproj", "{8C73D216-332D-41D8-BFD0-45BC4BC36552}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Owin.Security.Interop", "Interop\src\Microsoft.Owin.Security.Interop.csproj", "{0B26AAC6-B8D9-4857-BF63-FED472BF07D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieSessionSample", "samples\CookieSessionSample\CookieSessionSample.csproj", "{19711880-46DA-4A26-9E0F-9B2E41D27651}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Owin.Security.Interop.Test", "Interop\test\Microsoft.Owin.Security.Interop.Test.csproj", "{D1716DDD-6B5D-49AA-AC0C-69AEEB264E94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIdConnectSample", "samples\OpenIdConnectSample\OpenIdConnectSample.csproj", "{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{59727CCB-D4C6-4421-8469-F7891BFB6016}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{FC152CC4-054B-457E-8D91-389C5DE3C561}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy.Test", "CookiePolicy\test\Microsoft.AspNetCore.CookiePolicy.Test.csproj", "{75661B8D-0089-4EFF-A70E-F77318453003}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj", "{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookiePolicySample", "CookiePolicy\samples\CookiePolicySample\CookiePolicySample.csproj", "{B48C6EE8-BCFA-47A5-A837-30DC9C261D7A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "src\Microsoft.AspNetCore.Authentication.Facebook\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{DFAA25DE-5AC1-4505-A874-1A4A521827EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "src\Microsoft.AspNetCore.Authentication.Google\Microsoft.AspNetCore.Authentication.Google.csproj", "{76579C39-B829-490D-B8BE-1BD35FE8412E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{37D7B212-5E9A-4489-B97A-74D6BE29787F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OpenIdConnect", "src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj", "{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Test", "Authorization\test\Microsoft.AspNetCore.Authorization.Test.csproj", "{DFA0346F-61E1-496E-B844-AC485ED4682C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.MicrosoftAccount", "src\Microsoft.AspNetCore.Authentication.MicrosoftAccount\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj", "{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Test", "Authentication\test\Microsoft.AspNetCore.Authentication.Test.csproj", "{56CDE112-CBBE-4997-935F-978ACB732D98}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "src\Microsoft.AspNetCore.Authentication.Twitter\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{0330FFF6-B4B5-42DD-8C99-26A789569000}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocialSample", "Authentication\samples\SocialSample\SocialSample.csproj", "{F3C2076F-0618-46FE-A620-F25CD9217474}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OAuth", "src\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj", "{1657C79E-7755-4AEE-9D61-571295B69A30}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cookies", "Cookies", "{50CDE025-8520-4678-A061-0864AE6D73F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Test", "test\Microsoft.AspNetCore.Authentication.Test\Microsoft.AspNetCore.Authentication.Test.csproj", "{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieSample", "Authentication\Cookies\samples\CookieSample\CookieSample.csproj", "{6452E57B-532D-441C-AF4B-F9BB8BA53083}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Test", "test\Microsoft.AspNetCore.Authorization.Test\Microsoft.AspNetCore.Authorization.Test.csproj", "{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieSessionSample", "Authentication\Cookies\samples\CookieSessionSample\CookieSessionSample.csproj", "{A5303DB4-07FF-4440-9ADA-D3116BA66116}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "src\Microsoft.AspNetCore.Authorization\Microsoft.AspNetCore.Authorization.csproj", "{6AB3E514-5894-4131-9399-DC7D5284ADDB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{308E2FEF-C0D6-43D0-83FB-2A1CCB6BF4C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "src\Microsoft.AspNetCore.CookiePolicy\Microsoft.AspNetCore.CookiePolicy.csproj", "{86183DC3-02A8-4A68-8B60-71ECEC066E79}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{81A6D039-E75E-4C22-B34B-39E7B9FEF0B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy.Test", "test\Microsoft.AspNetCore.CookiePolicy.Test\Microsoft.AspNetCore.CookiePolicy.Test.csproj", "{1790E052-646F-4529-B90E-6FEA95520D69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{4AB2AFE9-7C0A-4466-B6F0-42997B251BF1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "src\Microsoft.AspNetCore.Authentication.JwtBearer\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{2755BFE5-7421-4A31-A644-F817DF5CAA98}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Facebook", "Facebook", "{D2F81383-5C44-4EE8-906D-B563E7DA4D21}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtBearerSample", "samples\JwtBearerSample\JwtBearerSample.csproj", "{D399B84F-591B-4E98-92BA-B0F63E7B6957}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{4A110D33-787A-4C3B-B3A4-2024D235B9B4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Owin.Security.Interop", "src\Microsoft.Owin.Security.Interop\Microsoft.Owin.Security.Interop.csproj", "{A7922DD8-09F1-43E4-938B-CC523EA08898}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Google", "Google", "{6FD578B7-E513-43FE-AA16-2FF43787CBD6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Owin.Security.Interop.Test", "test\Microsoft.Owin.Security.Interop.Test\Microsoft.Owin.Security.Interop.Test.csproj", "{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{970DD190-0880-43F5-8A34-0D08BF587698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIdConnect.AzureAdSample", "samples\OpenIdConnect.AzureAdSample\OpenIdConnect.AzureAdSample.csproj", "{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JwtBearer", "JwtBearer", "{A9B19067-9962-470C-BDE7-C2DD5A0CEC07}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test", "test\Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test\Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj", "{51563775-C659-4907-9BAF-9995BAB87D01}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtBearerSample", "Authentication\JwtBearer\samples\JwtBearerSample\JwtBearerSample.csproj", "{8E8A1A12-86D9-4DD1-B2B1-91AB905C4208}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86BD08B1-F978-4F58-9982-2A017807F01C}"
-	ProjectSection(SolutionItems) = preProject
-		build\dependencies.props = build\dependencies.props
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		build\Key.snk = build\Key.snk
-		NuGet.config = NuGet.config
-		build\repo.props = build\repo.props
-		build\sources.props = build\sources.props
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{3A9A46EC-EECB-40D0-AA08-C9DC34B4C109}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "src\Microsoft.AspNetCore.Authorization.Policy\Microsoft.AspNetCore.Authorization.Policy.csproj", "{58194599-F07D-47A3-9DF2-E21A22C5EF9E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicrosoftAccount", "MicrosoftAccount", "{29AD5BD7-E651-494F-8947-3DBBD89A78E8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookiePolicySample", "samples\CookiePolicySample\CookiePolicySample.csproj", "{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.MicrosoftAccount", "Authentication\MicrosoftAccount\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj", "{EDA593EF-94B5-4934-BD82-D60E2E0BE037}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.WsFederation", "src\Microsoft.AspNetCore.Authentication.WsFederation\Microsoft.AspNetCore.Authentication.WsFederation.csproj", "{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{217500EE-F445-4026-B140-C2598BF011C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WsFedSample", "samples\WsFedSample\WsFedSample.csproj", "{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OAuth", "Authentication\OAuth\src\Microsoft.AspNetCore.Authentication.OAuth.csproj", "{CD98E208-7BD4-40AA-99C4-9428F86CB4EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenIdConnect", "OpenIdConnect", "{573F08AC-AA58-4640-BBDB-4BBC3B77CD42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIdConnect.AzureAdSample", "Authentication\OpenIdConnect\samples\OpenIdConnect.AzureAdSample\OpenIdConnect.AzureAdSample.csproj", "{F72615C6-247B-4174-B457-C1938E8752B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIdConnectSample", "Authentication\OpenIdConnect\samples\OpenIdConnectSample\OpenIdConnectSample.csproj", "{FD4B9AB2-CFF8-4F5B-B2A6-D3B3E6024F97}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OpenIdConnect", "Authentication\OpenIdConnect\src\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj", "{D716B232-B829-49CE-B2DF-1D4203C2552F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Twitter", "Twitter", "{62643112-48C3-4F31-8D44-75B43DB0CD03}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{F63BF7C2-DC33-4464-841E-1C9F8A40BEAA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WsFederation", "WsFederation", "{777DB7C3-3CB7-457D-8A76-B09BB6DC71BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WsFedSample", "Authentication\WsFederation\samples\WsFedSample\WsFedSample.csproj", "{B1386A87-D8CC-4238-8038-50A5321536CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.WsFederation", "Authentication\WsFederation\src\Microsoft.AspNetCore.Authentication.WsFederation.csproj", "{80B303B9-DD1F-4D1E-9E62-0F507CDFBC38}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{A3766414-EB5C-40F7-B031-121804ED5D0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{181A7396-1D0A-4ACA-A276-B620BD317E8B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{E165C115-B85D-407E-A2C2-0D3D734EDF20}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{B8469A11-026F-4186-B9E0-F6C6B1B9575D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{B6CA96E4-674A-4616-9A38-DED07BE458E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{54CBBAED-36D5-4855-BB4E-D1AE3523AA23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|x64.Build.0 = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|Any CPU.Build.0 = Release|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|x64.ActiveCfg = Release|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|x64.Build.0 = Release|Any CPU
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714}.Release|x86.ActiveCfg = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|x64.Build.0 = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|x64.ActiveCfg = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|x64.Build.0 = Release|Any CPU
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552}.Release|x86.ActiveCfg = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|x64.Build.0 = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|x64.ActiveCfg = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|x64.Build.0 = Release|Any CPU
-		{19711880-46DA-4A26-9E0F-9B2E41D27651}.Release|x86.ActiveCfg = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|x64.Build.0 = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Debug|x86.Build.0 = Debug|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|x64.ActiveCfg = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|x64.Build.0 = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|x86.ActiveCfg = Release|Any CPU
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B}.Release|x86.Build.0 = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|x64.Build.0 = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Debug|x86.Build.0 = Debug|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|x64.ActiveCfg = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|x64.Build.0 = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|x86.ActiveCfg = Release|Any CPU
-		{FC152CC4-054B-457E-8D91-389C5DE3C561}.Release|x86.Build.0 = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|x64.Build.0 = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Debug|x86.Build.0 = Debug|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|x64.ActiveCfg = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|x64.Build.0 = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|x86.ActiveCfg = Release|Any CPU
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB}.Release|x86.Build.0 = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|x64.Build.0 = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A}.Release|x86.Build.0 = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|x64.Build.0 = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Debug|x86.Build.0 = Debug|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|x64.ActiveCfg = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|x64.Build.0 = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|x86.ActiveCfg = Release|Any CPU
-		{76579C39-B829-490D-B8BE-1BD35FE8412E}.Release|x86.Build.0 = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|x64.Build.0 = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Debug|x86.Build.0 = Debug|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|x64.ActiveCfg = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|x64.Build.0 = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|x86.ActiveCfg = Release|Any CPU
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A}.Release|x86.Build.0 = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|x64.Build.0 = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE}.Release|x86.Build.0 = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|x64.Build.0 = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Debug|x86.Build.0 = Debug|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|x64.ActiveCfg = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|x64.Build.0 = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|x86.ActiveCfg = Release|Any CPU
-		{0330FFF6-B4B5-42DD-8C99-26A789569000}.Release|x86.Build.0 = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|x64.Build.0 = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Debug|x86.Build.0 = Debug|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|x64.ActiveCfg = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|x64.Build.0 = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|x86.ActiveCfg = Release|Any CPU
-		{1657C79E-7755-4AEE-9D61-571295B69A30}.Release|x86.Build.0 = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|x64.Build.0 = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Debug|x86.Build.0 = Debug|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|x64.ActiveCfg = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|x64.Build.0 = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|x86.ActiveCfg = Release|Any CPU
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B}.Release|x86.Build.0 = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|x64.Build.0 = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Debug|x86.Build.0 = Debug|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|x64.ActiveCfg = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|x64.Build.0 = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|x86.ActiveCfg = Release|Any CPU
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2}.Release|x86.Build.0 = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|x64.Build.0 = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Debug|x86.Build.0 = Debug|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|x64.ActiveCfg = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|x64.Build.0 = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|x86.ActiveCfg = Release|Any CPU
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB}.Release|x86.Build.0 = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|x64.Build.0 = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Debug|x86.Build.0 = Debug|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|x64.ActiveCfg = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|x64.Build.0 = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|x86.ActiveCfg = Release|Any CPU
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79}.Release|x86.Build.0 = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|x64.Build.0 = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Debug|x86.Build.0 = Debug|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|x64.ActiveCfg = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|x64.Build.0 = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|x86.ActiveCfg = Release|Any CPU
-		{1790E052-646F-4529-B90E-6FEA95520D69}.Release|x86.Build.0 = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x64.Build.0 = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Debug|x86.Build.0 = Debug|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x64.ActiveCfg = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x64.Build.0 = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x86.ActiveCfg = Release|Any CPU
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98}.Release|x86.Build.0 = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|x64.Build.0 = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Debug|x86.Build.0 = Debug|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|x64.ActiveCfg = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|x64.Build.0 = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|x86.ActiveCfg = Release|Any CPU
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957}.Release|x86.Build.0 = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|x64.Build.0 = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Debug|x86.Build.0 = Debug|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|x64.ActiveCfg = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|x64.Build.0 = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|x86.ActiveCfg = Release|Any CPU
-		{A7922DD8-09F1-43E4-938B-CC523EA08898}.Release|x86.Build.0 = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|x64.Build.0 = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Debug|x86.Build.0 = Debug|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|x64.ActiveCfg = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|x64.Build.0 = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|x86.ActiveCfg = Release|Any CPU
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24}.Release|x86.Build.0 = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|x64.Build.0 = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Debug|x86.Build.0 = Debug|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|x64.ActiveCfg = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|x64.Build.0 = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|x86.ActiveCfg = Release|Any CPU
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E}.Release|x86.Build.0 = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|x64.Build.0 = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Debug|x86.Build.0 = Debug|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|x64.ActiveCfg = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|x64.Build.0 = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|x86.ActiveCfg = Release|Any CPU
-		{51563775-C659-4907-9BAF-9995BAB87D01}.Release|x86.Build.0 = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|x64.Build.0 = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Debug|x86.Build.0 = Debug|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|x64.ActiveCfg = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|x64.Build.0 = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|x86.ActiveCfg = Release|Any CPU
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E}.Release|x86.Build.0 = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|x64.Build.0 = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Debug|x86.Build.0 = Debug|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|x64.ActiveCfg = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|x64.Build.0 = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|x86.ActiveCfg = Release|Any CPU
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E}.Release|x86.Build.0 = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|x64.Build.0 = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Debug|x86.Build.0 = Debug|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|x64.ActiveCfg = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|x64.Build.0 = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|x86.ActiveCfg = Release|Any CPU
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29}.Release|x86.Build.0 = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|x64.Build.0 = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Debug|x86.Build.0 = Debug|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|x64.ActiveCfg = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|x64.Build.0 = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|x86.ActiveCfg = Release|Any CPU
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800}.Release|x86.Build.0 = Release|Any CPU
+		{0B26AAC6-B8D9-4857-BF63-FED472BF07D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B26AAC6-B8D9-4857-BF63-FED472BF07D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B26AAC6-B8D9-4857-BF63-FED472BF07D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B26AAC6-B8D9-4857-BF63-FED472BF07D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1716DDD-6B5D-49AA-AC0C-69AEEB264E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1716DDD-6B5D-49AA-AC0C-69AEEB264E94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1716DDD-6B5D-49AA-AC0C-69AEEB264E94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1716DDD-6B5D-49AA-AC0C-69AEEB264E94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59727CCB-D4C6-4421-8469-F7891BFB6016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59727CCB-D4C6-4421-8469-F7891BFB6016}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59727CCB-D4C6-4421-8469-F7891BFB6016}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59727CCB-D4C6-4421-8469-F7891BFB6016}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75661B8D-0089-4EFF-A70E-F77318453003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75661B8D-0089-4EFF-A70E-F77318453003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75661B8D-0089-4EFF-A70E-F77318453003}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75661B8D-0089-4EFF-A70E-F77318453003}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B48C6EE8-BCFA-47A5-A837-30DC9C261D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B48C6EE8-BCFA-47A5-A837-30DC9C261D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B48C6EE8-BCFA-47A5-A837-30DC9C261D7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B48C6EE8-BCFA-47A5-A837-30DC9C261D7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFAA25DE-5AC1-4505-A874-1A4A521827EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFAA25DE-5AC1-4505-A874-1A4A521827EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFAA25DE-5AC1-4505-A874-1A4A521827EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFAA25DE-5AC1-4505-A874-1A4A521827EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37D7B212-5E9A-4489-B97A-74D6BE29787F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37D7B212-5E9A-4489-B97A-74D6BE29787F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37D7B212-5E9A-4489-B97A-74D6BE29787F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37D7B212-5E9A-4489-B97A-74D6BE29787F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFA0346F-61E1-496E-B844-AC485ED4682C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFA0346F-61E1-496E-B844-AC485ED4682C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFA0346F-61E1-496E-B844-AC485ED4682C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFA0346F-61E1-496E-B844-AC485ED4682C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56CDE112-CBBE-4997-935F-978ACB732D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56CDE112-CBBE-4997-935F-978ACB732D98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56CDE112-CBBE-4997-935F-978ACB732D98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56CDE112-CBBE-4997-935F-978ACB732D98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3C2076F-0618-46FE-A620-F25CD9217474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3C2076F-0618-46FE-A620-F25CD9217474}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3C2076F-0618-46FE-A620-F25CD9217474}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3C2076F-0618-46FE-A620-F25CD9217474}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6452E57B-532D-441C-AF4B-F9BB8BA53083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6452E57B-532D-441C-AF4B-F9BB8BA53083}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6452E57B-532D-441C-AF4B-F9BB8BA53083}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6452E57B-532D-441C-AF4B-F9BB8BA53083}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5303DB4-07FF-4440-9ADA-D3116BA66116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5303DB4-07FF-4440-9ADA-D3116BA66116}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5303DB4-07FF-4440-9ADA-D3116BA66116}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5303DB4-07FF-4440-9ADA-D3116BA66116}.Release|Any CPU.Build.0 = Release|Any CPU
+		{308E2FEF-C0D6-43D0-83FB-2A1CCB6BF4C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{308E2FEF-C0D6-43D0-83FB-2A1CCB6BF4C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{308E2FEF-C0D6-43D0-83FB-2A1CCB6BF4C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{308E2FEF-C0D6-43D0-83FB-2A1CCB6BF4C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AB2AFE9-7C0A-4466-B6F0-42997B251BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AB2AFE9-7C0A-4466-B6F0-42997B251BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AB2AFE9-7C0A-4466-B6F0-42997B251BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AB2AFE9-7C0A-4466-B6F0-42997B251BF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A110D33-787A-4C3B-B3A4-2024D235B9B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A110D33-787A-4C3B-B3A4-2024D235B9B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A110D33-787A-4C3B-B3A4-2024D235B9B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A110D33-787A-4C3B-B3A4-2024D235B9B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{970DD190-0880-43F5-8A34-0D08BF587698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{970DD190-0880-43F5-8A34-0D08BF587698}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{970DD190-0880-43F5-8A34-0D08BF587698}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{970DD190-0880-43F5-8A34-0D08BF587698}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E8A1A12-86D9-4DD1-B2B1-91AB905C4208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E8A1A12-86D9-4DD1-B2B1-91AB905C4208}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E8A1A12-86D9-4DD1-B2B1-91AB905C4208}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E8A1A12-86D9-4DD1-B2B1-91AB905C4208}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A9A46EC-EECB-40D0-AA08-C9DC34B4C109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A9A46EC-EECB-40D0-AA08-C9DC34B4C109}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A9A46EC-EECB-40D0-AA08-C9DC34B4C109}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A9A46EC-EECB-40D0-AA08-C9DC34B4C109}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDA593EF-94B5-4934-BD82-D60E2E0BE037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDA593EF-94B5-4934-BD82-D60E2E0BE037}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDA593EF-94B5-4934-BD82-D60E2E0BE037}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDA593EF-94B5-4934-BD82-D60E2E0BE037}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD98E208-7BD4-40AA-99C4-9428F86CB4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD98E208-7BD4-40AA-99C4-9428F86CB4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD98E208-7BD4-40AA-99C4-9428F86CB4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD98E208-7BD4-40AA-99C4-9428F86CB4EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F72615C6-247B-4174-B457-C1938E8752B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F72615C6-247B-4174-B457-C1938E8752B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F72615C6-247B-4174-B457-C1938E8752B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F72615C6-247B-4174-B457-C1938E8752B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD4B9AB2-CFF8-4F5B-B2A6-D3B3E6024F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD4B9AB2-CFF8-4F5B-B2A6-D3B3E6024F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD4B9AB2-CFF8-4F5B-B2A6-D3B3E6024F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD4B9AB2-CFF8-4F5B-B2A6-D3B3E6024F97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D716B232-B829-49CE-B2DF-1D4203C2552F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D716B232-B829-49CE-B2DF-1D4203C2552F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D716B232-B829-49CE-B2DF-1D4203C2552F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D716B232-B829-49CE-B2DF-1D4203C2552F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F63BF7C2-DC33-4464-841E-1C9F8A40BEAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F63BF7C2-DC33-4464-841E-1C9F8A40BEAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F63BF7C2-DC33-4464-841E-1C9F8A40BEAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F63BF7C2-DC33-4464-841E-1C9F8A40BEAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1386A87-D8CC-4238-8038-50A5321536CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1386A87-D8CC-4238-8038-50A5321536CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1386A87-D8CC-4238-8038-50A5321536CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1386A87-D8CC-4238-8038-50A5321536CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80B303B9-DD1F-4D1E-9E62-0F507CDFBC38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80B303B9-DD1F-4D1E-9E62-0F507CDFBC38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80B303B9-DD1F-4D1E-9E62-0F507CDFBC38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80B303B9-DD1F-4D1E-9E62-0F507CDFBC38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{181A7396-1D0A-4ACA-A276-B620BD317E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{181A7396-1D0A-4ACA-A276-B620BD317E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{181A7396-1D0A-4ACA-A276-B620BD317E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{181A7396-1D0A-4ACA-A276-B620BD317E8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E165C115-B85D-407E-A2C2-0D3D734EDF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E165C115-B85D-407E-A2C2-0D3D734EDF20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E165C115-B85D-407E-A2C2-0D3D734EDF20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E165C115-B85D-407E-A2C2-0D3D734EDF20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8469A11-026F-4186-B9E0-F6C6B1B9575D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8469A11-026F-4186-B9E0-F6C6B1B9575D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8469A11-026F-4186-B9E0-F6C6B1B9575D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8469A11-026F-4186-B9E0-F6C6B1B9575D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6CA96E4-674A-4616-9A38-DED07BE458E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6CA96E4-674A-4616-9A38-DED07BE458E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6CA96E4-674A-4616-9A38-DED07BE458E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6CA96E4-674A-4616-9A38-DED07BE458E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54CBBAED-36D5-4855-BB4E-D1AE3523AA23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54CBBAED-36D5-4855-BB4E-D1AE3523AA23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54CBBAED-36D5-4855-BB4E-D1AE3523AA23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54CBBAED-36D5-4855-BB4E-D1AE3523AA23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{558C2C2A-AED8-49DE-BB60-D5F8AE06C714} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{8C73D216-332D-41D8-BFD0-45BC4BC36552} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{19711880-46DA-4A26-9E0F-9B2E41D27651} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{BEF0F5C3-EF4E-4649-9C49-D5E279A3CA2B} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{FC152CC4-054B-457E-8D91-389C5DE3C561} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{BC0D4B56-1A5B-4D88-AFBF-68C0F2D545FB} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{EEAAEE68-607B-4E33-AF3E-45C66B4DBA5A} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{76579C39-B829-490D-B8BE-1BD35FE8412E} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{35115D55-B69E-46D4-BB33-C9E9E6EC5E7A} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{ACB45E19-F520-4D0C-8916-B0CEB9C017FE} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{0330FFF6-B4B5-42DD-8C99-26A789569000} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{1657C79E-7755-4AEE-9D61-571295B69A30} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{8DA26CD1-1302-4CFD-9270-9FA1B7C6138B} = {7BF11F3A-60B6-4796-B504-579C67FFBA34}
-		{7AF5AD96-EB6E-4D0E-8ABE-C0B543C0F4C2} = {7BF11F3A-60B6-4796-B504-579C67FFBA34}
-		{6AB3E514-5894-4131-9399-DC7D5284ADDB} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{86183DC3-02A8-4A68-8B60-71ECEC066E79} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{1790E052-646F-4529-B90E-6FEA95520D69} = {7BF11F3A-60B6-4796-B504-579C67FFBA34}
-		{2755BFE5-7421-4A31-A644-F817DF5CAA98} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{D399B84F-591B-4E98-92BA-B0F63E7B6957} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{A7922DD8-09F1-43E4-938B-CC523EA08898} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{A2B5DC39-68D5-4145-A8CC-6AEAB7D33A24} = {7BF11F3A-60B6-4796-B504-579C67FFBA34}
-		{3A7AD414-EBDE-4F92-B307-4E8F19B6117E} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{51563775-C659-4907-9BAF-9995BAB87D01} = {7BF11F3A-60B6-4796-B504-579C67FFBA34}
-		{58194599-F07D-47A3-9DF2-E21A22C5EF9E} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{24A28F5D-E5A9-4CA8-B0D2-924A1F8BE14E} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
-		{B1FC6AAF-9BF2-4CDA-84A2-AA8BF7603F29} = {4D2B6A51-2F9F-44F5-8131-EA5CAC053652}
-		{5EC2E398-E46A-430D-8E4B-E91C8FC3E800} = {F8C0AA27-F3FB-4286-8E4C-47EF86B539FF}
+		{0B26AAC6-B8D9-4857-BF63-FED472BF07D6} = {4F43243E-75D3-4979-8716-A13E34114959}
+		{D1716DDD-6B5D-49AA-AC0C-69AEEB264E94} = {4F43243E-75D3-4979-8716-A13E34114959}
+		{59727CCB-D4C6-4421-8469-F7891BFB6016} = {92358ECF-92AE-4F7F-A891-9FA603B77352}
+		{75661B8D-0089-4EFF-A70E-F77318453003} = {92358ECF-92AE-4F7F-A891-9FA603B77352}
+		{B48C6EE8-BCFA-47A5-A837-30DC9C261D7A} = {92358ECF-92AE-4F7F-A891-9FA603B77352}
+		{DFAA25DE-5AC1-4505-A874-1A4A521827EA} = {F6A3381D-978A-4CBF-BC72-862FB75CD6AF}
+		{37D7B212-5E9A-4489-B97A-74D6BE29787F} = {F6A3381D-978A-4CBF-BC72-862FB75CD6AF}
+		{DFA0346F-61E1-496E-B844-AC485ED4682C} = {F6A3381D-978A-4CBF-BC72-862FB75CD6AF}
+		{56CDE112-CBBE-4997-935F-978ACB732D98} = {79C549BA-2932-450A-B87D-635879361343}
+		{F3C2076F-0618-46FE-A620-F25CD9217474} = {79C549BA-2932-450A-B87D-635879361343}
+		{50CDE025-8520-4678-A061-0864AE6D73F0} = {79C549BA-2932-450A-B87D-635879361343}
+		{6452E57B-532D-441C-AF4B-F9BB8BA53083} = {50CDE025-8520-4678-A061-0864AE6D73F0}
+		{A5303DB4-07FF-4440-9ADA-D3116BA66116} = {50CDE025-8520-4678-A061-0864AE6D73F0}
+		{308E2FEF-C0D6-43D0-83FB-2A1CCB6BF4C3} = {50CDE025-8520-4678-A061-0864AE6D73F0}
+		{81A6D039-E75E-4C22-B34B-39E7B9FEF0B8} = {79C549BA-2932-450A-B87D-635879361343}
+		{4AB2AFE9-7C0A-4466-B6F0-42997B251BF1} = {81A6D039-E75E-4C22-B34B-39E7B9FEF0B8}
+		{D2F81383-5C44-4EE8-906D-B563E7DA4D21} = {79C549BA-2932-450A-B87D-635879361343}
+		{4A110D33-787A-4C3B-B3A4-2024D235B9B4} = {D2F81383-5C44-4EE8-906D-B563E7DA4D21}
+		{6FD578B7-E513-43FE-AA16-2FF43787CBD6} = {79C549BA-2932-450A-B87D-635879361343}
+		{970DD190-0880-43F5-8A34-0D08BF587698} = {6FD578B7-E513-43FE-AA16-2FF43787CBD6}
+		{A9B19067-9962-470C-BDE7-C2DD5A0CEC07} = {79C549BA-2932-450A-B87D-635879361343}
+		{8E8A1A12-86D9-4DD1-B2B1-91AB905C4208} = {A9B19067-9962-470C-BDE7-C2DD5A0CEC07}
+		{3A9A46EC-EECB-40D0-AA08-C9DC34B4C109} = {A9B19067-9962-470C-BDE7-C2DD5A0CEC07}
+		{29AD5BD7-E651-494F-8947-3DBBD89A78E8} = {79C549BA-2932-450A-B87D-635879361343}
+		{EDA593EF-94B5-4934-BD82-D60E2E0BE037} = {29AD5BD7-E651-494F-8947-3DBBD89A78E8}
+		{217500EE-F445-4026-B140-C2598BF011C3} = {79C549BA-2932-450A-B87D-635879361343}
+		{CD98E208-7BD4-40AA-99C4-9428F86CB4EA} = {217500EE-F445-4026-B140-C2598BF011C3}
+		{573F08AC-AA58-4640-BBDB-4BBC3B77CD42} = {79C549BA-2932-450A-B87D-635879361343}
+		{F72615C6-247B-4174-B457-C1938E8752B4} = {573F08AC-AA58-4640-BBDB-4BBC3B77CD42}
+		{FD4B9AB2-CFF8-4F5B-B2A6-D3B3E6024F97} = {573F08AC-AA58-4640-BBDB-4BBC3B77CD42}
+		{D716B232-B829-49CE-B2DF-1D4203C2552F} = {573F08AC-AA58-4640-BBDB-4BBC3B77CD42}
+		{62643112-48C3-4F31-8D44-75B43DB0CD03} = {79C549BA-2932-450A-B87D-635879361343}
+		{F63BF7C2-DC33-4464-841E-1C9F8A40BEAA} = {62643112-48C3-4F31-8D44-75B43DB0CD03}
+		{777DB7C3-3CB7-457D-8A76-B09BB6DC71BB} = {79C549BA-2932-450A-B87D-635879361343}
+		{B1386A87-D8CC-4238-8038-50A5321536CF} = {777DB7C3-3CB7-457D-8A76-B09BB6DC71BB}
+		{80B303B9-DD1F-4D1E-9E62-0F507CDFBC38} = {777DB7C3-3CB7-457D-8A76-B09BB6DC71BB}
+		{181A7396-1D0A-4ACA-A276-B620BD317E8B} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{E165C115-B85D-407E-A2C2-0D3D734EDF20} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{B8469A11-026F-4186-B9E0-F6C6B1B9575D} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{B6CA96E4-674A-4616-9A38-DED07BE458E1} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{54CBBAED-36D5-4855-BB4E-D1AE3523AA23} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{43AF597A-FCB8-41A5-8279-345FEE9A61AD} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{707CBFB4-4D35-479E-9BAF-39B4DA9782DE} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
+		{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D} = {A3766414-EB5C-40F7-B031-121804ED5D0A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ABF8089E-43D0-4010-84A7-7A9DCFE49357}
diff --git a/src/Security/build/Key.snk b/src/Security/build/Key.snk
deleted file mode 100644
index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000
Binary files a/src/Security/build/Key.snk and /dev/null differ
diff --git a/src/Security/build/dependencies.props b/src/Security/build/dependencies.props
deleted file mode 100644
index fb898d743ee3b6073b4eee50ffa76d54489b1ddf..0000000000000000000000000000000000000000
--- a/src/Security/build/dependencies.props
+++ /dev/null
@@ -1,57 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <!-- These package versions may be overridden or updated by automation. -->
-  <PropertyGroup Label="Package Versions: Auto">
-    <InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
-    <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
-    <MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
-    <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
-    <MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion>
-    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
-    <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
-    <XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion>
-    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
-  </PropertyGroup>
-
-  <!-- This may import a generated file which may override the variables above. -->
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-
-  <!-- These are package versions that should not be overridden or updated by automation. -->
-  <PropertyGroup Label="Package Versions: Pinned">
-    <MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
-    <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>2.1.1</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
-    <MicrosoftAspNetCoreDataProtectionPackageVersion>2.1.1</MicrosoftAspNetCoreDataProtectionPackageVersion>
-    <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.1</MicrosoftAspNetCoreDiagnosticsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>2.1.1</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.1.1</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
-    <MicrosoftAspNetCoreHttpPackageVersion>2.1.1</MicrosoftAspNetCoreHttpPackageVersion>
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.1</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.1</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>2.1.1</MicrosoftAspNetCoreTestHostPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.1.0</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>2.1.1</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.1.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.1.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.1</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>2.1.1</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>2.1.1</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsWebEncodersPackageVersion>2.1.1</MicrosoftExtensionsWebEncodersPackageVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/Security/build/repo.props b/src/Security/build/repo.props
deleted file mode 100644
index 2ae30982a62fa514adb1fd6ef4174ce80cbf6cca..0000000000000000000000000000000000000000
--- a/src/Security/build/repo.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <Import Project="dependencies.props" />
-
-  <ItemGroup>
-    <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.Owin.Security.Interop.Test\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/Security/build/sources.props b/src/Security/build/sources.props
deleted file mode 100644
index 9215df9751b4623d725e930464480ecb9a62065d..0000000000000000000000000000000000000000
--- a/src/Security/build/sources.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
-  <PropertyGroup Label="RestoreSources">
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
-</Project>
diff --git a/src/Security/samples/CookiePolicySample/CookiePolicySample.csproj b/src/Security/samples/CookiePolicySample/CookiePolicySample.csproj
deleted file mode 100644
index fb2e7d9172e21eb0899daf4b8e484bbb22c86a32..0000000000000000000000000000000000000000
--- a/src/Security/samples/CookiePolicySample/CookiePolicySample.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.CookiePolicy\Microsoft.AspNetCore.CookiePolicy.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/CookiePolicySample/Properties/launchSettings.json b/src/Security/samples/CookiePolicySample/Properties/launchSettings.json
deleted file mode 100644
index 38ca6fc37f15e608f7c819cf60044389d30b0845..0000000000000000000000000000000000000000
--- a/src/Security/samples/CookiePolicySample/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:1788/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "CookieSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:12345",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/CookieSample/CookieSample.csproj b/src/Security/samples/CookieSample/CookieSample.csproj
deleted file mode 100644
index 193137b861560f9e32ce1987a0182cb9eb0db9c6..0000000000000000000000000000000000000000
--- a/src/Security/samples/CookieSample/CookieSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(MicrosoftAspNetCoreDataProtectionPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/CookieSample/Properties/launchSettings.json b/src/Security/samples/CookieSample/Properties/launchSettings.json
deleted file mode 100644
index 38ca6fc37f15e608f7c819cf60044389d30b0845..0000000000000000000000000000000000000000
--- a/src/Security/samples/CookieSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:1788/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "CookieSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:12345",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/CookieSessionSample/CookieSessionSample.csproj b/src/Security/samples/CookieSessionSample/CookieSessionSample.csproj
deleted file mode 100644
index 6241edd667337aa2010d4c54dd7d1a9cf783bd83..0000000000000000000000000000000000000000
--- a/src/Security/samples/CookieSessionSample/CookieSessionSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(MicrosoftAspNetCoreDataProtectionPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/CookieSessionSample/Properties/launchSettings.json b/src/Security/samples/CookieSessionSample/Properties/launchSettings.json
deleted file mode 100644
index 25de3e478e2e517f9c27550afda21ce4f50926b8..0000000000000000000000000000000000000000
--- a/src/Security/samples/CookieSessionSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:1790/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "CookieSessionSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:12345",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/JwtBearerSample/JwtBearerSample.csproj b/src/Security/samples/JwtBearerSample/JwtBearerSample.csproj
deleted file mode 100644
index 84b436581a32dcc571222c325c79125b6bfbffa2..0000000000000000000000000000000000000000
--- a/src/Security/samples/JwtBearerSample/JwtBearerSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-    <UserSecretsId>aspnet5-JwtBearerSample-20151210102827</UserSecretsId>
- </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.JwtBearer\Microsoft.AspNetCore.Authentication.JwtBearer.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/JwtBearerSample/Properties/launchSettings.json b/src/Security/samples/JwtBearerSample/Properties/launchSettings.json
deleted file mode 100644
index 6922375c98f503122c6c20fbf0e13eb62d4ca8ff..0000000000000000000000000000000000000000
--- a/src/Security/samples/JwtBearerSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:42023",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "JwtBearer": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:42023",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj b/src/Security/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
deleted file mode 100644
index b14b9590f5810e367803da2dfe6e2f013b4ba894..0000000000000000000000000000000000000000
--- a/src/Security/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-    <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/OpenIdConnect.AzureAdSample/Properties/launchSettings.json b/src/Security/samples/OpenIdConnect.AzureAdSample/Properties/launchSettings.json
deleted file mode 100644
index e6436fee2a776148b3c3df523588a7db2102ee84..0000000000000000000000000000000000000000
--- a/src/Security/samples/OpenIdConnect.AzureAdSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:42023",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "OpenIdConnect": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:42023",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/src/Security/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
deleted file mode 100644
index 23e87d4f2a31ab95164710cb6f87496ab5dbaf7b..0000000000000000000000000000000000000000
--- a/src/Security/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-    <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="compiler\resources\cert.pfx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(MicrosoftAspNetCoreServerKestrelHttpsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="compiler\resources\cert.pfx" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/OpenIdConnectSample/Properties/launchSettings.json b/src/Security/samples/OpenIdConnectSample/Properties/launchSettings.json
deleted file mode 100644
index 058fa4c5ddc6d0af0e16983bbb585b7bdd12603a..0000000000000000000000000000000000000000
--- a/src/Security/samples/OpenIdConnectSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:42023",
-      "sslPort": 44318
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "https://localhost:44318/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "OpenIdConnectSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44318/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/SocialSample/Properties/launchSettings.json b/src/Security/samples/SocialSample/Properties/launchSettings.json
deleted file mode 100644
index 30bf2e5f6aafeb215fafbc83982e5bfb01cd7de6..0000000000000000000000000000000000000000
--- a/src/Security/samples/SocialSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:54540",
-      "sslPort": 44318
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "https://localhost:44318/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "SocialSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44318/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/SocialSample/SocialSample.csproj b/src/Security/samples/SocialSample/SocialSample.csproj
deleted file mode 100644
index a423ae21a3649e00adda71f054ab6c84d13252b8..0000000000000000000000000000000000000000
--- a/src/Security/samples/SocialSample/SocialSample.csproj
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
-    <UserSecretsId>aspnet5-SocialSample-20151210111056</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="compiler\resources\cert.pfx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="compiler\resources\cert.pfx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Facebook\Microsoft.AspNetCore.Authentication.Facebook.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Google\Microsoft.AspNetCore.Authentication.Google.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Twitter\Microsoft.AspNetCore.Authentication.Twitter.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(MicrosoftAspNetCoreDataProtectionPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(MicrosoftAspNetCoreServerKestrelHttpsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/samples/WsFedSample/Properties/launchSettings.json b/src/Security/samples/WsFedSample/Properties/launchSettings.json
deleted file mode 100644
index bdf80e2481812201b45eff1a811fa02fec9bf003..0000000000000000000000000000000000000000
--- a/src/Security/samples/WsFedSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44307/",
-      "sslPort": 44318
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "https://localhost:44307/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "WsFedSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44307/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Security/samples/WsFedSample/WsFedSample.csproj b/src/Security/samples/WsFedSample/WsFedSample.csproj
deleted file mode 100644
index bc3a59f10e21b13876ecf5ec8024d649e7e83c18..0000000000000000000000000000000000000000
--- a/src/Security/samples/WsFedSample/WsFedSample.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.WsFederation\Microsoft.AspNetCore.Authentication.WsFederation.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(MicrosoftAspNetCoreServerKestrelHttpsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="compiler\resources\cert.pfx" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/src/Directory.Build.props b/src/Security/src/Directory.Build.props
deleted file mode 100644
index 1e0980f6633128f6a6752d555891691665616d7a..0000000000000000000000000000000000000000
--- a/src/Security/src/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
deleted file mode 100644
index 4edb55cb356a3a0dd253c01bdd32dc2f28d753f9..0000000000000000000000000000000000000000
--- a/src/Security/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>ASP.NET Core middleware that enables an application to support the WsFederation authentication workflow.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;authentication;security</PackageTags>
-  </PropertyGroup>
-
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="$(MicrosoftIdentityModelProtocolsWsFederationPackageVersion)" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj b/src/Security/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
deleted file mode 100644
index ce5b4c6f9384fb208de03846f21cd48ae9210d60..0000000000000000000000000000000000000000
--- a/src/Security/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;authentication;security</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)SecurityHelper\**\*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(MicrosoftAspNetCoreAuthenticationCorePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(MicrosoftAspNetCoreDataProtectionPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(MicrosoftAspNetCoreHttpExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/test/Directory.Build.props b/src/Security/test/Directory.Build.props
deleted file mode 100644
index b842a48317fee794a7d6c96c7e57990986b46134..0000000000000000000000000000000000000000
--- a/src/Security/test/Directory.Build.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
-    <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms);netcoreapp2.0</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
deleted file mode 100644
index 6c8d518ffa98e2fde1035ee00dab3e55503ef306..0000000000000000000000000000000000000000
--- a/src/Security/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="OpenIdConnect\wellknownconfig.json" />
-    <None Remove="OpenIdConnect\wellknownkeys.json" />
-    <None Remove="WsFederation\federationmetadata.xml" />
-    <None Remove="WsFederation\InvalidToken.xml" />
-    <None Remove="WsFederation\ValidToken.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="WsFederation\federationmetadata.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WsFederation\InvalidToken.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WsFederation\ValidToken.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="OpenIdConnect\wellknownconfig.json" />
-    <EmbeddedResource Include="OpenIdConnect\wellknownkeys.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Facebook\Microsoft.AspNetCore.Authentication.Facebook.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Google\Microsoft.AspNetCore.Authentication.Google.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.JwtBearer\Microsoft.AspNetCore.Authentication.JwtBearer.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Twitter\Microsoft.AspNetCore.Authentication.Twitter.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.WsFederation\Microsoft.AspNetCore.Authentication.WsFederation.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj b/src/Security/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
deleted file mode 100644
index d4379c3aab8d78d9feec9cabc3167735d74e7fee..0000000000000000000000000000000000000000
--- a/src/Security/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authorization\Microsoft.AspNetCore.Authorization.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authorization.Policy\Microsoft.AspNetCore.Authorization.Policy.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj b/src/Security/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
deleted file mode 100644
index 20cd400ce782743c90d1135627ccfab56301083b..0000000000000000000000000000000000000000
--- a/src/Security/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\shared\Microsoft.AspNetCore.ChunkingCookieManager.Sources\**\*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
deleted file mode 100644
index d7a42f3efb69d495b7d8f0a62fde49f23e13b9b4..0000000000000000000000000000000000000000
--- a/src/Security/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.CookiePolicy\Microsoft.AspNetCore.CookiePolicy.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj b/src/Security/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
deleted file mode 100644
index f369f1f01ad7524f20a3754ddf0ab59bb7612ab6..0000000000000000000000000000000000000000
--- a/src/Security/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.Owin.Security.Interop\Microsoft.Owin.Security.Interop.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
-    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="$(MicrosoftOwinSecurityCookiesPackageVersion)" />
-    <PackageReference Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Security/version.props b/src/Security/version.props
deleted file mode 100644
index 478dfd16edb0f170c60ceb33a37a7ae8c330b42d..0000000000000000000000000000000000000000
--- a/src/Security/version.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <VersionPrefix>2.1.2</VersionPrefix>
-    <VersionSuffix>rtm</VersionSuffix>
-    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
-    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
-    <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
-    <FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-  </PropertyGroup>
-</Project>
diff --git a/src/Security/shared/Microsoft.AspNetCore.ChunkingCookieManager.Sources/ChunkingCookieManager.cs b/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs
similarity index 100%
rename from src/Security/shared/Microsoft.AspNetCore.ChunkingCookieManager.Sources/ChunkingCookieManager.cs
rename to src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs