diff --git a/Directory.Build.props b/Directory.Build.props
index 3b0e6e9dd3..5f7322d556 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -108,6 +108,11 @@
 
   <Import Project="build\tasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />
 
+  <PropertyGroup>
+    <!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. -->
+    <MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
+  </PropertyGroup>
+
   <Import Project="eng\Dependencies.props" />
   <Import Project="eng\PatchConfig.props" />
   <Import Project="eng\ProjectReferences.props" />
diff --git a/Directory.Build.targets b/Directory.Build.targets
index aee13e9520..ba56410650 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -34,7 +34,8 @@
 
   <PropertyGroup Condition=" '$(IsPackageInThisPatch)' != 'true' AND '$(BaselinePackageVersion)' != '' AND '$(IsServicingBuild)' == 'true' ">
     <!-- This keeps assembly and package versions consistent across patches. If a package is not included in a patch, its version should stay at the baseline. -->
-    <AssemblyVersion>$(BaselinePackageVersion).0</AssemblyVersion>
+    <AssemblyVersion Condition="$(BaselinePackageVersion.Contains('-'))">$(BaselinePackageVersion.Substring(0, $(BaselinePackageVersion.IndexOf('-')))).0</AssemblyVersion>
+    <AssemblyVersion Condition="! $(BaselinePackageVersion.Contains('-'))">$(BaselinePackageVersion).0</AssemblyVersion>
     <!--
       Ideally, we would also set the project version to match the baseline in case NuGet turns a ProjectReference into a nuspec depenendency, but
       NuGet does not currently handle conflicts between packages and projects which have the same package id/version.
@@ -50,6 +51,9 @@
     <!-- Implementation projects are the projects which produce nuget packages or shipping assemblies. -->
     <IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsTestAssetProject)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</IsImplementationProject>
 
+    <!-- This determines whether a project is available as a <Reference> to other projects in this repo. -->
+    <IsProjectReferenceProvider Condition=" '$(IsProjectReferenceProvider)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(PackAsTool)' != 'true' ">true</IsProjectReferenceProvider>
+
     <!-- Suppress KoreBuild warnings about the mismatch of repo version and local project version. The versioning in this mega repo is sufficiently complicated that KoreBuild's validation isn't helpful. -->
     <VerifyVersion>false</VerifyVersion>
 
@@ -61,6 +65,7 @@
     <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
   </PropertyGroup>
 
+  <Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
   <Import Project="eng\targets\Cpp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
   <Import Project="eng\targets\CSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
   <Import Project="eng\targets\FSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 02766b587b..40f54b75a6 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -7,8 +7,6 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="AADIntegration" Order="15" />
-    <RepositoryBuildOrder Include="Identity" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 9084ed7da5..cf12a4d0a5 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -142,9 +142,9 @@
     <DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
     <DevDependency_WindowsAzureStoragePackageVersion>8.7.0</DevDependency_WindowsAzureStoragePackageVersion>
     <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
-    <IdentityServer4PackageVersion>2.3.0-preview1-update2</IdentityServer4PackageVersion>
-    <IdentityServer4AspNetIdentityPackageVersion>2.3.0-preview1-update2</IdentityServer4AspNetIdentityPackageVersion>
-    <IdentityServer4EntityFrameworkPackageVersion>2.3.0-preview1-update1</IdentityServer4EntityFrameworkPackageVersion>
+    <IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion>
+    <IdentityServer4EntityFrameworkPackageVersion>2.3.0</IdentityServer4EntityFrameworkPackageVersion>
+    <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion>
     <GoogleProtobufPackageVersion>3.1.0</GoogleProtobufPackageVersion>
     <LibuvPackageVersion>1.10.0</LibuvPackageVersion>
     <MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion>
diff --git a/build/repo.props b/build/repo.props
index 10d5859796..28b1b9b521 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -113,6 +113,7 @@
                           $(RepositoryRoot)src\Hosting\**\*.*proj;
                           $(RepositoryRoot)src\Http\**\*.*proj;
                           $(RepositoryRoot)src\Html\**\*.*proj;
+                          $(RepositoryRoot)src\Identity\**\*.*proj;
                           $(RepositoryRoot)src\Servers\**\*.csproj;
                           $(RepositoryRoot)src\Security\**\*.*proj;
                           $(RepositoryRoot)src\Shared\**\*.*proj;
@@ -120,6 +121,7 @@
                           $(RepositoryRoot)src\Middleware\**\*.*proj;
                           $(RepositoryRoot)src\Razor\**\*.*proj;
                           $(RepositoryRoot)src\Mvc\**\*.*proj;
+                          $(RepositoryRoot)src\Azure\**\*.*proj;
                           "
                         Exclude="
                           @(ProjectToExclude);
diff --git a/build/submodules.props b/build/submodules.props
index 3a40bfd546..1e3f1e940c 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -36,10 +36,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Repository Include="AADIntegration" />
     <Repository Include="AzureIntegration" />
     <Repository Include="Components" />
-    <Repository Include="Identity" />
     <Repository Include="SignalR" />
     <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
 
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 97c6030bdb..c6897f1048 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -31,6 +31,19 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.2.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.2.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.ApiAuthorization.IdentityServer-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' ">
+    <BaselinePackageVersion>2.2.0-preview-35687</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="IdentityServer4" Version="[2.3.0-preview1-update2, )" />
+    <BaselinePackageReference Include="IdentityServer4.AspNetIdentity" Version="[2.3.0-preview1-update2, )" />
+    <BaselinePackageReference Include="IdentityServer4.EntityFramework" Version="[2.3.0-preview1-update1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
     <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -48,6 +61,26 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.AzureAD.UI-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Authentication.AzureADB2C.UI-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Cookies-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' ">
     <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -424,6 +457,48 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.2.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity.EntityFrameworkCore-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[2.2.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity.Specification.Tests-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="xunit.assert" Version="[2.3.1, )" />
+    <BaselinePackageReference Include="xunit.extensibility.core" Version="[2.3.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity.UI-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[2.2.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.JsonPatch-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
     <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -997,6 +1072,25 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[2.2.0, )" />
     <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[2.2.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.Extensions.Identity.Core-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.Extensions.Identity.Stores-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' ">
+    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.Net.Http.Headers-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' ">
     <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 35443b912e..844316c164 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -10,9 +10,12 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
   <Package Id="dotnet-user-secrets" Version="2.2.0" />
   <Package Id="dotnet-watch" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
   <Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.2.0" />
@@ -55,6 +58,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Http" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Identity" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.2.0" />
   <Package Id="Microsoft.AspNetCore.Localization" Version="2.2.0" />
@@ -106,6 +113,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore" Version="2.2.0" />
   <Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />
   <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
+  <Package Id="Microsoft.Extensions.Identity.Core" Version="2.2.0" />
+  <Package Id="Microsoft.Extensions.Identity.Stores" Version="2.2.0" />
   <Package Id="Microsoft.Net.Http.Headers" Version="2.2.0" />
   <Package Id="Microsoft.Net.Sdk.Razor" Version="2.2.0" />
   <Package Id="Microsoft.Owin.Security.Interop" Version="2.2.0" />
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 55dd265f52..543f37c989 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -33,7 +33,9 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />
@@ -121,6 +123,9 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiClientPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Azure.KeyVault" Version="2.3.2" />
     <LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
+    <LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
+    <LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />
     <LatestPackageReference Include="Moq" Version="4.10.0" />
     <LatestPackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" />
     <!-- This version is required by MSBuild tasks or Visual Studio extensions. -->
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 0fbe7ba286..a701158e7e 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -35,6 +35,13 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing" ProjectPath="$(RepositoryRoot)src\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.WebUtilities" ProjectPath="$(RepositoryRoot)src\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" ProjectPath="$(RepositoryRoot)src\Identity\ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity" ProjectPath="$(RepositoryRoot)src\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" ProjectPath="$(RepositoryRoot)src\Identity\EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.Identity.Core" ProjectPath="$(RepositoryRoot)src\Identity\Extensions.Core\src\Microsoft.Extensions.Identity.Core.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.Identity.Stores" ProjectPath="$(RepositoryRoot)src\Identity\Extensions.Stores\src\Microsoft.Extensions.Identity.Stores.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepositoryRoot)src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.UI" ProjectPath="$(RepositoryRoot)src\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
@@ -60,10 +67,6 @@
     <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="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" />
-    <ProjectReferenceProvider Include="dotnet-watch" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-watch\src\dotnet-watch.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepositoryRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Cors" ProjectPath="$(RepositoryRoot)src\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj" />
@@ -106,5 +109,7 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ViewFeatures" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Servers/IIS/ResolveIisReferences.targets b/eng/targets/ResolveIisReferences.targets
similarity index 73%
rename from src/Servers/IIS/ResolveIisReferences.targets
rename to eng/targets/ResolveIisReferences.targets
index cb4b5ebf1f..0449352d7b 100644
--- a/src/Servers/IIS/ResolveIisReferences.targets
+++ b/eng/targets/ResolveIisReferences.targets
@@ -10,19 +10,19 @@ with the right MSBuild incantations to get output copied to the right place.
     <When Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">
       <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModule'))' == 'true' ">
         <Reference Remove="AspNetCoreModule" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64"  />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x86"  />
       </ItemGroup>
 
       <ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' ">
         <Reference Remove="AspNetCoreModuleV2" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"  Platform="x64" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0"  Platform="x64" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"  Platform="x64" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj"  Platform="x64" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0"  Platform="x64" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj"  Platform="x64" />
 
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x86" />
-        <NativeProjectReference Include="$(MSBuildThisFileDirectory)AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x86" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x86" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x86" />
+        <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x86" />
       </ItemGroup>
 
       <ItemGroup Condition="@(NativeProjectReference->Count()) != 0 AND '$(BuildNative)' != 'false' ">
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index da076a33ca..03d40146ca 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -165,7 +165,7 @@
   </Target>
 
   <Target Name="_GetReferencesProvided" Returns="@(ProvidesReference)">
-    <ItemGroup Condition=" '$(IsImplementationProject)' == 'true' OR '$(IsProjectReferenceProvider)' == 'true' ">
+    <ItemGroup Condition=" '$(IsProjectReferenceProvider)' == 'true' ">
       <ProvidesReference Include="$(AssemblyName)">
         <ProjectFileRelativePath>$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectFullPath)))</ProjectFileRelativePath>
       </ProvidesReference>
diff --git a/src/AADIntegration/.gitignore b/src/AADIntegration/.gitignore
deleted file mode 100644
index e38f0aa101..0000000000
--- a/src/AADIntegration/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-[Oo]bj/
-[Bb]in/
-TestResults/
-.nuget/
-.build/
-.testPublish/
-*.sln.ide/
-_ReSharper.*/
-packages/
-artifacts/
-PublishProfiles/
-.vs/
-bower_components/
-node_modules/
-debugSettings.json
-project.lock.json
-*.user
-*.suo
-*.cache
-*.docstates
-_ReSharper.*
-nuget.exe
-*net45.csproj
-*net451.csproj
-*k10.csproj
-*.psess
-*.vsp
-*.pidb
-*.userprefs
-*DS_Store
-*.ncrunchsolution
-*.*sdf
-*.ipch
-.settings
-*.sln.ide
-node_modules
-*launchSettings.json
-*.orig
-.vscode/
-global.json
-BenchmarkDotNet.Artifacts/
-.idea/
-msbuild.binlog
diff --git a/src/AADIntegration/AADIntegration.sln b/src/AADIntegration/AADIntegration.sln
deleted file mode 100644
index 2ed6ef8876..0000000000
--- a/src/AADIntegration/AADIntegration.sln
+++ /dev/null
@@ -1,79 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{75A812B0-D98C-45F3-B2A9-357BBDF7331A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8CF63E1D-F9F7-4CB4-AD90-88C4077F7BFF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{57F46508-E53D-4F6B-B77C-2EFE95925AEF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "samples\AzureADB2CSample\AzureADB2CSample.csproj", "{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI", "src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj", "{16912327-C9B3-49FC-87E0-49FEDED0A065}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{454089F9-ED16-4A11-9C52-2BA74DCF5D35}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI", "src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj", "{1762840C-A14A-4498-9883-CC671956F0F2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI.Test", "test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj", "{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "test\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{1967296B-614B-43E5-B1BA-A601579961D5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{2AEF59C3-7ADA-404D-B965-26B700FBD03F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAD.WebSite", "test\WebSites\AzureAD.WebSite\AzureAD.WebSite.csproj", "{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16912327-C9B3-49FC-87E0-49FEDED0A065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16912327-C9B3-49FC-87E0-49FEDED0A065}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16912327-C9B3-49FC-87E0-49FEDED0A065}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16912327-C9B3-49FC-87E0-49FEDED0A065}.Release|Any CPU.Build.0 = Release|Any CPU
-		{454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1762840C-A14A-4498-9883-CC671956F0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1762840C-A14A-4498-9883-CC671956F0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1762840C-A14A-4498-9883-CC671956F0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1762840C-A14A-4498-9883-CC671956F0F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1967296B-614B-43E5-B1BA-A601579961D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1967296B-614B-43E5-B1BA-A601579961D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1967296B-614B-43E5-B1BA-A601579961D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1967296B-614B-43E5-B1BA-A601579961D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C} = {8CF63E1D-F9F7-4CB4-AD90-88C4077F7BFF}
-		{16912327-C9B3-49FC-87E0-49FEDED0A065} = {75A812B0-D98C-45F3-B2A9-357BBDF7331A}
-		{454089F9-ED16-4A11-9C52-2BA74DCF5D35} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF}
-		{1762840C-A14A-4498-9883-CC671956F0F2} = {75A812B0-D98C-45F3-B2A9-357BBDF7331A}
-		{3D0CF896-3A9D-4A8F-A343-A2E1A131C861} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF}
-		{1967296B-614B-43E5-B1BA-A601579961D5} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF}
-		{2AEF59C3-7ADA-404D-B965-26B700FBD03F} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF}
-		{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316} = {2AEF59C3-7ADA-404D-B965-26B700FBD03F}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C6DBF56C-E862-46EA-A4E0-993D2950D78D}
-	EndGlobalSection
-EndGlobal
diff --git a/src/AADIntegration/Directory.Build.props b/src/AADIntegration/Directory.Build.props
deleted file mode 100644
index 1c968415ec..0000000000
--- a/src/AADIntegration/Directory.Build.props
+++ /dev/null
@@ -1,29 +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 AAD Integration</Product>
-    <RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <!-- Artifacts layout -->
-  <PropertyGroup>
-    <ArtifactsDir>$(MSBuildThisFileDirectory)..\..\artifacts\</ArtifactsDir>
-    <ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
-    <BasePackageOutputPath>$(ArtifactsConfigurationDir)packages\</BasePackageOutputPath>
-    <ProductPackageOutputPath>$(BasePackageOutputPath)product\</ProductPackageOutputPath>
-    <InternalPackageOutputPath>$(BasePackageOutputPath)internal\</InternalPackageOutputPath>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/AADIntegration/Directory.Build.targets b/src/AADIntegration/Directory.Build.targets
deleted file mode 100644
index f5a3f65909..0000000000
--- a/src/AADIntegration/Directory.Build.targets
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!--
-      By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
-      Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
-    -->
-    <IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
-
-    <PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
-    <PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/AADIntegration/NuGetPackageVerifier.json b/src/AADIntegration/NuGetPackageVerifier.json
deleted file mode 100644
index 66afb69831..0000000000
--- a/src/AADIntegration/NuGetPackageVerifier.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "Default": {
-        "rules": [
-            "DefaultCompositeRule"
-        ],
-        "packages": {
-            "Microsoft.AspNetCore.Authentication.AzureADB2C.UI": {
-                "Exclusions": {
-                    "DOC_MISSING": {
-                        "lib/netcoreapp3.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views."
-                    }
-                }
-            },
-            "Microsoft.AspNetCore.Authentication.AzureAD.UI": {
-                "Exclusions": {
-                    "DOC_MISSING": {
-                        "lib/netcoreapp3.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views."
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/AADIntegration/README.md b/src/AADIntegration/README.md
deleted file mode 100644
index 5155df07d9..0000000000
--- a/src/AADIntegration/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-ASP.NET Core Azure Active Directory Integration
-===
-
-<!-- AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/969jbosi0qwc1awg/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/aadintegration/branch/dev)
-
-Travis:   [![Travis](https://travis-ci.org/aspnet/AADIntegration.svg?branch=dev)](https://travis-ci.org/aspnet/aadintegration) -->
-
-ASP.NET Core Azure Active Directory Integration provides seamless authentication integration with different Azure Active Directory services like Azure Active Directory and Azure Active Directory B2C for ASP.NET Core applications.
-
-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.
-
-## Building from source
-
-To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details.
diff --git a/src/AADIntegration/build/dependencies.props b/src/AADIntegration/build/dependencies.props
deleted file mode 100644
index 08ac3b8428..0000000000
--- a/src/AADIntegration/build/dependencies.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreHttpsPolicyPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
-    <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
-    <MicrosoftAspNetCoreMvcTestingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcTestingPackageVersion>
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-18579-0056</MicrosoftNETSdkRazorPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MoqPackageVersion>4.10.0</MoqPackageVersion>
-    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
-    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="Package Versions: Pinned" />
-
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-</Project>
diff --git a/src/AADIntegration/build/repo.props b/src/AADIntegration/build/repo.props
deleted file mode 100644
index 744ce282f7..0000000000
--- a/src/AADIntegration/build/repo.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <Import Project="dependencies.props" />
-
-  <PropertyGroup>
-    <OverridePackageOutputPath>false</OverridePackageOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/AADIntegration/build/sources.props b/src/AADIntegration/build/sources.props
deleted file mode 100644
index f23d255142..0000000000
--- a/src/AADIntegration/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>
\ No newline at end of file
diff --git a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj
deleted file mode 100644
index 1e4e228ccf..0000000000
--- a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RazorCompileOnBuild>true</RazorCompileOnBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="$(MicrosoftAspNetCoreHttpsPolicyPackageVersion)" />
-    <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.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json b/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json
deleted file mode 100644
index 1ee213cd17..0000000000
--- a/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:59364/",
-      "sslPort": 44315
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "AzureADB2CSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:44315/;http://localhost:59364/"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/AADIntegration/src/Directory.Build.props b/src/AADIntegration/src/Directory.Build.props
deleted file mode 100644
index 4b89a431e7..0000000000
--- a/src/AADIntegration/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/AADIntegration/test/Directory.Build.props b/src/AADIntegration/test/Directory.Build.props
deleted file mode 100644
index 35b63d60ae..0000000000
--- a/src/AADIntegration/test/Directory.Build.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AADIntegration.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
deleted file mode 100644
index be07303a4c..0000000000
--- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WebSites\AzureAD.WebSite\AzureAD.WebSite.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCoreMvcTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj
deleted file mode 100644
index b23f727ae3..0000000000
--- a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftAspNetCoreAuthorizationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <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.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/AADIntegration/test/WebSites/Directory.Build.props b/src/AADIntegration/test/WebSites/Directory.Build.props
deleted file mode 100644
index c8a4ec4440..0000000000
--- a/src/AADIntegration/test/WebSites/Directory.Build.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-  <!-- Skip the parent directory so test websites do not get the test package references. -->
-  <Import Project="..\..\Directory.Build.props" />
-</Project>
diff --git a/src/AADIntegration/version.props b/src/AADIntegration/version.props
deleted file mode 100644
index e796179bb9..0000000000
--- a/src/AADIntegration/version.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <VersionPrefix>3.0.0</VersionPrefix>
-    <ExperimentalProjectVersionPrefix>0.5.0</ExperimentalProjectVersionPrefix>
-    <VersionSuffix>alpha1</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>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-  </PropertyGroup>
-</Project>
diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln
new file mode 100644
index 0000000000..56ef0ae6f2
--- /dev/null
+++ b/src/Azure/Azure.sln
@@ -0,0 +1,284 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAD", "AzureAD", "{B931802A-45BB-49A4-9919-B36C827100AC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureAD.UI", "Authentication.AzureAD.UI", "{312795E1-D5E2-4021-8FEA-342CA6F14CC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI", "AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj", "{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI.Test", "AzureAD\Authentication.AzureAD.UI\test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj", "{06817D18-5694-454E-A010-CDAECD8AF89B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureADB2C.UI", "Authentication.AzureADB2C.UI", "{79FE11AB-8D1E-4DEF-81C0-9B352769BFA4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI", "AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj", "{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "AzureAD\Authentication.AzureADB2C.UI\test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A28A64CA-297E-4023-895A-483DFDA59FBE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "AzureAD\samples\AzureADB2CSample\AzureADB2CSample.csproj", "{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F4F1E3C9-38E5-49EC-8688-A2D16AA8807B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "AzureAD\test\FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{0F577D33-2EA4-4182-9D89-2EFB022A2835}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAD.WebSite", "AzureAD\test\testassets\AzureAD.WebSite\AzureAD.WebSite.csproj", "{84E67496-B000-4AAD-9626-2135F677C4F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{84622717-F98A-4DE2-806E-1EF89C45C0EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{B1385496-607F-4573-ABE9-D9FE88D96DB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6EFFA596-23E7-498C-8D5E-331C6D8E945D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{240BBDB1-3501-4637-8A17-996EA4EBB20B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x64.Build.0 = Debug|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x86.Build.0 = Debug|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x64.ActiveCfg = Release|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x64.Build.0 = Release|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x86.ActiveCfg = Release|Any CPU
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x86.Build.0 = Release|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x64.Build.0 = Debug|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x86.Build.0 = Debug|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x64.ActiveCfg = Release|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x64.Build.0 = Release|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x86.ActiveCfg = Release|Any CPU
+		{06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x86.Build.0 = Release|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x64.Build.0 = Debug|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x86.Build.0 = Debug|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x64.ActiveCfg = Release|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x64.Build.0 = Release|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x86.ActiveCfg = Release|Any CPU
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x86.Build.0 = Release|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x64.Build.0 = Release|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x86.Build.0 = Release|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x64.Build.0 = Debug|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x86.Build.0 = Debug|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x64.ActiveCfg = Release|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x64.Build.0 = Release|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x86.ActiveCfg = Release|Any CPU
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x86.Build.0 = Release|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x64.Build.0 = Debug|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x86.Build.0 = Debug|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x64.ActiveCfg = Release|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x64.Build.0 = Release|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x86.Build.0 = Release|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x64.Build.0 = Release|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x86.Build.0 = Release|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x64.Build.0 = Debug|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x64.ActiveCfg = Release|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x64.Build.0 = Release|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x86.Build.0 = Release|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x64.Build.0 = Debug|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x86.Build.0 = Debug|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x64.ActiveCfg = Release|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x64.Build.0 = Release|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x86.Build.0 = Release|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x86.Build.0 = Debug|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x64.Build.0 = Release|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x86.Build.0 = Release|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x64.Build.0 = Release|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x86.Build.0 = Release|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x64.Build.0 = Release|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x86.Build.0 = Release|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x64.Build.0 = Debug|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x86.Build.0 = Debug|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x64.ActiveCfg = Release|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x64.Build.0 = Release|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x86.ActiveCfg = Release|Any CPU
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x86.Build.0 = Release|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x64.Build.0 = Debug|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x86.Build.0 = Debug|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x64.ActiveCfg = Release|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x64.Build.0 = Release|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x86.ActiveCfg = Release|Any CPU
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x86.Build.0 = Release|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x64.Build.0 = Debug|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x86.Build.0 = Debug|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x64.ActiveCfg = Release|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x64.Build.0 = Release|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x86.ActiveCfg = Release|Any CPU
+		{88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x86.Build.0 = Release|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.Build.0 = Release|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{312795E1-D5E2-4021-8FEA-342CA6F14CC8} = {B931802A-45BB-49A4-9919-B36C827100AC}
+		{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58} = {312795E1-D5E2-4021-8FEA-342CA6F14CC8}
+		{06817D18-5694-454E-A010-CDAECD8AF89B} = {312795E1-D5E2-4021-8FEA-342CA6F14CC8}
+		{79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} = {B931802A-45BB-49A4-9919-B36C827100AC}
+		{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C} = {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4}
+		{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51} = {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4}
+		{A28A64CA-297E-4023-895A-483DFDA59FBE} = {B931802A-45BB-49A4-9919-B36C827100AC}
+		{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE} = {A28A64CA-297E-4023-895A-483DFDA59FBE}
+		{F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} = {B931802A-45BB-49A4-9919-B36C827100AC}
+		{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951} = {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B}
+		{0F577D33-2EA4-4182-9D89-2EFB022A2835} = {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B}
+		{84E67496-B000-4AAD-9626-2135F677C4F1} = {0F577D33-2EA4-4182-9D89-2EFB022A2835}
+		{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{B1385496-607F-4573-ABE9-D9FE88D96DB8} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{6EFFA596-23E7-498C-8D5E-331C6D8E945D} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{9631D314-7B0C-4CEC-8650-0259A8F4C77A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{240BBDB1-3501-4637-8A17-996EA4EBB20B} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{88EF760A-99A2-48C8-920F-78632A3BB57A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+		{9593691E-1B65-4EB1-97AA-F8B292B0082A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {81AADD49-473B-43ED-8A08-F6B7A058AA39}
+	EndGlobalSection
+EndGlobal
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
similarity index 72%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
index 1192afae5d..4a7df9d5a8 100644
--- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
@@ -15,11 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
   </ItemGroup>
 
     <ItemGroup>
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
similarity index 73%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
index 554232c8a4..509d46fde9 100644
--- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json
rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
similarity index 72%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
index da8af667f8..3c3a584bfd 100644
--- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
@@ -15,11 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
   </ItemGroup>
 
     <ItemGroup>
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs
diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json
similarity index 100%
rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
similarity index 72%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
index 7becca1b5e..6abd66f574 100644
--- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json
rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json
diff --git a/src/AADIntegration/test/AADIntegration.ruleset b/src/Azure/AzureAD/AzureAD.ruleset
similarity index 69%
rename from src/AADIntegration/test/AADIntegration.ruleset
rename to src/Azure/AzureAD/AzureAD.ruleset
index 23f2deac4a..57375fd55d 100644
--- a/src/AADIntegration/test/AADIntegration.ruleset
+++ b/src/Azure/AzureAD/AzureAD.ruleset
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for MVC Tests" Description="Code analysis rules for MVC Tests" ToolsVersion="15.0">
+<RuleSet Name="Rules for AzureAD tests" Description="Code analysis rules for AzureAD tests" ToolsVersion="15.0">
   <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
-    <!-- 
+    <!--
       This code is produced when theory parameters that are unused. Normally, this is a warning which causes our build to fail.
     -->
     <Rule Id="xUnit1026" Action="Info" />
diff --git a/src/Azure/AzureAD/Directory.Build.props b/src/Azure/AzureAD/Directory.Build.props
new file mode 100644
index 0000000000..647d706b5a
--- /dev/null
+++ b/src/Azure/AzureAD/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AzureAD.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+</Project>
diff --git a/src/Azure/AzureAD/README.md b/src/Azure/AzureAD/README.md
new file mode 100644
index 0000000000..6086294419
--- /dev/null
+++ b/src/Azure/AzureAD/README.md
@@ -0,0 +1,4 @@
+Azure Active Directory Integration
+==================================
+
+ASP.NET Core Azure Active Directory Integration provides seamless authentication integration with different Azure Active Directory services like Azure Active Directory and Azure Active Directory B2C for ASP.NET Core applications.
\ No newline at end of file
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
new file mode 100644
index 0000000000..6b9a99731f
--- /dev/null
+++ b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <RazorCompileOnBuild>true</RazorCompileOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.Extensions.Configuration.Json" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Program.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Program.cs
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs
diff --git a/src/AADIntegration/samples/AzureADB2CSample/Startup.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/Startup.cs
rename to src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs
diff --git a/src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json b/src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json
rename to src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json
diff --git a/src/AADIntegration/samples/AzureADB2CSample/appsettings.json b/src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/appsettings.json
rename to src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner2.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner2.svg
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner2.svg
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner2.svg
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner3.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner3.svg
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner3.svg
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner3.svg
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner4.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner4.svg
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner4.svg
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner4.svg
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.min.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.min.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.min.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.min.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map
rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/ApiAuthenticationTests.cs b/src/Azure/AzureAD/test/FunctionalTests/ApiAuthenticationTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/ApiAuthenticationTests.cs
rename to src/Azure/AzureAD/test/FunctionalTests/ApiAuthenticationTests.cs
diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
new file mode 100644
index 0000000000..ed2253ef17
--- /dev/null
+++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\testassets\AzureAD.WebSite\AzureAD.WebSite.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
+    <Reference Include="Microsoft.Extensions.Logging.Testing" />
+  </ItemGroup>
+
+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
+</Project>
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/WebAuthenticationTests.cs b/src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/WebAuthenticationTests.cs
rename to src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs
diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/xunit.runner.json b/src/Azure/AzureAD/test/FunctionalTests/xunit.runner.json
similarity index 100%
rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/xunit.runner.json
rename to src/Azure/AzureAD/test/FunctionalTests/xunit.runner.json
diff --git a/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj
new file mode 100644
index 0000000000..73b832bf22
--- /dev/null
+++ b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" />
+    <Reference Include="Microsoft.AspNetCore.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Logging.Configuration" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Controllers/TestController.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Controllers/TestController.cs
similarity index 100%
rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Controllers/TestController.cs
rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Controllers/TestController.cs
diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Program.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Program.cs
similarity index 100%
rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Program.cs
rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Program.cs
diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Startup.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Startup.cs
similarity index 100%
rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Startup.cs
rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Startup.cs
diff --git a/src/Azure/build.cmd b/src/Azure/build.cmd
new file mode 100644
index 0000000000..033fe6f614
--- /dev/null
+++ b/src/Azure/build.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET RepoRoot=%~dp0..\..
+%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %*
diff --git a/src/Azure/startvs.cmd b/src/Azure/startvs.cmd
new file mode 100644
index 0000000000..458c43b11a
--- /dev/null
+++ b/src/Azure/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Azure.sln
diff --git a/src/Identity/.gitignore b/src/Identity/.gitignore
deleted file mode 100644
index 22d237f27e..0000000000
--- a/src/Identity/.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
-.vs
-.vscode
-.build/
-.testPublish/
-global.json
diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj
new file mode 100644
index 0000000000..7e1f228988
--- /dev/null
+++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UserSecretsId>aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" />
+    <Reference Include="Microsoft.AspNetCore.CookiePolicy" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.UI" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Rewrite" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
+    <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Logging.Configuration" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/samples/ApiAuthSample/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
diff --git a/src/Identity/samples/ApiAuthSample/Areas/Identity/Pages/_ViewImports.cshtml b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Areas/Identity/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Areas/Identity/Pages/_ViewImports.cshtml
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Areas/Identity/Pages/_ViewImports.cshtml
diff --git a/src/Identity/samples/ApiAuthSample/Controllers/ValuesController.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Controllers/ValuesController.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Controllers/ValuesController.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Controllers/ValuesController.cs
diff --git a/src/Identity/samples/ApiAuthSample/Data/ApplicationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Data/ApplicationDbContext.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/ApplicationDbContext.cs
diff --git a/src/Identity/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.Designer.cs
diff --git a/src/Identity/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/20180919224505_InitialMigration.cs
diff --git a/src/Identity/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Data/Migrations/ApplicationDbContextModelSnapshot.cs
diff --git a/src/Identity/samples/ApiAuthSample/Models/ApplicationUser.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Models/ApplicationUser.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Models/ApplicationUser.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Models/ApplicationUser.cs
diff --git a/src/Identity/samples/ApiAuthSample/Pages/Index.cshtml b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Pages/Index.cshtml
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml
diff --git a/src/Identity/samples/ApiAuthSample/Pages/Index.cshtml.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Pages/Index.cshtml.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml.cs
diff --git a/src/Identity/samples/ApiAuthSample/Program.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Program.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Program.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Program.cs
diff --git a/src/Identity/samples/ApiAuthSample/Startup.cs b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Startup.cs
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/Startup.cs
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Startup.cs
diff --git a/src/Identity/samples/ApiAuthSample/app.db b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/app.db
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/app.db
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/app.db
diff --git a/src/Identity/samples/ApiAuthSample/appsettings.Development.json b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/appsettings.Development.json
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/appsettings.Development.json
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/appsettings.Development.json
diff --git a/src/Identity/samples/ApiAuthSample/appsettings.json b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/appsettings.json
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/appsettings.json
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/appsettings.json
diff --git a/src/Identity/samples/ApiAuthSample/package-lock.json b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/package-lock.json
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/package-lock.json
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/package-lock.json
diff --git a/src/Identity/samples/ApiAuthSample/wwwroot/js/app.js b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/app.js
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/wwwroot/js/app.js
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/app.js
diff --git a/src/Identity/samples/ApiAuthSample/wwwroot/js/oidc-client.js b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/oidc-client.js
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/wwwroot/js/oidc-client.js
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/oidc-client.js
diff --git a/src/Identity/samples/ApiAuthSample/wwwroot/js/oidc-client.min.js b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/oidc-client.min.js
similarity index 100%
rename from src/Identity/samples/ApiAuthSample/wwwroot/js/oidc-client.min.js
rename to src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/wwwroot/js/oidc-client.min.js
diff --git a/src/Identity/src/ApiAuth.IS/Authentication/AuthenticationBuilderExtensions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Authentication/AuthenticationBuilderExtensions.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Authentication/AuthenticationBuilderExtensions.cs
diff --git a/src/Identity/src/ApiAuth.IS/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtBearerOptionsConfiguration.cs
diff --git a/src/Identity/src/ApiAuth.IS/Authentication/IdentityServerJwtConstants.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtConstants.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Authentication/IdentityServerJwtConstants.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtConstants.cs
diff --git a/src/Identity/src/ApiAuth.IS/Authentication/IdentityServerJwtPolicySchemeForwardSelector.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtPolicySchemeForwardSelector.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Authentication/IdentityServerJwtPolicySchemeForwardSelector.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Authentication/IdentityServerJwtPolicySchemeForwardSelector.cs
diff --git a/src/Identity/src/ApiAuth.IS/Authentication/StaticConfigurationManager.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Authentication/StaticConfigurationManager.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Authentication/StaticConfigurationManager.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Authentication/StaticConfigurationManager.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ApplicationProfiles.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfiles.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ApplicationProfiles.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfiles.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ApplicationProfilesPropertyNames.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyNames.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ApplicationProfilesPropertyNames.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyNames.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ApplicationProfilesPropertyValues.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyValues.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ApplicationProfilesPropertyValues.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ApplicationProfilesPropertyValues.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/AspNetConventionsConfigureOptions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/AspNetConventionsConfigureOptions.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/AspNetConventionsConfigureOptions.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/AspNetConventionsConfigureOptions.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ClientDefinition.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ClientDefinition.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ClientDefinition.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ClientDefinition.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ConfigureApiResources.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiResources.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ConfigureApiResources.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureApiResources.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ConfigureClientScopes.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClientScopes.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ConfigureClientScopes.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClientScopes.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ConfigureClients.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClients.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ConfigureClients.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureClients.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ConfigureIdentityResources.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureIdentityResources.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ConfigureIdentityResources.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureIdentityResources.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ConfigureSigningCredentials.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureSigningCredentials.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ConfigureSigningCredentials.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ConfigureSigningCredentials.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/IIdentityServerJwtDescriptor.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/IIdentityServerJwtDescriptor.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/IIdentityServerJwtDescriptor.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/IIdentityServerJwtDescriptor.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/IdentityResourceDefinition.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/IdentityResourceDefinition.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/IdentityResourceDefinition.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/IdentityResourceDefinition.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/IdentityServerJwtApiDescriptor.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/IdentityServerJwtApiDescriptor.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/IdentityServerJwtApiDescriptor.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/IdentityServerJwtApiDescriptor.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/KeyDefinition.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/KeyDefinition.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/KeyDefinition.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/KeyDefinition.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/KeySources.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/KeySources.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/KeySources.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/KeySources.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ResourceDefinition.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ResourceDefinition.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ResourceDefinition.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ResourceDefinition.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/ServiceDefinition.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ServiceDefinition.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/ServiceDefinition.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/ServiceDefinition.cs
diff --git a/src/Identity/src/ApiAuth.IS/Configuration/SigningKeysLoader.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Configuration/SigningKeysLoader.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Configuration/SigningKeysLoader.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Configuration/SigningKeysLoader.cs
diff --git a/src/Identity/src/ApiAuth.IS/Data/ApiAuthorizationDbContext.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Data/ApiAuthorizationDbContext.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Data/ApiAuthorizationDbContext.cs
diff --git a/src/Identity/src/ApiAuth.IS/Extensions/AbsoluteUrlFactory.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AbsoluteUrlFactory.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Extensions/AbsoluteUrlFactory.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AbsoluteUrlFactory.cs
diff --git a/src/Identity/src/ApiAuth.IS/Extensions/AutoRedirectEndSessionEndpoint.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AutoRedirectEndSessionEndpoint.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Extensions/AutoRedirectEndSessionEndpoint.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Extensions/AutoRedirectEndSessionEndpoint.cs
diff --git a/src/Identity/src/ApiAuth.IS/Extensions/DefaultClientRequestParametersProvider.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Extensions/DefaultClientRequestParametersProvider.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Extensions/DefaultClientRequestParametersProvider.cs
diff --git a/src/Identity/src/ApiAuth.IS/Extensions/IAbsoluteUrlFactory.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/IAbsoluteUrlFactory.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Extensions/IAbsoluteUrlFactory.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Extensions/IAbsoluteUrlFactory.cs
diff --git a/src/Identity/src/ApiAuth.IS/Extensions/IClientRequestParametersProvider.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/IClientRequestParametersProvider.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Extensions/IClientRequestParametersProvider.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Extensions/IClientRequestParametersProvider.cs
diff --git a/src/Identity/src/ApiAuth.IS/Extensions/RelativeRedirectUriValidator.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Extensions/RelativeRedirectUriValidator.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Extensions/RelativeRedirectUriValidator.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Extensions/RelativeRedirectUriValidator.cs
diff --git a/src/Identity/src/ApiAuth.IS/IdentityServerBuilderConfigurationExtensions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/IdentityServerBuilderConfigurationExtensions.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/IdentityServerBuilderConfigurationExtensions.cs
diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj
new file mode 100644
index 0000000000..d3f272a544
--- /dev/null
+++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Description>ASP.NET Core API Authorization package powered by Identity Server.</Description>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;apiauth;identity</PackageTags>
+    <EnableApiCheck>false</EnableApiCheck>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="IdentityServer4.AspNetIdentity" />
+    <Reference Include="IdentityServer4.EntityFramework" />
+    <Reference Include="IdentityServer4" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.UI" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/src/ApiAuth.IS/Options/ApiAuthorizationOptions.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiAuthorizationOptions.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/ApiAuthorizationOptions.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiAuthorizationOptions.cs
diff --git a/src/Identity/src/ApiAuth.IS/Options/ApiResourceBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/ApiResourceBuilder.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceBuilder.cs
diff --git a/src/Identity/src/ApiAuth.IS/Options/ApiResourceCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceCollection.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/ApiResourceCollection.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiResourceCollection.cs
diff --git a/src/Identity/src/ApiAuth.IS/Options/ClientBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/ClientBuilder.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientBuilder.cs
diff --git a/src/Identity/src/ApiAuth.IS/Options/ClientCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientCollection.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/ClientCollection.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/ClientCollection.cs
diff --git a/src/Identity/src/ApiAuth.IS/Options/IdentityResourceBuilder.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/IdentityResourceBuilder.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceBuilder.cs
diff --git a/src/Identity/src/ApiAuth.IS/Options/IdentityResourceCollection.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/Options/IdentityResourceCollection.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Options/IdentityResourceCollection.cs
diff --git a/src/Identity/src/ApiAuth.IS/Properties/AssemblyInfo.cs b/src/Identity/ApiAuthorization.IdentityServer/src/Properties/AssemblyInfo.cs
similarity index 64%
rename from src/Identity/src/ApiAuth.IS/Properties/AssemblyInfo.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/Properties/AssemblyInfo.cs
index da88d94be5..17a9364ae8 100644
--- a/src/Identity/src/ApiAuth.IS/Properties/AssemblyInfo.cs
+++ b/src/Identity/ApiAuthorization.IdentityServer/src/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Identity/src/ApiAuth.IS/TagHelpers/ClientParametersTagHelper.cs b/src/Identity/ApiAuthorization.IdentityServer/src/TagHelpers/ClientParametersTagHelper.cs
similarity index 100%
rename from src/Identity/src/ApiAuth.IS/TagHelpers/ClientParametersTagHelper.cs
rename to src/Identity/ApiAuthorization.IdentityServer/src/TagHelpers/ClientParametersTagHelper.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Authentication/LocalApiJwtBearerConfigurationTest.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Authentication/LocalApiJwtBearerConfigurationTest.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiJwtBearerConfigurationTest.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Authentication/LocalApiPolicySchemeForwardSelectorTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiPolicySchemeForwardSelectorTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Authentication/LocalApiPolicySchemeForwardSelectorTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Authentication/LocalApiPolicySchemeForwardSelectorTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/AspNetConventionsConfigureOptionsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/AspNetConventionsConfigureOptionsTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/AspNetConventionsConfigureOptionsTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/AspNetConventionsConfigureOptionsTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureApiResourcesTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureApiResourcesTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureApiResourcesTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureApiResourcesTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureClientScopesTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientScopesTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureClientScopesTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientScopesTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureClientsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureClientsTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureClientsTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureSigningCredentialsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/ConfigureSigningCredentialsTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/LocalApiDescriptorTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/LocalApiDescriptorTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/LocalApiDescriptorTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/LocalApiDescriptorTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Configuration/SigningKeysLoaderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Configuration/SigningKeysLoaderTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Extensions/AbsoluteUrlFactoryTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AbsoluteUrlFactoryTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Extensions/AbsoluteUrlFactoryTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AbsoluteUrlFactoryTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Extensions/AutoRedirectEndSessionEndpointTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AutoRedirectEndSessionEndpointTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Extensions/AutoRedirectEndSessionEndpointTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Extensions/AutoRedirectEndSessionEndpointTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Extensions/RelativeRedirectUriValidatorTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Extensions/RelativeRedirectUriValidatorTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/Extensions/RelativeRedirectUriValidatorTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/Extensions/RelativeRedirectUriValidatorTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
similarity index 84%
rename from src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj
rename to src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
index 8dc9683fb3..9726e74142 100644
--- a/src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj
+++ b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\ApiAuth.IS\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj" />
+    <Reference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Identity/test/ApiAuth.IS.Test/TagHelpers/ClientParametersTagHelperTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/TagHelpers/ClientParametersTagHelperTests.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/TagHelpers/ClientParametersTagHelperTests.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/TagHelpers/ClientParametersTagHelperTests.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/TestLogger.cs b/src/Identity/ApiAuthorization.IdentityServer/test/TestLogger.cs
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/TestLogger.cs
rename to src/Identity/ApiAuthorization.IdentityServer/test/TestLogger.cs
diff --git a/src/Identity/test/ApiAuth.IS.Test/current.pfx b/src/Identity/ApiAuthorization.IdentityServer/test/current.pfx
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/current.pfx
rename to src/Identity/ApiAuthorization.IdentityServer/test/current.pfx
diff --git a/src/Identity/test/ApiAuth.IS.Test/expired.pfx b/src/Identity/ApiAuthorization.IdentityServer/test/expired.pfx
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/expired.pfx
rename to src/Identity/ApiAuthorization.IdentityServer/test/expired.pfx
diff --git a/src/Identity/test/ApiAuth.IS.Test/future.pfx b/src/Identity/ApiAuthorization.IdentityServer/test/future.pfx
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/future.pfx
rename to src/Identity/ApiAuthorization.IdentityServer/test/future.pfx
diff --git a/src/Identity/test/ApiAuth.IS.Test/test.pfx b/src/Identity/ApiAuthorization.IdentityServer/test/test.pfx
similarity index 100%
rename from src/Identity/test/ApiAuth.IS.Test/test.pfx
rename to src/Identity/ApiAuthorization.IdentityServer/test/test.pfx
diff --git a/src/Identity/src/Identity/AspNetRoleManager.cs b/src/Identity/Core/src/AspNetRoleManager.cs
similarity index 100%
rename from src/Identity/src/Identity/AspNetRoleManager.cs
rename to src/Identity/Core/src/AspNetRoleManager.cs
diff --git a/src/Identity/src/Identity/AspNetUserManager.cs b/src/Identity/Core/src/AspNetUserManager.cs
similarity index 100%
rename from src/Identity/src/Identity/AspNetUserManager.cs
rename to src/Identity/Core/src/AspNetUserManager.cs
diff --git a/src/Identity/src/Identity/BuilderExtensions.cs b/src/Identity/Core/src/BuilderExtensions.cs
similarity index 100%
rename from src/Identity/src/Identity/BuilderExtensions.cs
rename to src/Identity/Core/src/BuilderExtensions.cs
diff --git a/src/Identity/src/Identity/DataProtectionTokenProvider.cs b/src/Identity/Core/src/DataProtectionTokenProvider.cs
similarity index 100%
rename from src/Identity/src/Identity/DataProtectionTokenProvider.cs
rename to src/Identity/Core/src/DataProtectionTokenProvider.cs
diff --git a/src/Identity/src/Identity/DataProtectionTokenProviderOptions.cs b/src/Identity/Core/src/DataProtectionTokenProviderOptions.cs
similarity index 100%
rename from src/Identity/src/Identity/DataProtectionTokenProviderOptions.cs
rename to src/Identity/Core/src/DataProtectionTokenProviderOptions.cs
diff --git a/src/Identity/src/Identity/ExternalLoginInfo.cs b/src/Identity/Core/src/ExternalLoginInfo.cs
similarity index 100%
rename from src/Identity/src/Identity/ExternalLoginInfo.cs
rename to src/Identity/Core/src/ExternalLoginInfo.cs
diff --git a/src/Identity/src/Identity/ISecurityStampValidator.cs b/src/Identity/Core/src/ISecurityStampValidator.cs
similarity index 100%
rename from src/Identity/src/Identity/ISecurityStampValidator.cs
rename to src/Identity/Core/src/ISecurityStampValidator.cs
diff --git a/src/Identity/src/Identity/ITwoFactorSecurityStampValidator.cs b/src/Identity/Core/src/ITwoFactorSecurityStampValidator.cs
similarity index 100%
rename from src/Identity/src/Identity/ITwoFactorSecurityStampValidator.cs
rename to src/Identity/Core/src/ITwoFactorSecurityStampValidator.cs
diff --git a/src/Identity/src/Identity/IdentityBuilderExtensions.cs b/src/Identity/Core/src/IdentityBuilderExtensions.cs
similarity index 100%
rename from src/Identity/src/Identity/IdentityBuilderExtensions.cs
rename to src/Identity/Core/src/IdentityBuilderExtensions.cs
diff --git a/src/Identity/src/Identity/IdentityConstants.cs b/src/Identity/Core/src/IdentityConstants.cs
similarity index 100%
rename from src/Identity/src/Identity/IdentityConstants.cs
rename to src/Identity/Core/src/IdentityConstants.cs
diff --git a/src/Identity/src/Identity/IdentityCookiesBuilder.cs b/src/Identity/Core/src/IdentityCookiesBuilder.cs
similarity index 100%
rename from src/Identity/src/Identity/IdentityCookiesBuilder.cs
rename to src/Identity/Core/src/IdentityCookiesBuilder.cs
diff --git a/src/Identity/src/Identity/IdentityCookiesBuilderExtensions.cs b/src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs
similarity index 100%
rename from src/Identity/src/Identity/IdentityCookiesBuilderExtensions.cs
rename to src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs
diff --git a/src/Identity/src/Identity/IdentityServiceCollectionExtensions.cs b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
similarity index 100%
rename from src/Identity/src/Identity/IdentityServiceCollectionExtensions.cs
rename to src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
diff --git a/src/Identity/src/Identity/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
similarity index 51%
rename from src/Identity/src/Identity/Microsoft.AspNetCore.Identity.csproj
rename to src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
index 9ef7ddb110..7641e34897 100644
--- a/src/Identity/src/Identity/Microsoft.AspNetCore.Identity.csproj
+++ b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
@@ -8,13 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="$(MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Core\Microsoft.Extensions.Identity.Core.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
+    <Reference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
+    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Identity.Core" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/src/Core/Properties/AssemblyInfo.cs b/src/Identity/Core/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Identity/src/Core/Properties/AssemblyInfo.cs
rename to src/Identity/Core/src/Properties/AssemblyInfo.cs
diff --git a/src/Identity/src/Identity/Properties/Resources.Designer.cs b/src/Identity/Core/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Identity/src/Identity/Properties/Resources.Designer.cs
rename to src/Identity/Core/src/Properties/Resources.Designer.cs
diff --git a/src/Identity/src/Identity/Properties/debugSettings.json b/src/Identity/Core/src/Properties/debugSettings.json
similarity index 100%
rename from src/Identity/src/Identity/Properties/debugSettings.json
rename to src/Identity/Core/src/Properties/debugSettings.json
diff --git a/src/Identity/src/Identity/Resources.resx b/src/Identity/Core/src/Resources.resx
similarity index 100%
rename from src/Identity/src/Identity/Resources.resx
rename to src/Identity/Core/src/Resources.resx
diff --git a/src/Identity/src/Identity/SecurityStampRefreshingPrincipalContext.cs b/src/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs
similarity index 100%
rename from src/Identity/src/Identity/SecurityStampRefreshingPrincipalContext.cs
rename to src/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs
diff --git a/src/Identity/src/Identity/SecurityStampValidator.cs b/src/Identity/Core/src/SecurityStampValidator.cs
similarity index 100%
rename from src/Identity/src/Identity/SecurityStampValidator.cs
rename to src/Identity/Core/src/SecurityStampValidator.cs
diff --git a/src/Identity/src/Identity/SecurityStampValidatorOptions.cs b/src/Identity/Core/src/SecurityStampValidatorOptions.cs
similarity index 100%
rename from src/Identity/src/Identity/SecurityStampValidatorOptions.cs
rename to src/Identity/Core/src/SecurityStampValidatorOptions.cs
diff --git a/src/Identity/src/Identity/SignInManager.cs b/src/Identity/Core/src/SignInManager.cs
similarity index 100%
rename from src/Identity/src/Identity/SignInManager.cs
rename to src/Identity/Core/src/SignInManager.cs
diff --git a/src/Identity/src/Identity/TwoFactorSecurityStampValidator.cs b/src/Identity/Core/src/TwoFactorSecurityStampValidator.cs
similarity index 100%
rename from src/Identity/src/Identity/TwoFactorSecurityStampValidator.cs
rename to src/Identity/Core/src/TwoFactorSecurityStampValidator.cs
diff --git a/src/Identity/src/Identity/baseline.netcore.json b/src/Identity/Core/src/baseline.netcore.json
similarity index 100%
rename from src/Identity/src/Identity/baseline.netcore.json
rename to src/Identity/Core/src/baseline.netcore.json
diff --git a/src/Identity/src/Identity/baseline.netframework.json b/src/Identity/Core/src/baseline.netframework.json
similarity index 100%
rename from src/Identity/src/Identity/baseline.netframework.json
rename to src/Identity/Core/src/baseline.netframework.json
diff --git a/src/Identity/Directory.Build.props b/src/Identity/Directory.Build.props
index 3f03503e4d..7a3a58cbc2 100644
--- a/src/Identity/Directory.Build.props
+++ b/src/Identity/Directory.Build.props
@@ -1,32 +1,8 @@
-<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" />
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/Identity</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- Workaround microsoft/msbuild#3626 -->
-    <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
-    <SharedSourceRoot>$(MSBuildThisFileDirectory)..\Shared\</SharedSourceRoot>
-  </PropertyGroup>
-
-  <!-- Artifacts layout -->
-  <PropertyGroup>
-    <ArtifactsDir>$(MSBuildThisFileDirectory)..\..\artifacts\</ArtifactsDir>
-    <ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
-    <BasePackageOutputPath>$(ArtifactsConfigurationDir)packages\</BasePackageOutputPath>
-    <ProductPackageOutputPath>$(BasePackageOutputPath)product\</ProductPackageOutputPath>
-    <InternalPackageOutputPath>$(BasePackageOutputPath)internal\</InternalPackageOutputPath>
+    <IdentityTestSharedSourceRoot>$(MSBuildThisFileDirectory)test\Shared\</IdentityTestSharedSourceRoot>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Identity/Directory.Build.targets b/src/Identity/Directory.Build.targets
deleted file mode 100644
index f5a3f65909..0000000000
--- a/src/Identity/Directory.Build.targets
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!--
-      By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
-      Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
-    -->
-    <IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
-
-    <PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
-    <PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Identity/src/EF/IdentityDbContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs
similarity index 100%
rename from src/Identity/src/EF/IdentityDbContext.cs
rename to src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs
diff --git a/src/Identity/src/EF/IdentityEntityFrameworkBuilderExtensions.cs b/src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs
similarity index 100%
rename from src/Identity/src/EF/IdentityEntityFrameworkBuilderExtensions.cs
rename to src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs
diff --git a/src/Identity/src/EF/IdentityUserContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
similarity index 100%
rename from src/Identity/src/EF/IdentityUserContext.cs
rename to src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
diff --git a/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
similarity index 57%
rename from src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
rename to src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
index 5d20f316e2..2c558a1c4a 100644
--- a/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
+++ b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
@@ -9,12 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\Stores\Microsoft.Extensions.Identity.Stores.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.Extensions.Identity.Stores" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/src/EF/Properties/Resources.Designer.cs b/src/Identity/EntityFrameworkCore/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Identity/src/EF/Properties/Resources.Designer.cs
rename to src/Identity/EntityFrameworkCore/src/Properties/Resources.Designer.cs
diff --git a/src/Identity/src/EF/Resources.resx b/src/Identity/EntityFrameworkCore/src/Resources.resx
similarity index 100%
rename from src/Identity/src/EF/Resources.resx
rename to src/Identity/EntityFrameworkCore/src/Resources.resx
diff --git a/src/Identity/src/EF/RoleStore.cs b/src/Identity/EntityFrameworkCore/src/RoleStore.cs
similarity index 100%
rename from src/Identity/src/EF/RoleStore.cs
rename to src/Identity/EntityFrameworkCore/src/RoleStore.cs
diff --git a/src/Identity/src/EF/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
similarity index 100%
rename from src/Identity/src/EF/UserOnlyStore.cs
rename to src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
diff --git a/src/Identity/src/EF/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs
similarity index 100%
rename from src/Identity/src/EF/UserStore.cs
rename to src/Identity/EntityFrameworkCore/src/UserStore.cs
diff --git a/src/Identity/src/EF/baseline.netcore.json b/src/Identity/EntityFrameworkCore/src/baseline.netcore.json
similarity index 100%
rename from src/Identity/src/EF/baseline.netcore.json
rename to src/Identity/EntityFrameworkCore/src/baseline.netcore.json
diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryContext.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs
similarity index 100%
rename from src/Identity/test/EF.InMemory.Test/InMemoryContext.cs
rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs
diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs
similarity index 100%
rename from src/Identity/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs
diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs
similarity index 100%
rename from src/Identity/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs
diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
similarity index 100%
rename from src/Identity/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
new file mode 100644
index 0000000000..9fe201df82
--- /dev/null
+++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.EntityFrameworkCore.InMemory" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/test/EF.InMemory.Test/RoleStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs
similarity index 100%
rename from src/Identity/test/EF.InMemory.Test/RoleStoreTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs
diff --git a/src/Identity/test/EF.InMemory.Test/TestIdentityFactory.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs
similarity index 100%
rename from src/Identity/test/EF.InMemory.Test/TestIdentityFactory.cs
rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs
diff --git a/src/Identity/test/EF.Test/ApiConsistencyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/ApiConsistencyTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/ApiConsistencyTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/ApiConsistencyTest.cs
diff --git a/src/Identity/test/EF.Test/CustomPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/CustomPocoTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs
diff --git a/src/Identity/test/EF.Test/DbUtil.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs
similarity index 100%
rename from src/Identity/test/EF.Test/DbUtil.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs
diff --git a/src/Identity/test/EF.Test/DefaultPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/DefaultPocoTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs
diff --git a/src/Identity/test/EF.Test/MaxKeyLengthSchemaTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/MaxKeyLengthSchemaTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
new file mode 100644
index 0000000000..336cd2a15d
--- /dev/null
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
+    <Content Include="config.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+    <Reference Include="Microsoft.EntityFrameworkCore.InMemory" />
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
+    <Reference Include="Microsoft.Extensions.Configuration.Json" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
similarity index 100%
rename from src/Identity/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
diff --git a/src/Identity/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
similarity index 100%
rename from src/Identity/test/EF.Test/SqlStoreTestBase.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
diff --git a/src/Identity/test/EF.Test/UserOnlyCustomContextTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserOnlyCustomContextTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs
diff --git a/src/Identity/test/EF.Test/UserOnlyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserOnlyTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreEncryptPersonalDataTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserStoreEncryptPersonalDataTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreGuidKeyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreGuidKeyTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserStoreGuidKeyTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreGuidKeyTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreIntKeyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreIntKeyTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserStoreIntKeyTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreIntKeyTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreStringKeyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreStringKeyTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserStoreStringKeyTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreStringKeyTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserStoreTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs
similarity index 100%
rename from src/Identity/test/EF.Test/UserStoreWithGenericsTest.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs
diff --git a/src/Identity/test/EF.Test/Utilities/ScratchDatabaseFixture.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
similarity index 100%
rename from src/Identity/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
diff --git a/src/Identity/test/EF.Test/Utilities/SqlServerTestStore.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs
similarity index 100%
rename from src/Identity/test/EF.Test/Utilities/SqlServerTestStore.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs
diff --git a/src/Identity/test/EF.Test/Utilities/TestEnvironment.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/TestEnvironment.cs
similarity index 100%
rename from src/Identity/test/EF.Test/Utilities/TestEnvironment.cs
rename to src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/TestEnvironment.cs
diff --git a/src/Identity/test/EF.Test/config.json b/src/Identity/EntityFrameworkCore/test/EF.Test/config.json
similarity index 100%
rename from src/Identity/test/EF.Test/config.json
rename to src/Identity/EntityFrameworkCore/test/EF.Test/config.json
diff --git a/src/Identity/src/Core/AuthenticatorTokenProvider.cs b/src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs
similarity index 100%
rename from src/Identity/src/Core/AuthenticatorTokenProvider.cs
rename to src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs
diff --git a/src/Identity/src/Core/Base32.cs b/src/Identity/Extensions.Core/src/Base32.cs
similarity index 100%
rename from src/Identity/src/Core/Base32.cs
rename to src/Identity/Extensions.Core/src/Base32.cs
diff --git a/src/Identity/src/Core/ClaimsIdentityOptions.cs b/src/Identity/Extensions.Core/src/ClaimsIdentityOptions.cs
similarity index 100%
rename from src/Identity/src/Core/ClaimsIdentityOptions.cs
rename to src/Identity/Extensions.Core/src/ClaimsIdentityOptions.cs
diff --git a/src/Identity/src/Core/DefaultPersonalDataProtector.cs b/src/Identity/Extensions.Core/src/DefaultPersonalDataProtector.cs
similarity index 100%
rename from src/Identity/src/Core/DefaultPersonalDataProtector.cs
rename to src/Identity/Extensions.Core/src/DefaultPersonalDataProtector.cs
diff --git a/src/Identity/src/Core/EmailTokenProvider.cs b/src/Identity/Extensions.Core/src/EmailTokenProvider.cs
similarity index 100%
rename from src/Identity/src/Core/EmailTokenProvider.cs
rename to src/Identity/Extensions.Core/src/EmailTokenProvider.cs
diff --git a/src/Identity/src/Core/ILookupNormalizer.cs b/src/Identity/Extensions.Core/src/ILookupNormalizer.cs
similarity index 100%
rename from src/Identity/src/Core/ILookupNormalizer.cs
rename to src/Identity/Extensions.Core/src/ILookupNormalizer.cs
diff --git a/src/Identity/src/Core/ILookupProtector.cs b/src/Identity/Extensions.Core/src/ILookupProtector.cs
similarity index 100%
rename from src/Identity/src/Core/ILookupProtector.cs
rename to src/Identity/Extensions.Core/src/ILookupProtector.cs
diff --git a/src/Identity/src/Core/ILookupProtectorKeyRing.cs b/src/Identity/Extensions.Core/src/ILookupProtectorKeyRing.cs
similarity index 100%
rename from src/Identity/src/Core/ILookupProtectorKeyRing.cs
rename to src/Identity/Extensions.Core/src/ILookupProtectorKeyRing.cs
diff --git a/src/Identity/src/Core/IPasswordHasher.cs b/src/Identity/Extensions.Core/src/IPasswordHasher.cs
similarity index 100%
rename from src/Identity/src/Core/IPasswordHasher.cs
rename to src/Identity/Extensions.Core/src/IPasswordHasher.cs
diff --git a/src/Identity/src/Core/IPasswordValidator.cs b/src/Identity/Extensions.Core/src/IPasswordValidator.cs
similarity index 100%
rename from src/Identity/src/Core/IPasswordValidator.cs
rename to src/Identity/Extensions.Core/src/IPasswordValidator.cs
diff --git a/src/Identity/src/Core/IPersonalDataProtector.cs b/src/Identity/Extensions.Core/src/IPersonalDataProtector.cs
similarity index 100%
rename from src/Identity/src/Core/IPersonalDataProtector.cs
rename to src/Identity/Extensions.Core/src/IPersonalDataProtector.cs
diff --git a/src/Identity/src/Core/IProtectedUserStore.cs b/src/Identity/Extensions.Core/src/IProtectedUserStore.cs
similarity index 100%
rename from src/Identity/src/Core/IProtectedUserStore.cs
rename to src/Identity/Extensions.Core/src/IProtectedUserStore.cs
diff --git a/src/Identity/src/Core/IQueryableRoleStore.cs b/src/Identity/Extensions.Core/src/IQueryableRoleStore.cs
similarity index 100%
rename from src/Identity/src/Core/IQueryableRoleStore.cs
rename to src/Identity/Extensions.Core/src/IQueryableRoleStore.cs
diff --git a/src/Identity/src/Core/IQueryableUserStore.cs b/src/Identity/Extensions.Core/src/IQueryableUserStore.cs
similarity index 100%
rename from src/Identity/src/Core/IQueryableUserStore.cs
rename to src/Identity/Extensions.Core/src/IQueryableUserStore.cs
diff --git a/src/Identity/src/Core/IRoleClaimStore.cs b/src/Identity/Extensions.Core/src/IRoleClaimStore.cs
similarity index 100%
rename from src/Identity/src/Core/IRoleClaimStore.cs
rename to src/Identity/Extensions.Core/src/IRoleClaimStore.cs
diff --git a/src/Identity/src/Core/IRoleStore.cs b/src/Identity/Extensions.Core/src/IRoleStore.cs
similarity index 100%
rename from src/Identity/src/Core/IRoleStore.cs
rename to src/Identity/Extensions.Core/src/IRoleStore.cs
diff --git a/src/Identity/src/Core/IRoleValidator.cs b/src/Identity/Extensions.Core/src/IRoleValidator.cs
similarity index 100%
rename from src/Identity/src/Core/IRoleValidator.cs
rename to src/Identity/Extensions.Core/src/IRoleValidator.cs
diff --git a/src/Identity/src/Core/IUserAuthenticationTokenStore.cs b/src/Identity/Extensions.Core/src/IUserAuthenticationTokenStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserAuthenticationTokenStore.cs
rename to src/Identity/Extensions.Core/src/IUserAuthenticationTokenStore.cs
diff --git a/src/Identity/src/Core/IUserAuthenticatorKeyStore.cs b/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserAuthenticatorKeyStore.cs
rename to src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
diff --git a/src/Identity/src/Core/IUserClaimStore.cs b/src/Identity/Extensions.Core/src/IUserClaimStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserClaimStore.cs
rename to src/Identity/Extensions.Core/src/IUserClaimStore.cs
diff --git a/src/Identity/src/Core/IUserClaimsPrincipalFactory.cs b/src/Identity/Extensions.Core/src/IUserClaimsPrincipalFactory.cs
similarity index 100%
rename from src/Identity/src/Core/IUserClaimsPrincipalFactory.cs
rename to src/Identity/Extensions.Core/src/IUserClaimsPrincipalFactory.cs
diff --git a/src/Identity/src/Core/IUserEmailStore.cs b/src/Identity/Extensions.Core/src/IUserEmailStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserEmailStore.cs
rename to src/Identity/Extensions.Core/src/IUserEmailStore.cs
diff --git a/src/Identity/src/Core/IUserLockoutStore.cs b/src/Identity/Extensions.Core/src/IUserLockoutStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserLockoutStore.cs
rename to src/Identity/Extensions.Core/src/IUserLockoutStore.cs
diff --git a/src/Identity/src/Core/IUserLoginStore.cs b/src/Identity/Extensions.Core/src/IUserLoginStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserLoginStore.cs
rename to src/Identity/Extensions.Core/src/IUserLoginStore.cs
diff --git a/src/Identity/src/Core/IUserPasswordStore.cs b/src/Identity/Extensions.Core/src/IUserPasswordStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserPasswordStore.cs
rename to src/Identity/Extensions.Core/src/IUserPasswordStore.cs
diff --git a/src/Identity/src/Core/IUserPhoneNumberStore.cs b/src/Identity/Extensions.Core/src/IUserPhoneNumberStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserPhoneNumberStore.cs
rename to src/Identity/Extensions.Core/src/IUserPhoneNumberStore.cs
diff --git a/src/Identity/src/Core/IUserRoleStore.cs b/src/Identity/Extensions.Core/src/IUserRoleStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserRoleStore.cs
rename to src/Identity/Extensions.Core/src/IUserRoleStore.cs
diff --git a/src/Identity/src/Core/IUserSecurityStampStore.cs b/src/Identity/Extensions.Core/src/IUserSecurityStampStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserSecurityStampStore.cs
rename to src/Identity/Extensions.Core/src/IUserSecurityStampStore.cs
diff --git a/src/Identity/src/Core/IUserStore.cs b/src/Identity/Extensions.Core/src/IUserStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserStore.cs
rename to src/Identity/Extensions.Core/src/IUserStore.cs
diff --git a/src/Identity/src/Core/IUserTwoFactorRecoveryCodeStore.cs b/src/Identity/Extensions.Core/src/IUserTwoFactorRecoveryCodeStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserTwoFactorRecoveryCodeStore.cs
rename to src/Identity/Extensions.Core/src/IUserTwoFactorRecoveryCodeStore.cs
diff --git a/src/Identity/src/Core/IUserTwoFactorStore.cs b/src/Identity/Extensions.Core/src/IUserTwoFactorStore.cs
similarity index 100%
rename from src/Identity/src/Core/IUserTwoFactorStore.cs
rename to src/Identity/Extensions.Core/src/IUserTwoFactorStore.cs
diff --git a/src/Identity/src/Core/IUserTwoFactorTokenProvider.cs b/src/Identity/Extensions.Core/src/IUserTwoFactorTokenProvider.cs
similarity index 100%
rename from src/Identity/src/Core/IUserTwoFactorTokenProvider.cs
rename to src/Identity/Extensions.Core/src/IUserTwoFactorTokenProvider.cs
diff --git a/src/Identity/src/Core/IUserValidator.cs b/src/Identity/Extensions.Core/src/IUserValidator.cs
similarity index 100%
rename from src/Identity/src/Core/IUserValidator.cs
rename to src/Identity/Extensions.Core/src/IUserValidator.cs
diff --git a/src/Identity/src/Core/IdentityBuilder.cs b/src/Identity/Extensions.Core/src/IdentityBuilder.cs
similarity index 100%
rename from src/Identity/src/Core/IdentityBuilder.cs
rename to src/Identity/Extensions.Core/src/IdentityBuilder.cs
diff --git a/src/Identity/src/Core/IdentityError.cs b/src/Identity/Extensions.Core/src/IdentityError.cs
similarity index 100%
rename from src/Identity/src/Core/IdentityError.cs
rename to src/Identity/Extensions.Core/src/IdentityError.cs
diff --git a/src/Identity/src/Core/IdentityErrorDescriber.cs b/src/Identity/Extensions.Core/src/IdentityErrorDescriber.cs
similarity index 100%
rename from src/Identity/src/Core/IdentityErrorDescriber.cs
rename to src/Identity/Extensions.Core/src/IdentityErrorDescriber.cs
diff --git a/src/Identity/src/Core/IdentityOptions.cs b/src/Identity/Extensions.Core/src/IdentityOptions.cs
similarity index 100%
rename from src/Identity/src/Core/IdentityOptions.cs
rename to src/Identity/Extensions.Core/src/IdentityOptions.cs
diff --git a/src/Identity/src/Core/IdentityResult.cs b/src/Identity/Extensions.Core/src/IdentityResult.cs
similarity index 100%
rename from src/Identity/src/Core/IdentityResult.cs
rename to src/Identity/Extensions.Core/src/IdentityResult.cs
diff --git a/src/Identity/src/Core/IdentityServiceCollectionExtensions.cs b/src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs
similarity index 100%
rename from src/Identity/src/Core/IdentityServiceCollectionExtensions.cs
rename to src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs
diff --git a/src/Identity/src/Core/LockoutOptions.cs b/src/Identity/Extensions.Core/src/LockoutOptions.cs
similarity index 100%
rename from src/Identity/src/Core/LockoutOptions.cs
rename to src/Identity/Extensions.Core/src/LockoutOptions.cs
diff --git a/src/Identity/src/Core/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
similarity index 53%
rename from src/Identity/src/Core/Microsoft.Extensions.Identity.Core.csproj
rename to src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
index 14dc8722e5..8a471194b9 100644
--- a/src/Identity/src/Core/Microsoft.Extensions.Identity.Core.csproj
+++ b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="$(MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
+    <Reference Include="Microsoft.Extensions.Logging" />
+    <Reference Include="Microsoft.Extensions.Options" />
+    <Reference Include="System.ComponentModel.Annotations" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/src/Core/PasswordHasher.cs b/src/Identity/Extensions.Core/src/PasswordHasher.cs
similarity index 100%
rename from src/Identity/src/Core/PasswordHasher.cs
rename to src/Identity/Extensions.Core/src/PasswordHasher.cs
diff --git a/src/Identity/src/Core/PasswordHasherCompatibilityMode.cs b/src/Identity/Extensions.Core/src/PasswordHasherCompatibilityMode.cs
similarity index 100%
rename from src/Identity/src/Core/PasswordHasherCompatibilityMode.cs
rename to src/Identity/Extensions.Core/src/PasswordHasherCompatibilityMode.cs
diff --git a/src/Identity/src/Core/PasswordHasherOptions.cs b/src/Identity/Extensions.Core/src/PasswordHasherOptions.cs
similarity index 100%
rename from src/Identity/src/Core/PasswordHasherOptions.cs
rename to src/Identity/Extensions.Core/src/PasswordHasherOptions.cs
diff --git a/src/Identity/src/Core/PasswordOptions.cs b/src/Identity/Extensions.Core/src/PasswordOptions.cs
similarity index 100%
rename from src/Identity/src/Core/PasswordOptions.cs
rename to src/Identity/Extensions.Core/src/PasswordOptions.cs
diff --git a/src/Identity/src/Core/PasswordValidator.cs b/src/Identity/Extensions.Core/src/PasswordValidator.cs
similarity index 100%
rename from src/Identity/src/Core/PasswordValidator.cs
rename to src/Identity/Extensions.Core/src/PasswordValidator.cs
diff --git a/src/Identity/src/Core/PasswordVerificationResult.cs b/src/Identity/Extensions.Core/src/PasswordVerificationResult.cs
similarity index 100%
rename from src/Identity/src/Core/PasswordVerificationResult.cs
rename to src/Identity/Extensions.Core/src/PasswordVerificationResult.cs
diff --git a/src/Identity/src/Core/PersonalDataAttribute.cs b/src/Identity/Extensions.Core/src/PersonalDataAttribute.cs
similarity index 100%
rename from src/Identity/src/Core/PersonalDataAttribute.cs
rename to src/Identity/Extensions.Core/src/PersonalDataAttribute.cs
diff --git a/src/Identity/src/Core/PhoneNumberTokenProvider.cs b/src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs
similarity index 100%
rename from src/Identity/src/Core/PhoneNumberTokenProvider.cs
rename to src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs
diff --git a/src/Identity/src/Core/PrincipalExtensions.cs b/src/Identity/Extensions.Core/src/PrincipalExtensions.cs
similarity index 100%
rename from src/Identity/src/Core/PrincipalExtensions.cs
rename to src/Identity/Extensions.Core/src/PrincipalExtensions.cs
diff --git a/src/Identity/src/Identity/Properties/AssemblyInfo.cs b/src/Identity/Extensions.Core/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Identity/src/Identity/Properties/AssemblyInfo.cs
rename to src/Identity/Extensions.Core/src/Properties/AssemblyInfo.cs
diff --git a/src/Identity/src/Core/Properties/Resources.Designer.cs b/src/Identity/Extensions.Core/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Identity/src/Core/Properties/Resources.Designer.cs
rename to src/Identity/Extensions.Core/src/Properties/Resources.Designer.cs
diff --git a/src/Identity/src/Core/ProtectedPersonalDataAttribute.cs b/src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs
similarity index 100%
rename from src/Identity/src/Core/ProtectedPersonalDataAttribute.cs
rename to src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs
diff --git a/src/Identity/src/Core/Resources.resx b/src/Identity/Extensions.Core/src/Resources.resx
similarity index 100%
rename from src/Identity/src/Core/Resources.resx
rename to src/Identity/Extensions.Core/src/Resources.resx
diff --git a/src/Identity/src/Core/Rfc6238AuthenticationService.cs b/src/Identity/Extensions.Core/src/Rfc6238AuthenticationService.cs
similarity index 100%
rename from src/Identity/src/Core/Rfc6238AuthenticationService.cs
rename to src/Identity/Extensions.Core/src/Rfc6238AuthenticationService.cs
diff --git a/src/Identity/src/Core/RoleManager.cs b/src/Identity/Extensions.Core/src/RoleManager.cs
similarity index 100%
rename from src/Identity/src/Core/RoleManager.cs
rename to src/Identity/Extensions.Core/src/RoleManager.cs
diff --git a/src/Identity/src/Core/RoleValidator.cs b/src/Identity/Extensions.Core/src/RoleValidator.cs
similarity index 100%
rename from src/Identity/src/Core/RoleValidator.cs
rename to src/Identity/Extensions.Core/src/RoleValidator.cs
diff --git a/src/Identity/src/Core/SignInOptions.cs b/src/Identity/Extensions.Core/src/SignInOptions.cs
similarity index 100%
rename from src/Identity/src/Core/SignInOptions.cs
rename to src/Identity/Extensions.Core/src/SignInOptions.cs
diff --git a/src/Identity/src/Core/SignInResult.cs b/src/Identity/Extensions.Core/src/SignInResult.cs
similarity index 100%
rename from src/Identity/src/Core/SignInResult.cs
rename to src/Identity/Extensions.Core/src/SignInResult.cs
diff --git a/src/Identity/src/Core/StoreOptions.cs b/src/Identity/Extensions.Core/src/StoreOptions.cs
similarity index 100%
rename from src/Identity/src/Core/StoreOptions.cs
rename to src/Identity/Extensions.Core/src/StoreOptions.cs
diff --git a/src/Identity/src/Core/TokenOptions.cs b/src/Identity/Extensions.Core/src/TokenOptions.cs
similarity index 100%
rename from src/Identity/src/Core/TokenOptions.cs
rename to src/Identity/Extensions.Core/src/TokenOptions.cs
diff --git a/src/Identity/src/Core/TokenProviderDescriptor.cs b/src/Identity/Extensions.Core/src/TokenProviderDescriptor.cs
similarity index 100%
rename from src/Identity/src/Core/TokenProviderDescriptor.cs
rename to src/Identity/Extensions.Core/src/TokenProviderDescriptor.cs
diff --git a/src/Identity/src/Core/TotpSecurityStampBasedTokenProvider.cs b/src/Identity/Extensions.Core/src/TotpSecurityStampBasedTokenProvider.cs
similarity index 100%
rename from src/Identity/src/Core/TotpSecurityStampBasedTokenProvider.cs
rename to src/Identity/Extensions.Core/src/TotpSecurityStampBasedTokenProvider.cs
diff --git a/src/Identity/src/Core/UpperInvariantLookupNormalizer.cs b/src/Identity/Extensions.Core/src/UpperInvariantLookupNormalizer.cs
similarity index 100%
rename from src/Identity/src/Core/UpperInvariantLookupNormalizer.cs
rename to src/Identity/Extensions.Core/src/UpperInvariantLookupNormalizer.cs
diff --git a/src/Identity/src/Core/UserClaimsPrincipalFactory.cs b/src/Identity/Extensions.Core/src/UserClaimsPrincipalFactory.cs
similarity index 100%
rename from src/Identity/src/Core/UserClaimsPrincipalFactory.cs
rename to src/Identity/Extensions.Core/src/UserClaimsPrincipalFactory.cs
diff --git a/src/Identity/src/Core/UserLoginInfo.cs b/src/Identity/Extensions.Core/src/UserLoginInfo.cs
similarity index 100%
rename from src/Identity/src/Core/UserLoginInfo.cs
rename to src/Identity/Extensions.Core/src/UserLoginInfo.cs
diff --git a/src/Identity/src/Core/UserManager.cs b/src/Identity/Extensions.Core/src/UserManager.cs
similarity index 100%
rename from src/Identity/src/Core/UserManager.cs
rename to src/Identity/Extensions.Core/src/UserManager.cs
diff --git a/src/Identity/src/Core/UserOptions.cs b/src/Identity/Extensions.Core/src/UserOptions.cs
similarity index 100%
rename from src/Identity/src/Core/UserOptions.cs
rename to src/Identity/Extensions.Core/src/UserOptions.cs
diff --git a/src/Identity/src/Core/UserValidator.cs b/src/Identity/Extensions.Core/src/UserValidator.cs
similarity index 100%
rename from src/Identity/src/Core/UserValidator.cs
rename to src/Identity/Extensions.Core/src/UserValidator.cs
diff --git a/src/Identity/src/Core/baseline.netcore.json b/src/Identity/Extensions.Core/src/baseline.netcore.json
similarity index 100%
rename from src/Identity/src/Core/baseline.netcore.json
rename to src/Identity/Extensions.Core/src/baseline.netcore.json
diff --git a/src/Identity/src/Stores/IdentityRole.cs b/src/Identity/Extensions.Stores/src/IdentityRole.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityRole.cs
rename to src/Identity/Extensions.Stores/src/IdentityRole.cs
diff --git a/src/Identity/src/Stores/IdentityRoleClaim.cs b/src/Identity/Extensions.Stores/src/IdentityRoleClaim.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityRoleClaim.cs
rename to src/Identity/Extensions.Stores/src/IdentityRoleClaim.cs
diff --git a/src/Identity/src/Stores/IdentityUser.cs b/src/Identity/Extensions.Stores/src/IdentityUser.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityUser.cs
rename to src/Identity/Extensions.Stores/src/IdentityUser.cs
diff --git a/src/Identity/src/Stores/IdentityUserClaim.cs b/src/Identity/Extensions.Stores/src/IdentityUserClaim.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityUserClaim.cs
rename to src/Identity/Extensions.Stores/src/IdentityUserClaim.cs
diff --git a/src/Identity/src/Stores/IdentityUserLogin.cs b/src/Identity/Extensions.Stores/src/IdentityUserLogin.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityUserLogin.cs
rename to src/Identity/Extensions.Stores/src/IdentityUserLogin.cs
diff --git a/src/Identity/src/Stores/IdentityUserRole.cs b/src/Identity/Extensions.Stores/src/IdentityUserRole.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityUserRole.cs
rename to src/Identity/Extensions.Stores/src/IdentityUserRole.cs
diff --git a/src/Identity/src/Stores/IdentityUserToken.cs b/src/Identity/Extensions.Stores/src/IdentityUserToken.cs
similarity index 100%
rename from src/Identity/src/Stores/IdentityUserToken.cs
rename to src/Identity/Extensions.Stores/src/IdentityUserToken.cs
diff --git a/src/Identity/src/Stores/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj
similarity index 62%
rename from src/Identity/src/Stores/Microsoft.Extensions.Identity.Stores.csproj
rename to src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj
index e567cf2749..a5e7c7c5fa 100644
--- a/src/Identity/src/Stores/Microsoft.Extensions.Identity.Stores.csproj
+++ b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj
@@ -8,12 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Core\Microsoft.Extensions.Identity.Core.csproj" />
+    <Reference Include="Microsoft.Extensions.Logging" />
+    <Reference Include="Microsoft.Extensions.Identity.Core" />
+    <Reference Include="System.ComponentModel.Annotations" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/src/Stores/RoleStoreBase.cs b/src/Identity/Extensions.Stores/src/RoleStoreBase.cs
similarity index 100%
rename from src/Identity/src/Stores/RoleStoreBase.cs
rename to src/Identity/Extensions.Stores/src/RoleStoreBase.cs
diff --git a/src/Identity/src/Stores/UserStoreBase.cs b/src/Identity/Extensions.Stores/src/UserStoreBase.cs
similarity index 100%
rename from src/Identity/src/Stores/UserStoreBase.cs
rename to src/Identity/Extensions.Stores/src/UserStoreBase.cs
diff --git a/src/Identity/src/Stores/baseline.netcore.json b/src/Identity/Extensions.Stores/src/baseline.netcore.json
similarity index 100%
rename from src/Identity/src/Stores/baseline.netcore.json
rename to src/Identity/Extensions.Stores/src/baseline.netcore.json
diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln
index 564ff51d95..0cfc71f9bb 100644
--- a/src/Identity/Identity.sln
+++ b/src/Identity/Identity.sln
@@ -1,79 +1,122 @@
 
 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", "{0F647068-6602-4E24-B1DC-8ED91481A50A}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiAuthorization.IdentityServer", "ApiAuthorization.IdentityServer", "{25ACABEB-F8FA-4BD8-A39B-836924D40223}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-62D2-4D17-8CF2-BE192445AF8E}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{325EA45D-56C9-468E-B24C-6B57F85E90AF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiAuthSample", "ApiAuthorization.IdentityServer\samples\ApiAuthSample\ApiAuthSample.csproj", "{AADD8652-321B-4C7E-B345-C789776667D4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer", "ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj", "{4650E92F-C492-4B44-84FD-83C88972071D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests", "ApiAuthorization.IdentityServer\test\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj", "{219C7185-7963-452C-BDD6-85057E3612D0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{ACA35118-4AB2-45CE-99A2-F3E71DC04D49}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "Core\src\Microsoft.AspNetCore.Identity.csproj", "{B6AC3237-41CC-4799-9E4E-2A0D3283C834}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EntityFrameworkCore", "EntityFrameworkCore", "{80E3D631-B45D-4A6A-A957-454EFF6E41F2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{470D3752-4253-4BE6-8EEC-647556FD6889}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{833B8FE4-68F4-4751-9483-53F541F26E1B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{5608E828-DD54-4E2A-B73C-FC22268BE797}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "src\Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.Core", "Extensions.Core", "{AE1BD7A4-44B1-4A78-A25B-5D2FEBF52977}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "Extensions.Core\src\Microsoft.Extensions.Identity.Core.csproj", "{937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{1F83D453-E094-4D28-BCFA-9E537ABB5AD6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.Stores", "Extensions.Stores", "{35483108-9E53-4FE5-A0E2-729D5448AE37}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{42F5B772-1D61-4C18-9457-412DE8E170A5}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "Extensions.Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7F5A4F96-E847-486E-8278-FE72E68C5810}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "src\UI\Microsoft.AspNetCore.Identity.UI.csproj", "{894E102D-56D4-4B02-8F13-8781F4324C3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{B9A44F66-42AF-450D-9E34-7DD79869F225}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "test\WebSites\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{CAE02AD2-F941-4ACB-B469-13EFF551BB74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{D67C2ED8-55FD-4D57-8A4F-C6983265A745}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{B3616029-7DA6-4FB3-8722-D5AC69884B3F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{894E102D-56D4-4B02-8F13-8781F4324C3E} = {894E102D-56D4-4B02-8F13-8781F4324C3E}
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Specification.Tests", "Specification.Tests", "{F767B361-F0A3-451A-A659-1DB5F08AED6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiAuthSample", "samples\ApiAuthSample\ApiAuthSample.csproj", "{7FA90737-4A2D-4BBB-8245-F6564D462FCB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer", "src\ApiAuth.IS\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj", "{590C70E2-FCCC-49C2-93F3-60B7AA0533A4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7CABB49A-742B-4402-82EB-CD2A5514CF54}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test", "test\ApiAuth.IS.Test\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj", "{ECFE11DD-1111-4557-8E28-42F8E9878823}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{FE4C359B-0155-4C07-8797-A33291B7A5EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{08B472C6-1859-4E22-8F91-2742DD9DC48D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{E96F9610-F26B-4FB2-869C-3DDFA011FFA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{35C96499-4B59-44A2-B09B-83D3BEA9E45F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{77BD6E4E-FA78-4FB7-8D57-F3C337790962}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{29890CAC-D5AC-4644-9337-CF853683423F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{EEF25A64-AE4E-4B15-8045-F26EC6DD2996}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{913C4E0B-64A2-4655-A2FD-EF72A3471AD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{CF5345B3-EEF7-4CFC-B963-D34E47F697A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{C763AABD-4B9A-4BE5-9DED-C980FD76BC53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{2684E887-6DE3-4BB8-9B8E-80791457092A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "..\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{B23309CC-4FBF-402F-8926-D6EDB738784B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{08A04E75-10E7-4FBC-8B4B-664345E8BEEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{21A8B5F0-9063-4A0E-9A6E-496977534203}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{031CB4EE-B043-4FC6-9D02-18EC60D47B87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{D3EEC342-6362-4C61-9E42-957063901C10}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{3305D777-062C-4F8B-BCA6-23C1871504F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{5A3F9FE4-60E5-481E-BD8B-207B50E09C49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{359D1811-5249-41AF-AE21-E3032AC1F9FB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{695B250A-0B2B-4C64-B90D-0547D446437B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{C260677E-6DDA-46EF-B522-86273D9AB4CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		DebugNoWPF|Any CPU = DebugNoWPF|Any CPU
-		DebugNoWPF|x64 = DebugNoWPF|x64
-		DebugNoWPF|x86 = DebugNoWPF|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
-		ReleaseNoWPF|Any CPU = ReleaseNoWPF|Any CPU
-		ReleaseNoWPF|x64 = ReleaseNoWPF|x64
-		ReleaseNoWPF|x86 = ReleaseNoWPF|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -509,6 +552,6 @@ Global
 		{ECFE11DD-1111-4557-8E28-42F8E9878823} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B3F2A592-CCE0-40C2-8CA4-7B1293DED874}
+		SolutionGuid = {37006CC5-F2DD-411A-BC9C-565614CD85CD}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Identity/NuGetPackageVerifier.json b/src/Identity/NuGetPackageVerifier.json
deleted file mode 100644
index eff389943d..0000000000
--- a/src/Identity/NuGetPackageVerifier.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "Default": {
-        "rules": [
-            "DefaultCompositeRule"
-        ],
-        "packages": {
-            "Microsoft.AspNetCore.Identity.UI": {
-                "Exclusions": {
-                    "DOC_MISSING": {
-                        "lib/netcoreapp3.0/Microsoft.AspNetCore.Identity.UI.Views.V3.dll": "This assembly is generated and contains precompiled razor pages",
-                        "lib/netcoreapp3.0/Microsoft.AspNetCore.Identity.UI.Views.V4.dll": "This assembly is generated and contains precompiled razor pages"
-                      }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Identity/README.md b/src/Identity/README.md
index 14d2f1eb03..8cfaf18654 100644
--- a/src/Identity/README.md
+++ b/src/Identity/README.md
@@ -1,14 +1,8 @@
 ASP.NET Core Identity
-===
-
-AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/vf79kttspnblh2hx/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Identity/branch/dev)
-
-Travis:   [![Travis](https://travis-ci.org/aspnet/Identity.svg?branch=dev)](https://travis-ci.org/aspnet/Identity)
+=====================
 
 ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user.
 
-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.
-
 ## ASP.NET Identity for ASP.NET MVC 5
 
 The previous versions of Identity for MVC5 and lower, previously available on CodePlex, are available at https://github.com/aspnet/AspNetIdentity
@@ -19,8 +13,8 @@ The previous versions of Identity for MVC5 and lower, previously available on Co
 
 * ASP.NET Identity MongoDB Providers:
   * [By Tugberk Ugurlu](https://github.com/tugberkugurlu/AspNetCore.Identity.MongoDB)
-  * [By Alexandre Spieser](https://github.com/alexandre-spieser/AspNetCore.Identity.MongoDbCore) 
- * [ASP.NET Identity LinqToDB Provider](https://github.com/ili/LinqToDB.Identity) 
+  * [By Alexandre Spieser](https://github.com/alexandre-spieser/AspNetCore.Identity.MongoDbCore)
+ * [ASP.NET Identity LinqToDB Provider](https://github.com/ili/LinqToDB.Identity)
  * [ASP.NET Identity DynamoDB Provider](https://github.com/miltador/AspNetCore.Identity.DynamoDB)
  * ASP.NET Identity RavenDB Providers:
     * [By Judah Gabriel Himango](https://github.com/JudahGabriel/RavenDB.Identity)
diff --git a/src/Identity/src/Specification.Tests/IdentityResultAssert.cs b/src/Identity/Specification.Tests/src/IdentityResultAssert.cs
similarity index 100%
rename from src/Identity/src/Specification.Tests/IdentityResultAssert.cs
rename to src/Identity/Specification.Tests/src/IdentityResultAssert.cs
diff --git a/src/Identity/src/Specification.Tests/IdentitySpecificationTestBase.cs b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs
similarity index 100%
rename from src/Identity/src/Specification.Tests/IdentitySpecificationTestBase.cs
rename to src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs
diff --git a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
new file mode 100644
index 0000000000..b257b97b0a
--- /dev/null
+++ b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Shared test suite for Asp.Net Identity Core store implementations.</Description>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;identity;membership</PackageTags>
+    <IsTestProject>false</IsTestProject>
+    <IsProductPackage>true</IsProductPackage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Logging" />
+    <Reference Include="xunit.assert" />
+    <Reference Include="xunit.extensibility.core" />
+    <Reference Include="xunit.analyzers" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/src/Specification.Tests/TestLogger.cs b/src/Identity/Specification.Tests/src/TestLogger.cs
similarity index 100%
rename from src/Identity/src/Specification.Tests/TestLogger.cs
rename to src/Identity/Specification.Tests/src/TestLogger.cs
diff --git a/src/Identity/src/Specification.Tests/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
similarity index 100%
rename from src/Identity/src/Specification.Tests/UserManagerSpecificationTests.cs
rename to src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
diff --git a/src/Identity/src/Specification.Tests/baseline.netcore.json b/src/Identity/Specification.Tests/src/baseline.netcore.json
similarity index 100%
rename from src/Identity/src/Specification.Tests/baseline.netcore.json
rename to src/Identity/Specification.Tests/src/baseline.netcore.json
diff --git a/src/Identity/src/UI/Areas/Identity/Filters/ExternalLoginsPageFilter.cs b/src/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Filters/ExternalLoginsPageFilter.cs
rename to src/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPasswordConfirmation.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Lockout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Lockout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Lockout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Lockout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Lockout.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Lockout.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Lockout.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Lockout.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Login.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Login.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Login.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWith2fa.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/LoginWithRecoveryCode.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Logout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Logout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Logout.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Logout.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DeletePersonalData.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Disable2fa.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/DownloadPersonalData.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ExternalLogins.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/GenerateRecoveryCodes.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/PersonalData.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ResetAuthenticator.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_Layout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_Layout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_Layout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_StatusMessage.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_StatusMessage.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_StatusMessage.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_StatusMessage.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_ViewStart.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewStart.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Manage/_ViewStart.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewStart.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPasswordConfirmation.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Error.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Error.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Error.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Error.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/Error.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Error.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/Error.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/Error.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/_Layout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/_Layout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/_Layout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/_ValidationScriptsPartial.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/_ValidationScriptsPartial.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/_ValidationScriptsPartial.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/_ViewImports.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewImports.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V3/_ViewStart.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewStart.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V3/_ViewStart.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewStart.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Lockout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Lockout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Lockout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Lockout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Lockout.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Lockout.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Lockout.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Lockout.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Logout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Logout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Logout.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Logout.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DownloadPersonalData.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ExternalLogins.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/GenerateRecoveryCodes.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/PersonalData.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ResetAuthenticator.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_Layout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_Layout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_Layout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_StatusMessage.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_StatusMessage.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_StatusMessage.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_StatusMessage.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_ViewStart.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewStart.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Manage/_ViewStart.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewStart.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Error.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Error.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Error.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Error.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/Error.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Error.cshtml.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/Error.cshtml.cs
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/Error.cshtml.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/_Layout.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/_ValidationScriptsPartial.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/_ValidationScriptsPartial.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/_ValidationScriptsPartial.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/_ViewImports.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewImports.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Pages/V4/_ViewStart.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewStart.cshtml
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Pages/V4/_ViewStart.cshtml
rename to src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewStart.cshtml
diff --git a/src/Identity/src/UI/Areas/Identity/Services/EmailSender.cs b/src/Identity/UI/src/Areas/Identity/Services/EmailSender.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Services/EmailSender.cs
rename to src/Identity/UI/src/Areas/Identity/Services/EmailSender.cs
diff --git a/src/Identity/src/UI/Areas/Identity/Services/IEmailSender.cs b/src/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs
similarity index 100%
rename from src/Identity/src/UI/Areas/Identity/Services/IEmailSender.cs
rename to src/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs
diff --git a/src/Identity/src/UI/DefaultUIOptions.cs b/src/Identity/UI/src/DefaultUIOptions.cs
similarity index 100%
rename from src/Identity/src/UI/DefaultUIOptions.cs
rename to src/Identity/UI/src/DefaultUIOptions.cs
diff --git a/src/Identity/src/UI/IdentityBuilderUIExtensions.cs b/src/Identity/UI/src/IdentityBuilderUIExtensions.cs
similarity index 100%
rename from src/Identity/src/UI/IdentityBuilderUIExtensions.cs
rename to src/Identity/UI/src/IdentityBuilderUIExtensions.cs
diff --git a/src/Identity/src/UI/IdentityDefaultUIAttribute.cs b/src/Identity/UI/src/IdentityDefaultUIAttribute.cs
similarity index 100%
rename from src/Identity/src/UI/IdentityDefaultUIAttribute.cs
rename to src/Identity/UI/src/IdentityDefaultUIAttribute.cs
diff --git a/src/Identity/src/UI/IdentityDefaultUIConfigureOptions.cs b/src/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs
similarity index 100%
rename from src/Identity/src/UI/IdentityDefaultUIConfigureOptions.cs
rename to src/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs
diff --git a/src/Identity/src/UI/IdentityPageModelConvention.cs b/src/Identity/UI/src/IdentityPageModelConvention.cs
similarity index 100%
rename from src/Identity/src/UI/IdentityPageModelConvention.cs
rename to src/Identity/UI/src/IdentityPageModelConvention.cs
diff --git a/src/Identity/src/UI/IdentityServiceCollectionUIExtensions.cs b/src/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs
similarity index 100%
rename from src/Identity/src/UI/IdentityServiceCollectionUIExtensions.cs
rename to src/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs
diff --git a/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
similarity index 90%
rename from src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
rename to src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
index 8cefb6242d..6d6fea9dd9 100644
--- a/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
@@ -29,15 +29,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\Stores\Microsoft.Extensions.Identity.Stores.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
+    <Reference Include="Microsoft.Extensions.Identity.Stores" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Identity/src/UI/Properties/AssemblyInfo.ApplicationParts.cs b/src/Identity/UI/src/Properties/AssemblyInfo.ApplicationParts.cs
similarity index 100%
rename from src/Identity/src/UI/Properties/AssemblyInfo.ApplicationParts.cs
rename to src/Identity/UI/src/Properties/AssemblyInfo.ApplicationParts.cs
diff --git a/src/Identity/src/UI/THIRD-PARTY-NOTICES.txt b/src/Identity/UI/src/THIRD-PARTY-NOTICES.txt
similarity index 100%
rename from src/Identity/src/UI/THIRD-PARTY-NOTICES.txt
rename to src/Identity/UI/src/THIRD-PARTY-NOTICES.txt
diff --git a/src/Identity/src/UI/UIFramework.cs b/src/Identity/UI/src/UIFramework.cs
similarity index 100%
rename from src/Identity/src/UI/UIFramework.cs
rename to src/Identity/UI/src/UIFramework.cs
diff --git a/src/Identity/src/UI/baseline.netcore.json b/src/Identity/UI/src/baseline.netcore.json
similarity index 100%
rename from src/Identity/src/UI/baseline.netcore.json
rename to src/Identity/UI/src/baseline.netcore.json
diff --git a/src/Identity/src/UI/breakingchanges.netcore.json b/src/Identity/UI/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Identity/src/UI/breakingchanges.netcore.json
rename to src/Identity/UI/src/breakingchanges.netcore.json
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/css/site.css b/src/Identity/UI/src/wwwroot/V3/Identity/css/site.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/css/site.css
rename to src/Identity/UI/src/wwwroot/V3/Identity/css/site.css
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/js/site.js b/src/Identity/UI/src/wwwroot/V3/Identity/js/site.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/js/site.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/js/site.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/LICENSE b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/LICENSE
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/LICENSE
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/LICENSE
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.min.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/js/npm.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/js/npm.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/bootstrap/dist/js/npm.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/bootstrap/dist/js/npm.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/LICENSE.md b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/LICENSE.md
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/LICENSE.md
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.min.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.min.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.min.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.min.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/LICENSE.txt b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/LICENSE.txt
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/LICENSE.txt
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/dist/jquery.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/dist/jquery.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/dist/jquery.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.js b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.js
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.js
diff --git a/src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.map b/src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.map
rename to src/Identity/UI/src/wwwroot/V3/Identity/lib/jquery/dist/jquery.min.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/css/site.css b/src/Identity/UI/src/wwwroot/V4/Identity/css/site.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/css/site.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/css/site.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/favicon.ico b/src/Identity/UI/src/wwwroot/V4/Identity/favicon.ico
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/favicon.ico
rename to src/Identity/UI/src/wwwroot/V4/Identity/favicon.ico
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/js/site.js b/src/Identity/UI/src/wwwroot/V4/Identity/js/site.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/js/site.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/js/site.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/LICENSE b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/LICENSE
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/LICENSE
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/LICENSE
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/npm.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/npm.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/bootstrap/dist/js/npm.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/bootstrap/dist/js/npm.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/LICENSE.md b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/LICENSE.md
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/LICENSE.md
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.min.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.min.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.min.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.min.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/LICENSE.txt b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/LICENSE.txt
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/LICENSE.txt
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/dist/jquery.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/dist/jquery.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/dist/jquery.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.js b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.js
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.js
diff --git a/src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.map b/src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/Identity/src/UI/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.map
rename to src/Identity/UI/src/wwwroot/V4/Identity/lib/jquery/dist/jquery.min.map
diff --git a/src/Identity/build.cmd b/src/Identity/build.cmd
new file mode 100644
index 0000000000..f22573197f
--- /dev/null
+++ b/src/Identity/build.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET RepoRoot=%~dp0..\..
+%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %*
diff --git a/src/Identity/build/Key.snk b/src/Identity/build/Key.snk
deleted file mode 100644
index e10e4889c1..0000000000
Binary files a/src/Identity/build/Key.snk and /dev/null differ
diff --git a/src/Identity/build/dependencies.props b/src/Identity/build/dependencies.props
deleted file mode 100644
index 83f682940f..0000000000
--- a/src/Identity/build/dependencies.props
+++ /dev/null
@@ -1,75 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <PropertyGroup Label="Package Versions">
-    <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
-    <IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion>
-    <IdentityServer4EntityFrameworkPackageVersion>2.3.0</IdentityServer4EntityFrameworkPackageVersion>
-    <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion>
-    <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreCookiePolicyPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreCookiePolicyPackageVersion>
-    <MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion>
-    <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
-    <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
-    <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsPackageVersion>
-    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpPackageVersion>
-    <MicrosoftAspNetCoreHttpsPolicyPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
-    <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
-    <MicrosoftAspNetCoreMvcTestingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcTestingPackageVersion>
-    <MicrosoftAspNetCoreRewritePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRewritePackageVersion>
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview-181109-02</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationBinderPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-18579-0056</MicrosoftNETSdkRazorPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
-    <MicrosoftOwinSecurityInteropPackageVersion>3.0.0-alpha1-10742</MicrosoftOwinSecurityInteropPackageVersion>
-    <MoqPackageVersion>4.10.0</MoqPackageVersion>
-    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview1-26907-04</SystemComponentModelAnnotationsPackageVersion>
-    <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
-    <XunitAssertPackageVersion>2.3.1</XunitAssertPackageVersion>
-    <XunitExtensibilityCorePackageVersion>2.3.1</XunitExtensibilityCorePackageVersion>
-    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
-  </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-  <PropertyGroup Label="Package Versions: Pinned" />
-</Project>
diff --git a/src/Identity/build/repo.props b/src/Identity/build/repo.props
deleted file mode 100644
index 744ce282f7..0000000000
--- a/src/Identity/build/repo.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <Import Project="dependencies.props" />
-
-  <PropertyGroup>
-    <OverridePackageOutputPath>false</OverridePackageOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/Identity/build/repo.targets b/src/Identity/build/repo.targets
deleted file mode 100644
index 867ea2537a..0000000000
--- a/src/Identity/build/repo.targets
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <ItemGroup>
-    <Solutions Update="$(RepositoryRoot)Identity.sln">
-      <!-- the 'DebugNoWPF' and 'ReleaseNoWPF' configurations exclude the WPF project, which doesn't build with Microsoft.NET.Sdk yet. -->
-      <AdditionalProperties>Configuration=$(Configuration)NoWPF</AdditionalProperties>
-    </Solutions>
-  </ItemGroup>
-</Project>
diff --git a/src/Identity/build/sources.props b/src/Identity/build/sources.props
deleted file mode 100644
index 9215df9751..0000000000
--- a/src/Identity/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/Identity/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/samples/ApiAuthSample/ApiAuthSample.csproj
deleted file mode 100644
index d6f43b9d64..0000000000
--- a/src/Identity/samples/ApiAuthSample/ApiAuthSample.csproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UserSecretsId>aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.CookiePolicy" Version="$(MicrosoftAspNetCoreCookiePolicyPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="$(MicrosoftAspNetCoreHttpsPolicyPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="$(MicrosoftAspNetCoreRewritePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <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.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\ApiAuth.IS\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj" />
-    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\UI\Microsoft.AspNetCore.Identity.UI.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Identity/samples/ApiAuthSample/Properties/launchSettings.json b/src/Identity/samples/ApiAuthSample/Properties/launchSettings.json
deleted file mode 100644
index 99ff3ccfc3..0000000000
--- a/src/Identity/samples/ApiAuthSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:14440",
-      "sslPort": 44316
-    }
-  },
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "ApiAuthSample": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
index 39f6bb9d43..0637f96151 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
+++ b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Description>Identity sample MVC application on ASP.NET Core using the default UI</Description>
@@ -7,30 +7,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\UI\Microsoft.AspNetCore.Identity.UI.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="$(MicrosoftAspNetCoreAuthenticationGooglePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(MicrosoftAspNetCoreAuthenticationTwitterPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftAspNetCoreAuthorizationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Facebook" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Google" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Twitter" />
+    <Reference Include="Microsoft.AspNetCore.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.UI" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
index 8b3e7f604a..b78dc55331 100644
--- a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
+++ b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Description>Identity sample MVC application on ASP.NET Core</Description>
@@ -7,29 +7,25 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="$(MicrosoftAspNetCoreAuthenticationGooglePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(MicrosoftAspNetCoreAuthenticationTwitterPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftAspNetCoreAuthorizationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Facebook" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Google" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Twitter" />
+    <Reference Include="Microsoft.AspNetCore.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
   </ItemGroup>
 </Project>
diff --git a/src/Identity/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj
deleted file mode 100644
index 1e0af1cd26..0000000000
--- a/src/Identity/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Description>ASP.NET Core API Authorization package powered by Identity Server.</Description>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;apiauth;identity</PackageTags>
-    <EnableApiCheck>false</EnableApiCheck>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\UI\Microsoft.AspNetCore.Identity.UI.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Identity/src/Directory.Build.props b/src/Identity/src/Directory.Build.props
deleted file mode 100644
index 4b89a431e7..0000000000
--- a/src/Identity/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/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
deleted file mode 100644
index 0c8446af4d..0000000000
--- a/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>Shared test suite for Asp.Net Identity Core store implementations.</Description>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;identity;membership</PackageTags>
-    <IsProductPackage>true</IsProductPackage>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
-    <PackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" />
-    <PackageReference Include="xunit.extensibility.core" Version="$(XunitExtensibilityCorePackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Identity/startvs.cmd b/src/Identity/startvs.cmd
new file mode 100644
index 0000000000..7dfe1fc0ff
--- /dev/null
+++ b/src/Identity/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Identity.sln
diff --git a/src/Identity/test/Directory.Build.props b/src/Identity/test/Directory.Build.props
deleted file mode 100644
index b9ebade8ca..0000000000
--- a/src/Identity/test/Directory.Build.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <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="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
deleted file mode 100644
index 4c15efc47c..0000000000
--- a/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Shared\*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
deleted file mode 100644
index 4cea868fcb..0000000000
--- a/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Shared\*.cs" />
-    <Content Include="config.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
index 3c201f9c7b..d6d0411eeb 100644
--- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
+++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@@ -1,16 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\src\Core\Base32.cs" Link="Infrastructure\Base32.cs" />
-    <Compile Include="..\..\src\Core\Rfc6238AuthenticationService.cs" Link="Infrastructure\Rfc6238AuthenticationService.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WebSites\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj" />
+    <Compile Include="..\..\Extensions.Core\src\Base32.cs" Link="Infrastructure\Base32.cs" />
+    <Compile Include="..\..\Extensions.Core\src\Rfc6238AuthenticationService.cs" Link="Infrastructure\Rfc6238AuthenticationService.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -18,15 +14,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCoreMvcTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
-    <PackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
+    <ProjectReference Include="..\..\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj" />
+
+    <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
+    <Reference Include="Microsoft.Extensions.Logging.Testing" />
+    <Reference Include="Microsoft.EntityFrameworkCore.InMemory" />
+    <Reference Include="AngleSharp" />
   </ItemGroup>
 
+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
+
   <Target Name="CopyViews" AfterTargets="Build" Condition="$(TargetFramework) != ''">
     <ItemGroup>
-      <_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\src\UI\bin\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" />
+      <_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" />
     </ItemGroup>
     <Copy
       SourceFiles="@(_IdentityUIViewsAssemblies)"
diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
index 857bff95c0..f18fde8e52 100644
--- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
+++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using AngleSharp.Dom.Html;
@@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Identity.Test
         public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag)
         {
             var slnDir = GetSolutionDir();
-            var wwwrootDir = Path.Combine(slnDir, "src", "UI", "wwwroot", scriptTag.Version);
+            var wwwrootDir = Path.Combine(slnDir, "UI", "src", "wwwroot", scriptTag.Version);
 
             var cdnContent = await _httpClient.GetStringAsync(scriptTag.Src);
             var fallbackSrcContent = File.ReadAllText(
@@ -96,8 +96,8 @@ namespace Microsoft.AspNetCore.Identity.Test
         private static List<ScriptTag> GetScriptTags()
         {
             var slnDir = GetSolutionDir();
-            var uiDirV3 = Path.Combine(slnDir, "src", "UI", "Areas", "Identity", "Pages", "V3");
-            var uiDirV4 = Path.Combine(slnDir, "src", "UI", "Areas", "Identity", "Pages", "V4");
+            var uiDirV3 = Path.Combine(slnDir, "UI", "src", "Areas", "Identity", "Pages", "V3");
+            var uiDirV4 = Path.Combine(slnDir, "UI", "src", "Areas", "Identity", "Pages", "V4");
             var cshtmlFiles = GetRazorFiles(uiDirV3).Concat(GetRazorFiles(uiDirV4));
 
             var scriptTags = new List<ScriptTag>();
diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
index eea6850afc..d58f615965 100644
--- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
+++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
@@ -5,20 +5,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Shared\*.cs" />
+    <Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
+    <Reference Include="AngleSharp" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
index 4e99761dd1..b59b531ab1 100644
--- a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
+++ b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
@@ -5,18 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Shared\*.cs" />
+    <Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Identity/test/Shared/PocoRole.cs b/src/Identity/test/Shared/PocoModel/PocoRole.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoRole.cs
rename to src/Identity/test/Shared/PocoModel/PocoRole.cs
diff --git a/src/Identity/test/Shared/PocoRoleClaim.cs b/src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoRoleClaim.cs
rename to src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs
diff --git a/src/Identity/test/Shared/PocoUser.cs b/src/Identity/test/Shared/PocoModel/PocoUser.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoUser.cs
rename to src/Identity/test/Shared/PocoModel/PocoUser.cs
diff --git a/src/Identity/test/Shared/PocoUserClaim.cs b/src/Identity/test/Shared/PocoModel/PocoUserClaim.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoUserClaim.cs
rename to src/Identity/test/Shared/PocoModel/PocoUserClaim.cs
diff --git a/src/Identity/test/Shared/PocoUserLogin.cs b/src/Identity/test/Shared/PocoModel/PocoUserLogin.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoUserLogin.cs
rename to src/Identity/test/Shared/PocoModel/PocoUserLogin.cs
diff --git a/src/Identity/test/Shared/PocoUserRole.cs b/src/Identity/test/Shared/PocoModel/PocoUserRole.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoUserRole.cs
rename to src/Identity/test/Shared/PocoModel/PocoUserRole.cs
diff --git a/src/Identity/test/Shared/PocoUserToken.cs b/src/Identity/test/Shared/PocoModel/PocoUserToken.cs
similarity index 100%
rename from src/Identity/test/Shared/PocoUserToken.cs
rename to src/Identity/test/Shared/PocoModel/PocoUserToken.cs
diff --git a/src/Identity/test/WebSites/Directory.Build.props b/src/Identity/test/WebSites/Directory.Build.props
deleted file mode 100644
index c8a4ec4440..0000000000
--- a/src/Identity/test/WebSites/Directory.Build.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-  <!-- Skip the parent directory so test websites do not get the test package references. -->
-  <Import Project="..\..\Directory.Build.props" />
-</Project>
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
deleted file mode 100644
index 17fa5548f4..0000000000
--- a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UserSecretsId>aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\InMemory.Test\InMemoryUserStore.cs" Link="Services\InMemoryUserStore.cs" />
-    <Compile Include="..\..\Shared\Poco*.cs" Link="Data\%(FileName)%(Extension)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="$(MicrosoftAspNetCoreAuthenticationGooglePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(MicrosoftAspNetCoreAuthenticationTwitterPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftAspNetCoreAuthorizationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.CookiePolicy" Version="$(MicrosoftAspNetCoreCookiePolicyPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="$(MicrosoftAspNetCoreHttpsPolicyPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="$(MicrosoftAspNetCoreRewritePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <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.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\src\UI\Microsoft.AspNetCore.Identity.UI.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json b/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json
deleted file mode 100644
index 9ceafce5ee..0000000000
--- a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:27891/",
-      "sslPort": 44333
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_HTTPS_PORT": "44333",
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Identity.DefaultUI.WebSite": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "https://localhost:44333;http://localhost:27891",
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Bootstrap3Startup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Bootstrap3Startup.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Bootstrap3Startup.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Bootstrap3Startup.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs
diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
new file mode 100644
index 0000000000..65f21e44cb
--- /dev/null
+++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UserSecretsId>aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\test\InMemory.Test\InMemoryUserStore.cs" LinkBase="Services" />
+    <Compile Include="$(IdentityTestSharedSourceRoot)PocoModel\*.cs" LinkBase="Data" />
+  </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.Twitter" />
+    <Reference Include="Microsoft.AspNetCore.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.CookiePolicy" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.UI" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Rewrite" />
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" />
+    <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Logging.Configuration" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="Microsoft.Extensions.Logging.Debug" />
+    <Reference Include="Microsoft.NET.Sdk.Razor" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/NoIdentityStartup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/NoIdentityStartup.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Shared/_CookieConsentPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_CookieConsentPartial.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Shared/_CookieConsentPartial.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_CookieConsentPartial.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUser.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUser.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUserStartup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUserStartup.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Program.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Program.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Startup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Startup.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.Development.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.Development.json
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.json
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/css/site.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/css/site.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/favicon.ico b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/favicon.ico
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/js/site.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/js/site.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.js
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map
rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/Identity/version.props b/src/Identity/version.props
deleted file mode 100644
index 03bcf51212..0000000000
--- a/src/Identity/version.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <VersionPrefix>3.0.0</VersionPrefix>
-    <VersionSuffix>alpha1</VersionSuffix>
-    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND ('$(VersionSuffix)' == 'servicing' OR '$(VersionSuffix)' == 'rtm') ">$(VersionPrefix)</PackageVersion>
-    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'servicing' 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>
-    <ExperimentalVersionPrefix>0.6.0</ExperimentalVersionPrefix>
-    <ExperimentalVersionSuffix>alpha1</ExperimentalVersionSuffix>
-    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND ('$(ExperimentalVersionSuffix)' == 'servicing' OR '$(ExperimentalVersionSuffix)' == 'rtm') ">$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
-    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'servicing' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
-    <ExperimentalVersionSuffix Condition="'$(ExperimentalVersionSuffix)' != '' And '$(BuildNumber)' != ''">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>
-  </PropertyGroup>
-</Project>
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 58ea93b92e..7448e287e5 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
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.targets" />
+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
diff --git a/src/Servers/IIS/Directory.Build.targets b/src/Servers/IIS/Directory.Build.targets
deleted file mode 100644
index d6a76c85fe..0000000000
--- a/src/Servers/IIS/Directory.Build.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <Import Project="ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-</Project>
diff --git a/src/SiteExtensions/Runtime/Directory.Build.targets b/src/SiteExtensions/Runtime/Directory.Build.targets
index 661159ab76..b51869bb9e 100644
--- a/src/SiteExtensions/Runtime/Directory.Build.targets
+++ b/src/SiteExtensions/Runtime/Directory.Build.targets
@@ -30,8 +30,6 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="$(RepositoryRoot)src\Servers\IIS\ResolveIisReferences.targets" />
-
   <Target Name="CopyFilesToOutputDirectory" />
   <Target Name="CoreCompile" />
   <Target Name="CreateManifestResourceNames" />