diff --git a/Identity.sln b/Identity.sln
index 74cac80e90..9a198807a1 100644
--- a/Identity.sln
+++ b/Identity.sln
@@ -12,59 +12,59 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-6
 		test\Directory.Build.props = test\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Microsoft.AspNetCore.Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\Microsoft.AspNetCore.Identity.InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
+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}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}"
+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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}"
+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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Identity.AspNetCoreCompat", "src\Microsoft.AspNet.Identity.AspNetCoreCompat\Microsoft.AspNet.Identity.AspNetCoreCompat.csproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Identity.AspNetCoreCompat", "src\AspNetCoreCompat\Microsoft.AspNet.Identity.AspNetCoreCompat.csproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "src\Microsoft.AspNetCore.Identity.Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{5608E828-DD54-4E2A-B73C-FC22268BE797}"
+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.AspNetCore.Diagnostics.Identity.Service", "src\Microsoft.AspNetCore.Diagnostics.Identity.Service\Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj", "{CD787C9A-58B7-4CBC-B8E3-66698EE58C11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Identity.Service", "src\Service.Diagnostics\Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj", "{CD787C9A-58B7-4CBC-B8E3-66698EE58C11}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service", "src\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj", "{B44C2A7F-EA9E-4A9F-9698-1C9F9BB40E0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service", "src\Service\Microsoft.AspNetCore.Identity.Service.csproj", "{B44C2A7F-EA9E-4A9F-9698-1C9F9BB40E0C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Abstractions", "src\Microsoft.AspNetCore.Identity.Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj", "{F34C3ED8-D4A9-47CE-BE0F-1F234A33AC81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Abstractions", "src\Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj", "{F34C3ED8-D4A9-47CE-BE0F-1F234A33AC81}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Core", "src\Microsoft.AspNetCore.Identity.Service.Core\Microsoft.AspNetCore.Identity.Service.Core.csproj", "{590697C1-EA60-4412-8A21-4EF35142381F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Core", "src\Service.Core\Microsoft.AspNetCore.Identity.Service.Core.csproj", "{590697C1-EA60-4412-8A21-4EF35142381F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore", "src\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj", "{CD360545-3395-4C44-AD27-C32EECDD9572}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore", "src\Service.EF\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj", "{CD360545-3395-4C44-AD27-C32EECDD9572}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.IntegratedWebClient", "src\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj", "{CA19785B-CE2F-480D-BB57-93A43A2DFDAB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.IntegratedWebClient", "src\Service.IntegratedWebClient\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj", "{CA19785B-CE2F-480D-BB57-93A43A2DFDAB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Mvc", "src\Microsoft.AspNetCore.Identity.Service.Mvc\Microsoft.AspNetCore.Identity.Service.Mvc.csproj", "{B3AE446B-859B-4C2C-98FD-A084C854941E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Mvc", "src\Service.Mvc\Microsoft.AspNetCore.Identity.Service.Mvc.csproj", "{B3AE446B-859B-4C2C-98FD-A084C854941E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Abstractions.Test", "test\Microsoft.AspNetCore.Identity.Service.Abstractions.Test\Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj", "{27D28F0E-08F6-4EEA-8705-E0B559C87F3B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Abstractions.Test", "test\Service.Abstractions.Test\Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj", "{27D28F0E-08F6-4EEA-8705-E0B559C87F3B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Core.Test", "test\Microsoft.AspNetCore.Identity.Service.Core.Test\Microsoft.AspNetCore.Identity.Service.Core.Test.csproj", "{444F07E7-CF65-4717-BEF3-BA29F60DDE6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Core.Test", "test\Service.Core.Test\Microsoft.AspNetCore.Identity.Service.Core.Test.csproj", "{444F07E7-CF65-4717-BEF3-BA29F60DDE6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Test", "test\Microsoft.AspNetCore.Identity.Service.Test\Microsoft.AspNetCore.Identity.Service.Test.csproj", "{204163F9-E9BB-4940-9659-77F617C00D97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Test", "test\Service.Test\Microsoft.AspNetCore.Identity.Service.Test.csproj", "{204163F9-E9BB-4940-9659-77F617C00D97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Specification.Tests", "src\Microsoft.AspNetCore.Identity.Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj", "{C05D641C-A3EE-4A56-9A39-F20F3B9C4D36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.Specification.Tests", "src\Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj", "{C05D641C-A3EE-4A56-9A39-F20F3B9C4D36}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test", "test\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj", "{7423EB30-FFE9-4707-A44B-571E89A7CA15}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test", "test\Service.EF.InMemory.Test\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj", "{7423EB30-FFE9-4707-A44B-571E89A7CA15}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test", "test\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj", "{4F5D777E-3CFA-4EDF-BA89-4FE04BBF7A66}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test", "test\Service.EF.Test\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj", "{4F5D777E-3CFA-4EDF-BA89-4FE04BBF7A66}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.InMemory.Test", "test\Microsoft.AspNetCore.Identity.Service.InMemory.Test\Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj", "{94EC586A-2AE6-4AF2-894A-B0973C65BD68}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.InMemory.Test", "test\Service.InMemory.Test\Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj", "{94EC586A-2AE6-4AF2-894A-B0973C65BD68}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "src\Microsoft.Extensions.Identity.Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "src\Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Microsoft.Extensions.Identity.Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.AzureKeyVault", "src\Microsoft.AspNetCore.Identity.Service.AzureKeyVault\Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj", "{174180AE-00AD-4C2D-9F96-2EE2C5E60457}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Service.AzureKeyVault", "src\Service.AzureKeyVault\Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj", "{174180AE-00AD-4C2D-9F96-2EE2C5E60457}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityOIDCWebApplicationSample", "samples\IdentityOIDCWebApplicationSample\IdentityOIDCWebApplicationSample.csproj", "{D7CE9BDF-84E5-405D-8A4E-12E41DAC6935}"
 EndProject
@@ -72,7 +72,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{1F
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.OpenIdConnect.WebSite", "test\WebSites\Identity.OpenIdConnect.WebSite\Identity.OpenIdConnect.WebSite.csproj", "{D6FF6433-336F-42E0-8F3A-60F3787A0261}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspnetCore.Identity.Service.FunctionalTests", "test\Microsoft.AspnetCore.Identity.Service.FunctionalTests\Microsoft.AspnetCore.Identity.Service.FunctionalTests.csproj", "{6E3E1BE7-CEAF-4565-AA0A-F5BE3FA7F39C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspnetCore.Identity.Service.FunctionalTests", "test\Service.FunctionalTests\Microsoft.AspnetCore.Identity.Service.FunctionalTests.csproj", "{6E3E1BE7-CEAF-4565-AA0A-F5BE3FA7F39C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{42F5B772-1D61-4C18-9457-412DE8E170A5}"
 	ProjectSection(SolutionItems) = preProject
@@ -84,7 +84,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeWPFClient", "samples\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "src\Microsoft.AspNetCore.Identity.UI\Microsoft.AspNetCore.Identity.UI.csproj", "{894E102D-56D4-4B02-8F13-8781F4324C3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "src\UI\Microsoft.AspNetCore.Identity.UI.csproj", "{894E102D-56D4-4B02-8F13-8781F4324C3E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/IdentityCore.sln b/IdentityCore.sln
index 0cec32433a..67bbcfc8a8 100644
--- a/IdentityCore.sln
+++ b/IdentityCore.sln
@@ -12,29 +12,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-6
 		test\Directory.Build.props = test\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity", "src\Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Microsoft.AspNetCore.Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\Microsoft.AspNetCore.Identity.InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InMemory.Test", "test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EF.Test", "test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EF.InMemory.Test", "test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EF", "src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Identity.AspNetCoreCompat", "src\Microsoft.AspNet.Identity.AspNetCoreCompat\Microsoft.AspNet.Identity.AspNetCoreCompat.csproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreCompat", "src\AspNetCoreCompat\Microsoft.AspNet.Identity.AspNetCoreCompat.csproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "src\Microsoft.AspNetCore.Identity.Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{5608E828-DD54-4E2A-B73C-FC22268BE797}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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\Microsoft.Extensions.Identity.Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Microsoft.Extensions.Identity.Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stores", "src\Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2C657F6C-D8AD-4833-9C59-2301A16957BD}"
 	ProjectSection(SolutionItems) = preProject
@@ -44,7 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{D5FB2E24-4C71-430C-A289-59C8D59164B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Identity.UI", "src\Microsoft.AspNetCore.Identity.UI\Microsoft.AspNetCore.Identity.UI.csproj", "{1FB3E9BB-E20A-4807-A4C3-F86A341304DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "src\UI\Microsoft.AspNetCore.Identity.UI.csproj", "{1FB3E9BB-E20A-4807-A4C3-F86A341304DB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj
index fb5e79c428..a2d5da9480 100644
--- a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj
+++ b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj
@@ -32,10 +32,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Diagnostics.Identity.Service\Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.AzureKeyVault\Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj" />
+    <ProjectReference Include="..\..\src\Service.Diagnostics\Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj" />
+    <ProjectReference Include="..\..\src\Service.EF\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\Service.IntegratedWebClient\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj" />
+    <ProjectReference Include="..\..\src\Service.AzureKeyVault\Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
index b99bd357ea..64698214aa 100644
--- a/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
+++ b/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.UI\Microsoft.AspNetCore.Identity.UI.csproj" />
+    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\UI\Microsoft.AspNetCore.Identity.UI.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
index f7a0e277af..9db4b00740 100644
--- a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
+++ b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/CookieInterop.cs b/src/AspNetCoreCompat/CookieInterop.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/CookieInterop.cs
rename to src/AspNetCoreCompat/CookieInterop.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityDbContext.cs b/src/AspNetCoreCompat/IdentityDbContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityDbContext.cs
rename to src/AspNetCoreCompat/IdentityDbContext.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityRole.cs b/src/AspNetCoreCompat/IdentityRole.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityRole.cs
rename to src/AspNetCoreCompat/IdentityRole.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityRoleClaim.cs b/src/AspNetCoreCompat/IdentityRoleClaim.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityRoleClaim.cs
rename to src/AspNetCoreCompat/IdentityRoleClaim.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityUser.cs b/src/AspNetCoreCompat/IdentityUser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityUser.cs
rename to src/AspNetCoreCompat/IdentityUser.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityUserLogin.cs b/src/AspNetCoreCompat/IdentityUserLogin.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/IdentityUserLogin.cs
rename to src/AspNetCoreCompat/IdentityUserLogin.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj b/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj
rename to src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/UserStore.cs b/src/AspNetCoreCompat/UserStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/UserStore.cs
rename to src/AspNetCoreCompat/UserStore.cs
diff --git a/src/Microsoft.AspNet.Identity.AspNetCoreCompat/baseline.netframework.json b/src/AspNetCoreCompat/baseline.netframework.json
similarity index 100%
rename from src/Microsoft.AspNet.Identity.AspNetCoreCompat/baseline.netframework.json
rename to src/AspNetCoreCompat/baseline.netframework.json
diff --git a/src/Microsoft.Extensions.Identity.Core/AuthenticatorTokenProvider.cs b/src/Core/AuthenticatorTokenProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/AuthenticatorTokenProvider.cs
rename to src/Core/AuthenticatorTokenProvider.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/Base32.cs b/src/Core/Base32.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/Base32.cs
rename to src/Core/Base32.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/ClaimsIdentityOptions.cs b/src/Core/ClaimsIdentityOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/ClaimsIdentityOptions.cs
rename to src/Core/ClaimsIdentityOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/EmailTokenProvider.cs b/src/Core/EmailTokenProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/EmailTokenProvider.cs
rename to src/Core/EmailTokenProvider.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/ILookupNormalizer.cs b/src/Core/ILookupNormalizer.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/ILookupNormalizer.cs
rename to src/Core/ILookupNormalizer.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IPasswordHasher.cs b/src/Core/IPasswordHasher.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IPasswordHasher.cs
rename to src/Core/IPasswordHasher.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IPasswordValidator.cs b/src/Core/IPasswordValidator.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IPasswordValidator.cs
rename to src/Core/IPasswordValidator.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IQueryableRoleStore.cs b/src/Core/IQueryableRoleStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IQueryableRoleStore.cs
rename to src/Core/IQueryableRoleStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IQueryableUserStore.cs b/src/Core/IQueryableUserStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IQueryableUserStore.cs
rename to src/Core/IQueryableUserStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IRoleClaimStore.cs b/src/Core/IRoleClaimStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IRoleClaimStore.cs
rename to src/Core/IRoleClaimStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IRoleStore.cs b/src/Core/IRoleStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IRoleStore.cs
rename to src/Core/IRoleStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IRoleValidator.cs b/src/Core/IRoleValidator.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IRoleValidator.cs
rename to src/Core/IRoleValidator.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserAuthenticationTokenStore.cs b/src/Core/IUserAuthenticationTokenStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserAuthenticationTokenStore.cs
rename to src/Core/IUserAuthenticationTokenStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserAuthenticatorKeyStore.cs b/src/Core/IUserAuthenticatorKeyStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserAuthenticatorKeyStore.cs
rename to src/Core/IUserAuthenticatorKeyStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserClaimStore.cs b/src/Core/IUserClaimStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserClaimStore.cs
rename to src/Core/IUserClaimStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserClaimsPrincipalFactory.cs b/src/Core/IUserClaimsPrincipalFactory.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserClaimsPrincipalFactory.cs
rename to src/Core/IUserClaimsPrincipalFactory.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserEmailStore.cs b/src/Core/IUserEmailStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserEmailStore.cs
rename to src/Core/IUserEmailStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserLockoutStore.cs b/src/Core/IUserLockoutStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserLockoutStore.cs
rename to src/Core/IUserLockoutStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserLoginStore.cs b/src/Core/IUserLoginStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserLoginStore.cs
rename to src/Core/IUserLoginStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserPasswordStore.cs b/src/Core/IUserPasswordStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserPasswordStore.cs
rename to src/Core/IUserPasswordStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserPhoneNumberStore.cs b/src/Core/IUserPhoneNumberStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserPhoneNumberStore.cs
rename to src/Core/IUserPhoneNumberStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserRoleStore.cs b/src/Core/IUserRoleStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserRoleStore.cs
rename to src/Core/IUserRoleStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserSecurityStampStore.cs b/src/Core/IUserSecurityStampStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserSecurityStampStore.cs
rename to src/Core/IUserSecurityStampStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserStore.cs b/src/Core/IUserStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserStore.cs
rename to src/Core/IUserStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserTwoFactorRecoveryCodeStore.cs b/src/Core/IUserTwoFactorRecoveryCodeStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserTwoFactorRecoveryCodeStore.cs
rename to src/Core/IUserTwoFactorRecoveryCodeStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserTwoFactorStore.cs b/src/Core/IUserTwoFactorStore.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserTwoFactorStore.cs
rename to src/Core/IUserTwoFactorStore.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserTwoFactorTokenProvider.cs b/src/Core/IUserTwoFactorTokenProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserTwoFactorTokenProvider.cs
rename to src/Core/IUserTwoFactorTokenProvider.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IUserValidator.cs b/src/Core/IUserValidator.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IUserValidator.cs
rename to src/Core/IUserValidator.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IdentityBuilder.cs b/src/Core/IdentityBuilder.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IdentityBuilder.cs
rename to src/Core/IdentityBuilder.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IdentityError.cs b/src/Core/IdentityError.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IdentityError.cs
rename to src/Core/IdentityError.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IdentityErrorDescriber.cs b/src/Core/IdentityErrorDescriber.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IdentityErrorDescriber.cs
rename to src/Core/IdentityErrorDescriber.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IdentityOptions.cs b/src/Core/IdentityOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IdentityOptions.cs
rename to src/Core/IdentityOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IdentityResult.cs b/src/Core/IdentityResult.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IdentityResult.cs
rename to src/Core/IdentityResult.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/IdentityServiceCollectionExtensions.cs b/src/Core/IdentityServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/IdentityServiceCollectionExtensions.cs
rename to src/Core/IdentityServiceCollectionExtensions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/LockoutOptions.cs b/src/Core/LockoutOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/LockoutOptions.cs
rename to src/Core/LockoutOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj b/src/Core/Microsoft.Extensions.Identity.Core.csproj
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/Microsoft.Extensions.Identity.Core.csproj
rename to src/Core/Microsoft.Extensions.Identity.Core.csproj
diff --git a/src/Microsoft.Extensions.Identity.Core/PasswordHasher.cs b/src/Core/PasswordHasher.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PasswordHasher.cs
rename to src/Core/PasswordHasher.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PasswordHasherCompatibilityMode.cs b/src/Core/PasswordHasherCompatibilityMode.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PasswordHasherCompatibilityMode.cs
rename to src/Core/PasswordHasherCompatibilityMode.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PasswordHasherOptions.cs b/src/Core/PasswordHasherOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PasswordHasherOptions.cs
rename to src/Core/PasswordHasherOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PasswordOptions.cs b/src/Core/PasswordOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PasswordOptions.cs
rename to src/Core/PasswordOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PasswordValidator.cs b/src/Core/PasswordValidator.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PasswordValidator.cs
rename to src/Core/PasswordValidator.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PasswordVerificationResult.cs b/src/Core/PasswordVerificationResult.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PasswordVerificationResult.cs
rename to src/Core/PasswordVerificationResult.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PhoneNumberTokenProvider.cs b/src/Core/PhoneNumberTokenProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PhoneNumberTokenProvider.cs
rename to src/Core/PhoneNumberTokenProvider.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/PrincipalExtensions.cs b/src/Core/PrincipalExtensions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/PrincipalExtensions.cs
rename to src/Core/PrincipalExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity/Properties/AssemblyInfo.cs b/src/Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/Properties/AssemblyInfo.cs
rename to src/Core/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/Properties/Resources.Designer.cs b/src/Core/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/Properties/Resources.Designer.cs
rename to src/Core/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/Resources.resx b/src/Core/Resources.resx
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/Resources.resx
rename to src/Core/Resources.resx
diff --git a/src/Microsoft.Extensions.Identity.Core/Rfc6238AuthenticationService.cs b/src/Core/Rfc6238AuthenticationService.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/Rfc6238AuthenticationService.cs
rename to src/Core/Rfc6238AuthenticationService.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/RoleManager.cs b/src/Core/RoleManager.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/RoleManager.cs
rename to src/Core/RoleManager.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/RoleValidator.cs b/src/Core/RoleValidator.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/RoleValidator.cs
rename to src/Core/RoleValidator.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/SignInOptions.cs b/src/Core/SignInOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/SignInOptions.cs
rename to src/Core/SignInOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/SignInResult.cs b/src/Core/SignInResult.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/SignInResult.cs
rename to src/Core/SignInResult.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/TokenOptions.cs b/src/Core/TokenOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/TokenOptions.cs
rename to src/Core/TokenOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/TokenProviderDescriptor.cs b/src/Core/TokenProviderDescriptor.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/TokenProviderDescriptor.cs
rename to src/Core/TokenProviderDescriptor.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/TotpSecurityStampBasedTokenProvider.cs b/src/Core/TotpSecurityStampBasedTokenProvider.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/TotpSecurityStampBasedTokenProvider.cs
rename to src/Core/TotpSecurityStampBasedTokenProvider.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/UpperInvariantLookupNormalizer.cs b/src/Core/UpperInvariantLookupNormalizer.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/UpperInvariantLookupNormalizer.cs
rename to src/Core/UpperInvariantLookupNormalizer.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/UserClaimsPrincipalFactory.cs b/src/Core/UserClaimsPrincipalFactory.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/UserClaimsPrincipalFactory.cs
rename to src/Core/UserClaimsPrincipalFactory.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/UserLoginInfo.cs b/src/Core/UserLoginInfo.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/UserLoginInfo.cs
rename to src/Core/UserLoginInfo.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/UserManager.cs b/src/Core/UserManager.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/UserManager.cs
rename to src/Core/UserManager.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/UserOptions.cs b/src/Core/UserOptions.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/UserOptions.cs
rename to src/Core/UserOptions.cs
diff --git a/src/Microsoft.Extensions.Identity.Core/UserValidator.cs b/src/Core/UserValidator.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/UserValidator.cs
rename to src/Core/UserValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityDbContext.cs b/src/EF/IdentityDbContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityDbContext.cs
rename to src/EF/IdentityDbContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityEntityFrameworkBuilderExtensions.cs b/src/EF/IdentityEntityFrameworkBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityEntityFrameworkBuilderExtensions.cs
rename to src/EF/IdentityEntityFrameworkBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityUserContext.cs b/src/EF/IdentityUserContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityUserContext.cs
rename to src/EF/IdentityUserContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
similarity index 72%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
rename to src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
index d68234c958..79339b9c1e 100644
--- a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
+++ b/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Identity.Stores\Microsoft.Extensions.Identity.Stores.csproj" />
+    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="..\Stores\Microsoft.Extensions.Identity.Stores.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Properties/Resources.Designer.cs b/src/EF/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Properties/Resources.Designer.cs
rename to src/EF/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Resources.resx b/src/EF/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Resources.resx
rename to src/EF/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/RoleStore.cs b/src/EF/RoleStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/RoleStore.cs
rename to src/EF/RoleStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/UserOnlyStore.cs b/src/EF/UserOnlyStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/UserOnlyStore.cs
rename to src/EF/UserOnlyStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/UserStore.cs b/src/EF/UserStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/UserStore.cs
rename to src/EF/UserStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/baseline.netcore.json b/src/EF/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/baseline.netcore.json
rename to src/EF/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/breakingchanges.netcore.json b/src/EF/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/breakingchanges.netcore.json
rename to src/EF/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Identity/AspNetRoleManager.cs b/src/Identity/AspNetRoleManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/AspNetRoleManager.cs
rename to src/Identity/AspNetRoleManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity/AspNetUserManager.cs b/src/Identity/AspNetUserManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/AspNetUserManager.cs
rename to src/Identity/AspNetUserManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity/BuilderExtensions.cs b/src/Identity/BuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/BuilderExtensions.cs
rename to src/Identity/BuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity/DataProtectionTokenProvider.cs b/src/Identity/DataProtectionTokenProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/DataProtectionTokenProvider.cs
rename to src/Identity/DataProtectionTokenProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity/DataProtectionTokenProviderOptions.cs b/src/Identity/DataProtectionTokenProviderOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/DataProtectionTokenProviderOptions.cs
rename to src/Identity/DataProtectionTokenProviderOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity/ExternalLoginInfo.cs b/src/Identity/ExternalLoginInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/ExternalLoginInfo.cs
rename to src/Identity/ExternalLoginInfo.cs
diff --git a/src/Microsoft.AspNetCore.Identity/ISecurityStampValidator.cs b/src/Identity/ISecurityStampValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/ISecurityStampValidator.cs
rename to src/Identity/ISecurityStampValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity/IdentityBuilderExtensions.cs b/src/Identity/IdentityBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/IdentityBuilderExtensions.cs
rename to src/Identity/IdentityBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity/IdentityConstants.cs b/src/Identity/IdentityConstants.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/IdentityConstants.cs
rename to src/Identity/IdentityConstants.cs
diff --git a/src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs b/src/Identity/IdentityServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs
rename to src/Identity/IdentityServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Microsoft.AspNetCore.Identity.csproj
similarity index 90%
rename from src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj
rename to src/Identity/Microsoft.AspNetCore.Identity.csproj
index 92ad853dac..6d83fe847b 100644
--- a/src/Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj
+++ b/src/Identity/Microsoft.AspNetCore.Identity.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Extensions.Identity.Core\Microsoft.Extensions.Identity.Core.csproj" />
+    <ProjectReference Include="..\Core\Microsoft.Extensions.Identity.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.Extensions.Identity.Core/Properties/AssemblyInfo.cs b/src/Identity/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Core/Properties/AssemblyInfo.cs
rename to src/Identity/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Identity/Properties/Resources.Designer.cs b/src/Identity/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/Properties/Resources.Designer.cs
rename to src/Identity/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Identity/Properties/debugSettings.json b/src/Identity/Properties/debugSettings.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/Properties/debugSettings.json
rename to src/Identity/Properties/debugSettings.json
diff --git a/src/Microsoft.AspNetCore.Identity/Resources.resx b/src/Identity/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/Resources.resx
rename to src/Identity/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Identity/SecurityStampRefreshingPrincipalContext.cs b/src/Identity/SecurityStampRefreshingPrincipalContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/SecurityStampRefreshingPrincipalContext.cs
rename to src/Identity/SecurityStampRefreshingPrincipalContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity/SecurityStampValidator.cs b/src/Identity/SecurityStampValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/SecurityStampValidator.cs
rename to src/Identity/SecurityStampValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity/SecurityStampValidatorOptions.cs b/src/Identity/SecurityStampValidatorOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/SecurityStampValidatorOptions.cs
rename to src/Identity/SecurityStampValidatorOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity/SignInManager.cs b/src/Identity/SignInManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/SignInManager.cs
rename to src/Identity/SignInManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity/baseline.netcore.json b/src/Identity/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/baseline.netcore.json
rename to src/Identity/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Identity/baseline.netframework.json b/src/Identity/baseline.netframework.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity/baseline.netframework.json
rename to src/Identity/baseline.netframework.json
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ApplicationScope.cs b/src/Service.Abstractions/ApplicationScope.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ApplicationScope.cs
rename to src/Service.Abstractions/ApplicationScope.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/AuthorizationGrant.cs b/src/Service.Abstractions/AuthorizationGrant.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/AuthorizationGrant.cs
rename to src/Service.Abstractions/AuthorizationGrant.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/AuthorizationRequest.cs b/src/Service.Abstractions/AuthorizationRequest.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/AuthorizationRequest.cs
rename to src/Service.Abstractions/AuthorizationRequest.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/AuthorizationResponse.cs b/src/Service.Abstractions/AuthorizationResponse.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/AuthorizationResponse.cs
rename to src/Service.Abstractions/AuthorizationResponse.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Claims/ClaimsGenerationContext.cs b/src/Service.Abstractions/Claims/ClaimsGenerationContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Claims/ClaimsGenerationContext.cs
rename to src/Service.Abstractions/Claims/ClaimsGenerationContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Claims/ITokenClaimsManager.cs b/src/Service.Abstractions/Claims/ITokenClaimsManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Claims/ITokenClaimsManager.cs
rename to src/Service.Abstractions/Claims/ITokenClaimsManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Claims/ITokenClaimsProvider.cs b/src/Service.Abstractions/Claims/ITokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Claims/ITokenClaimsProvider.cs
rename to src/Service.Abstractions/Claims/ITokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ConfigurationContext.cs b/src/Service.Abstractions/ConfigurationContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ConfigurationContext.cs
rename to src/Service.Abstractions/ConfigurationContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IAuthorizationRequestFactory.cs b/src/Service.Abstractions/IAuthorizationRequestFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IAuthorizationRequestFactory.cs
rename to src/Service.Abstractions/IAuthorizationRequestFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IAuthorizationResponseFactory.cs b/src/Service.Abstractions/IAuthorizationResponseFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IAuthorizationResponseFactory.cs
rename to src/Service.Abstractions/IAuthorizationResponseFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IAuthorizationResponseParameterProvider.cs b/src/Service.Abstractions/IAuthorizationResponseParameterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IAuthorizationResponseParameterProvider.cs
rename to src/Service.Abstractions/IAuthorizationResponseParameterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IConfigurationManager.cs b/src/Service.Abstractions/IConfigurationManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IConfigurationManager.cs
rename to src/Service.Abstractions/IConfigurationManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IConfigurationMetadataProvider.cs b/src/Service.Abstractions/IConfigurationMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IConfigurationMetadataProvider.cs
rename to src/Service.Abstractions/IConfigurationMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IIdentityServiceBuilder.cs b/src/Service.Abstractions/IIdentityServiceBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IIdentityServiceBuilder.cs
rename to src/Service.Abstractions/IIdentityServiceBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IKeySetMetadataProvider.cs b/src/Service.Abstractions/IKeySetMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IKeySetMetadataProvider.cs
rename to src/Service.Abstractions/IKeySetMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ILogoutRequestFactory.cs b/src/Service.Abstractions/ILogoutRequestFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ILogoutRequestFactory.cs
rename to src/Service.Abstractions/ILogoutRequestFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ISigningCredentialsPolicyProvider.cs b/src/Service.Abstractions/ISigningCredentialsPolicyProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ISigningCredentialsPolicyProvider.cs
rename to src/Service.Abstractions/ISigningCredentialsPolicyProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ISigningCredentialsSource.cs b/src/Service.Abstractions/ISigningCredentialsSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ISigningCredentialsSource.cs
rename to src/Service.Abstractions/ISigningCredentialsSource.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenManager.cs b/src/Service.Abstractions/ITokenManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenManager.cs
rename to src/Service.Abstractions/ITokenManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenRequestFactory.cs b/src/Service.Abstractions/ITokenRequestFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenRequestFactory.cs
rename to src/Service.Abstractions/ITokenRequestFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenResponseFactory.cs b/src/Service.Abstractions/ITokenResponseFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenResponseFactory.cs
rename to src/Service.Abstractions/ITokenResponseFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenResponseParameterProvider.cs b/src/Service.Abstractions/ITokenResponseParameterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ITokenResponseParameterProvider.cs
rename to src/Service.Abstractions/ITokenResponseParameterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IdentityServiceClaimTypes.cs b/src/Service.Abstractions/IdentityServiceClaimTypes.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IdentityServiceClaimTypes.cs
rename to src/Service.Abstractions/IdentityServiceClaimTypes.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/IdentityServiceErrorCodes.cs b/src/Service.Abstractions/IdentityServiceErrorCodes.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/IdentityServiceErrorCodes.cs
rename to src/Service.Abstractions/IdentityServiceErrorCodes.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IAccessTokenIssuer.cs b/src/Service.Abstractions/Issuers/IAccessTokenIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IAccessTokenIssuer.cs
rename to src/Service.Abstractions/Issuers/IAccessTokenIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IAuthorizationCodeIssuer.cs b/src/Service.Abstractions/Issuers/IAuthorizationCodeIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IAuthorizationCodeIssuer.cs
rename to src/Service.Abstractions/Issuers/IAuthorizationCodeIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IIdTokenIssuer.cs b/src/Service.Abstractions/Issuers/IIdTokenIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IIdTokenIssuer.cs
rename to src/Service.Abstractions/Issuers/IIdTokenIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IRefreshTokenIssuer.cs b/src/Service.Abstractions/Issuers/IRefreshTokenIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/IRefreshTokenIssuer.cs
rename to src/Service.Abstractions/Issuers/IRefreshTokenIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/ITokenHasher.cs b/src/Service.Abstractions/Issuers/ITokenHasher.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/ITokenHasher.cs
rename to src/Service.Abstractions/Issuers/ITokenHasher.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/TokenResult.cs b/src/Service.Abstractions/Issuers/TokenResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Issuers/TokenResult.cs
rename to src/Service.Abstractions/Issuers/TokenResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/LogoutRequest.cs b/src/Service.Abstractions/LogoutRequest.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/LogoutRequest.cs
rename to src/Service.Abstractions/LogoutRequest.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj b/src/Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj
rename to src/Service.Abstractions/Microsoft.AspNetCore.Identity.Service.Abstractions.csproj
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/PromptValues.cs b/src/Service.Abstractions/PromptValues.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/PromptValues.cs
rename to src/Service.Abstractions/PromptValues.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ProofOfKeyForCodeExchangeChallengeMethods.cs b/src/Service.Abstractions/ProofOfKeyForCodeExchangeChallengeMethods.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ProofOfKeyForCodeExchangeChallengeMethods.cs
rename to src/Service.Abstractions/ProofOfKeyForCodeExchangeChallengeMethods.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ProofOfKeyForCodeExchangeParameterNames.cs b/src/Service.Abstractions/ProofOfKeyForCodeExchangeParameterNames.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ProofOfKeyForCodeExchangeParameterNames.cs
rename to src/Service.Abstractions/ProofOfKeyForCodeExchangeParameterNames.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ProtocolError.cs b/src/Service.Abstractions/ProtocolError.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ProtocolError.cs
rename to src/Service.Abstractions/ProtocolError.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/RedirectUriResolutionResult.cs b/src/Service.Abstractions/RedirectUriResolutionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/RedirectUriResolutionResult.cs
rename to src/Service.Abstractions/RedirectUriResolutionResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/RequestGrants.cs b/src/Service.Abstractions/RequestGrants.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/RequestGrants.cs
rename to src/Service.Abstractions/RequestGrants.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/ScopeResolutionResult.cs b/src/Service.Abstractions/ScopeResolutionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/ScopeResolutionResult.cs
rename to src/Service.Abstractions/ScopeResolutionResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/SigningCredentialsDescriptor.cs b/src/Service.Abstractions/SigningCredentialsDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/SigningCredentialsDescriptor.cs
rename to src/Service.Abstractions/SigningCredentialsDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenGeneratingContext.cs b/src/Service.Abstractions/TokenGeneratingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenGeneratingContext.cs
rename to src/Service.Abstractions/TokenGeneratingContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenKinds.cs b/src/Service.Abstractions/TokenKinds.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenKinds.cs
rename to src/Service.Abstractions/TokenKinds.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenRequest.cs b/src/Service.Abstractions/TokenRequest.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenRequest.cs
rename to src/Service.Abstractions/TokenRequest.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenTypes.cs b/src/Service.Abstractions/TokenTypes.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/TokenTypes.cs
rename to src/Service.Abstractions/TokenTypes.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/AccessToken.cs b/src/Service.Abstractions/Tokens/AccessToken.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/AccessToken.cs
rename to src/Service.Abstractions/Tokens/AccessToken.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/AuthorizationCode.cs b/src/Service.Abstractions/Tokens/AuthorizationCode.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/AuthorizationCode.cs
rename to src/Service.Abstractions/Tokens/AuthorizationCode.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/IdToken.cs b/src/Service.Abstractions/Tokens/IdToken.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/IdToken.cs
rename to src/Service.Abstractions/Tokens/IdToken.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/RefreshToken.cs b/src/Service.Abstractions/Tokens/RefreshToken.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/RefreshToken.cs
rename to src/Service.Abstractions/Tokens/RefreshToken.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/Token.cs b/src/Service.Abstractions/Tokens/Token.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Tokens/Token.cs
rename to src/Service.Abstractions/Tokens/Token.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IAuthorizationRequestValidator.cs b/src/Service.Abstractions/Validation/IAuthorizationRequestValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IAuthorizationRequestValidator.cs
rename to src/Service.Abstractions/Validation/IAuthorizationRequestValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IClientIdValidator.cs b/src/Service.Abstractions/Validation/IClientIdValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IClientIdValidator.cs
rename to src/Service.Abstractions/Validation/IClientIdValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IRedirectUriResolver.cs b/src/Service.Abstractions/Validation/IRedirectUriResolver.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IRedirectUriResolver.cs
rename to src/Service.Abstractions/Validation/IRedirectUriResolver.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IScopeResolver.cs b/src/Service.Abstractions/Validation/IScopeResolver.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/IScopeResolver.cs
rename to src/Service.Abstractions/Validation/IScopeResolver.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/ITimeStampManager.cs b/src/Service.Abstractions/Validation/ITimeStampManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/ITimeStampManager.cs
rename to src/Service.Abstractions/Validation/ITimeStampManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/ITokenRequestValidator.cs b/src/Service.Abstractions/Validation/ITokenRequestValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Abstractions/Validation/ITokenRequestValidator.cs
rename to src/Service.Abstractions/Validation/ITokenRequestValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/IdentityServiceBuilderExtensions.cs b/src/Service.AzureKeyVault/IdentityServiceBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/IdentityServiceBuilderExtensions.cs
rename to src/Service.AzureKeyVault/IdentityServiceBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/KeyVaultSigningCredentialSource.cs b/src/Service.AzureKeyVault/KeyVaultSigningCredentialSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/KeyVaultSigningCredentialSource.cs
rename to src/Service.AzureKeyVault/KeyVaultSigningCredentialSource.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/KeyVaultSigningCredentialsSourceOptions.cs b/src/Service.AzureKeyVault/KeyVaultSigningCredentialsSourceOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/KeyVaultSigningCredentialsSourceOptions.cs
rename to src/Service.AzureKeyVault/KeyVaultSigningCredentialsSourceOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj b/src/Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj
similarity index 78%
rename from src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj
rename to src/Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj
index 5d27747c6b..6f07fda070 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj
+++ b/src/Service.AzureKeyVault/Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Identity.Service.Core\CryptographyHelpers.cs" Link="CryptographyHelpers.cs" />
+    <Compile Include="..\Service.Core\CryptographyHelpers.cs" Link="CryptographyHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity.Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj" />
+    <ProjectReference Include="..\Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/AuthorizationCodeIssuer.cs b/src/Service.Core/AuthorizationCodeIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/AuthorizationCodeIssuer.cs
rename to src/Service.Core/AuthorizationCodeIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/AuthorizationRequestFactory.cs b/src/Service.Core/AuthorizationRequestFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/AuthorizationRequestFactory.cs
rename to src/Service.Core/AuthorizationRequestFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/DefaultTokenClaimsManager.cs b/src/Service.Core/Claims/DefaultTokenClaimsManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/DefaultTokenClaimsManager.cs
rename to src/Service.Core/Claims/DefaultTokenClaimsManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/DefaultTokenClaimsProvider.cs b/src/Service.Core/Claims/DefaultTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/DefaultTokenClaimsProvider.cs
rename to src/Service.Core/Claims/DefaultTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/GrantedTokensTokenClaimsProvider.cs b/src/Service.Core/Claims/GrantedTokensTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/GrantedTokensTokenClaimsProvider.cs
rename to src/Service.Core/Claims/GrantedTokensTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/NonceTokenClaimsProvider.cs b/src/Service.Core/Claims/NonceTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/NonceTokenClaimsProvider.cs
rename to src/Service.Core/Claims/NonceTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/ProofOfKeyForCodeExchangeTokenClaimsProvider.cs b/src/Service.Core/Claims/ProofOfKeyForCodeExchangeTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/ProofOfKeyForCodeExchangeTokenClaimsProvider.cs
rename to src/Service.Core/Claims/ProofOfKeyForCodeExchangeTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/ScopesTokenClaimsProvider.cs b/src/Service.Core/Claims/ScopesTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/ScopesTokenClaimsProvider.cs
rename to src/Service.Core/Claims/ScopesTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/TimestampsTokenClaimsProvider.cs b/src/Service.Core/Claims/TimestampsTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/TimestampsTokenClaimsProvider.cs
rename to src/Service.Core/Claims/TimestampsTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Claims/TokenHashTokenClaimsProvider.cs b/src/Service.Core/Claims/TokenHashTokenClaimsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Claims/TokenHashTokenClaimsProvider.cs
rename to src/Service.Core/Claims/TokenHashTokenClaimsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/CryptographyHelpers.cs b/src/Service.Core/CryptographyHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/CryptographyHelpers.cs
rename to src/Service.Core/CryptographyHelpers.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultAuthorizationResponseFactory.cs b/src/Service.Core/DefaultAuthorizationResponseFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultAuthorizationResponseFactory.cs
rename to src/Service.Core/DefaultAuthorizationResponseFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultAuthorizationResponseParameterProvider.cs b/src/Service.Core/DefaultAuthorizationResponseParameterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultAuthorizationResponseParameterProvider.cs
rename to src/Service.Core/DefaultAuthorizationResponseParameterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultConfigurationManager.cs b/src/Service.Core/DefaultConfigurationManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultConfigurationManager.cs
rename to src/Service.Core/DefaultConfigurationManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultSigningCredentialsPolicyProvider.cs b/src/Service.Core/DefaultSigningCredentialsPolicyProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultSigningCredentialsPolicyProvider.cs
rename to src/Service.Core/DefaultSigningCredentialsPolicyProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultSigningCredentialsSource.cs b/src/Service.Core/DefaultSigningCredentialsSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultSigningCredentialsSource.cs
rename to src/Service.Core/DefaultSigningCredentialsSource.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultTokenResponseFactory.cs b/src/Service.Core/DefaultTokenResponseFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultTokenResponseFactory.cs
rename to src/Service.Core/DefaultTokenResponseFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DefaultTokenResponseParameterProvider.cs b/src/Service.Core/DefaultTokenResponseParameterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DefaultTokenResponseParameterProvider.cs
rename to src/Service.Core/DefaultTokenResponseParameterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/DeveloperCertificateSigningCredentialsSource.cs b/src/Service.Core/DeveloperCertificateSigningCredentialsSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/DeveloperCertificateSigningCredentialsSource.cs
rename to src/Service.Core/DeveloperCertificateSigningCredentialsSource.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/FormPostResponseGenerator.cs b/src/Service.Core/FormPostResponseGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/FormPostResponseGenerator.cs
rename to src/Service.Core/FormPostResponseGenerator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/FragmentResponseGenerator.cs b/src/Service.Core/FragmentResponseGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/FragmentResponseGenerator.cs
rename to src/Service.Core/FragmentResponseGenerator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/IdentityServiceBuilderExtensions.cs b/src/Service.Core/IdentityServiceBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/IdentityServiceBuilderExtensions.cs
rename to src/Service.Core/IdentityServiceBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/JwtAccessTokenIssuer.cs b/src/Service.Core/JwtAccessTokenIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/JwtAccessTokenIssuer.cs
rename to src/Service.Core/JwtAccessTokenIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/JwtIdTokenIssuer.cs b/src/Service.Core/JwtIdTokenIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/JwtIdTokenIssuer.cs
rename to src/Service.Core/JwtIdTokenIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/LogoutRequestFactory.cs b/src/Service.Core/LogoutRequestFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/LogoutRequestFactory.cs
rename to src/Service.Core/LogoutRequestFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Metadata/DefaultConfigurationMetadataProvider.cs b/src/Service.Core/Metadata/DefaultConfigurationMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Metadata/DefaultConfigurationMetadataProvider.cs
rename to src/Service.Core/Metadata/DefaultConfigurationMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Metadata/DefaultKeySetMetadataProvider.cs b/src/Service.Core/Metadata/DefaultKeySetMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Metadata/DefaultKeySetMetadataProvider.cs
rename to src/Service.Core/Metadata/DefaultKeySetMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj b/src/Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj
similarity index 85%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj
rename to src/Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj
index 6e4a93bc40..1d357f45d9 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj
+++ b/src/Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/IdentityServiceAuthorizationOptionsSetup.cs b/src/Service.Core/Options/IdentityServiceAuthorizationOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/IdentityServiceAuthorizationOptionsSetup.cs
rename to src/Service.Core/Options/IdentityServiceAuthorizationOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/IdentityServiceOptions.cs b/src/Service.Core/Options/IdentityServiceOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/IdentityServiceOptions.cs
rename to src/Service.Core/Options/IdentityServiceOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/IdentityServiceOptionsDefaultSetup.cs b/src/Service.Core/Options/IdentityServiceOptionsDefaultSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/IdentityServiceOptionsDefaultSetup.cs
rename to src/Service.Core/Options/IdentityServiceOptionsDefaultSetup.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenMapping.cs b/src/Service.Core/Options/TokenMapping.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenMapping.cs
rename to src/Service.Core/Options/TokenMapping.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenOptions.cs b/src/Service.Core/Options/TokenOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenOptions.cs
rename to src/Service.Core/Options/TokenOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenValueCardinality.cs b/src/Service.Core/Options/TokenValueCardinality.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenValueCardinality.cs
rename to src/Service.Core/Options/TokenValueCardinality.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenValueDescriptor.cs b/src/Service.Core/Options/TokenValueDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Options/TokenValueDescriptor.cs
rename to src/Service.Core/Options/TokenValueDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/PrincipalExtensions.cs b/src/Service.Core/PrincipalExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/PrincipalExtensions.cs
rename to src/Service.Core/PrincipalExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/ProtocolErrorProvider.cs b/src/Service.Core/ProtocolErrorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/ProtocolErrorProvider.cs
rename to src/Service.Core/ProtocolErrorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/QueryResponseGenerator.cs b/src/Service.Core/QueryResponseGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/QueryResponseGenerator.cs
rename to src/Service.Core/QueryResponseGenerator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/RefreshTokenIssuer.cs b/src/Service.Core/RefreshTokenIssuer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/RefreshTokenIssuer.cs
rename to src/Service.Core/RefreshTokenIssuer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/RequestParametersHelper.cs b/src/Service.Core/RequestParametersHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/RequestParametersHelper.cs
rename to src/Service.Core/RequestParametersHelper.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/AuthorizationCodeConverter.cs b/src/Service.Core/Serialization/AuthorizationCodeConverter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/AuthorizationCodeConverter.cs
rename to src/Service.Core/Serialization/AuthorizationCodeConverter.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/RefreshTokenConverter.cs b/src/Service.Core/Serialization/RefreshTokenConverter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/RefreshTokenConverter.cs
rename to src/Service.Core/Serialization/RefreshTokenConverter.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/TokenConverter.cs b/src/Service.Core/Serialization/TokenConverter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/TokenConverter.cs
rename to src/Service.Core/Serialization/TokenConverter.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/TokenDataSerializer.cs b/src/Service.Core/Serialization/TokenDataSerializer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/Serialization/TokenDataSerializer.cs
rename to src/Service.Core/Serialization/TokenDataSerializer.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/TimeStampManager.cs b/src/Service.Core/TimeStampManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/TimeStampManager.cs
rename to src/Service.Core/TimeStampManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/TokenHasher.cs b/src/Service.Core/TokenHasher.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/TokenHasher.cs
rename to src/Service.Core/TokenHasher.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/TokenManager.cs b/src/Service.Core/TokenManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/TokenManager.cs
rename to src/Service.Core/TokenManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/TokenMapper.cs b/src/Service.Core/TokenMapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/TokenMapper.cs
rename to src/Service.Core/TokenMapper.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Core/TokenRequestFactory.cs b/src/Service.Core/TokenRequestFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Core/TokenRequestFactory.cs
rename to src/Service.Core/TokenRequestFactory.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/DeveloperCertificateMiddleware.cs b/src/Service.Diagnostics/DeveloperCertificateMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/DeveloperCertificateMiddleware.cs
rename to src/Service.Diagnostics/DeveloperCertificateMiddleware.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/DeveloperCertificateOptions.cs b/src/Service.Diagnostics/DeveloperCertificateOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/DeveloperCertificateOptions.cs
rename to src/Service.Diagnostics/DeveloperCertificateOptions.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/IdentityApplicationBuilderExtensions.cs b/src/Service.Diagnostics/IdentityApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/IdentityApplicationBuilderExtensions.cs
rename to src/Service.Diagnostics/IdentityApplicationBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj b/src/Service.Diagnostics/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj
similarity index 69%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj
rename to src/Service.Diagnostics/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj
index a2f830d2fc..0d65a11fba 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj
+++ b/src/Service.Diagnostics/Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj
@@ -14,10 +14,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj" />
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj" />
+    <ProjectReference Include="../Identity/Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="../Service/Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="../Service.EF/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="../Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Strings.Designer.cs b/src/Service.Diagnostics/Strings.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Strings.Designer.cs
rename to src/Service.Diagnostics/Strings.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Strings.resx b/src/Service.Diagnostics/Strings.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Strings.resx
rename to src/Service.Diagnostics/Strings.resx
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/DeveloperCertificateErrorPage.Designer.cs b/src/Service.Diagnostics/Views/DeveloperCertificateErrorPage.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/DeveloperCertificateErrorPage.Designer.cs
rename to src/Service.Diagnostics/Views/DeveloperCertificateErrorPage.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/DeveloperCertificateErrorPage.cshtml b/src/Service.Diagnostics/Views/DeveloperCertificateErrorPage.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/DeveloperCertificateErrorPage.cshtml
rename to src/Service.Diagnostics/Views/DeveloperCertificateErrorPage.cshtml
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/DeveloperCertificateViewModel.cs b/src/Service.Diagnostics/Views/DeveloperCertificateViewModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/DeveloperCertificateViewModel.cs
rename to src/Service.Diagnostics/Views/DeveloperCertificateViewModel.cs
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/ErrorPage.css b/src/Service.Diagnostics/Views/ErrorPage.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/Views/ErrorPage.css
rename to src/Service.Diagnostics/Views/ErrorPage.css
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Identity.Service/generate-developer-certificate-diagnostics-page.cmd b/src/Service.Diagnostics/generate-developer-certificate-diagnostics-page.cmd
similarity index 100%
rename from src/Microsoft.AspNetCore.Diagnostics.Identity.Service/generate-developer-certificate-diagnostics-page.cmd
rename to src/Service.Diagnostics/generate-developer-certificate-diagnostics-page.cmd
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/ApplicationStore.cs b/src/Service.EF/ApplicationStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/ApplicationStore.cs
rename to src/Service.EF/ApplicationStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceApplication.cs b/src/Service.EF/IdentityServiceApplication.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceApplication.cs
rename to src/Service.EF/IdentityServiceApplication.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceApplicationClaim.cs b/src/Service.EF/IdentityServiceApplicationClaim.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceApplicationClaim.cs
rename to src/Service.EF/IdentityServiceApplicationClaim.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceBuilderExtensions.cs b/src/Service.EF/IdentityServiceBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceBuilderExtensions.cs
rename to src/Service.EF/IdentityServiceBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceDbContext.cs b/src/Service.EF/IdentityServiceDbContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceDbContext.cs
rename to src/Service.EF/IdentityServiceDbContext.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceRedirectUri.cs b/src/Service.EF/IdentityServiceRedirectUri.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceRedirectUri.cs
rename to src/Service.EF/IdentityServiceRedirectUri.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceScope.cs b/src/Service.EF/IdentityServiceScope.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/IdentityServiceScope.cs
rename to src/Service.EF/IdentityServiceScope.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj b/src/Service.EF/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj
similarity index 61%
rename from src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj
rename to src/Service.EF/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj
index e00435a5f4..2e49b1f364 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj
+++ b/src/Service.EF/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/EnableIntegratedWebClientAttribute.cs b/src/Service.IntegratedWebClient/EnableIntegratedWebClientAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/EnableIntegratedWebClientAttribute.cs
rename to src/Service.IntegratedWebClient/EnableIntegratedWebClientAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebApplicationRedirectFilter.cs b/src/Service.IntegratedWebClient/IntegratedWebApplicationRedirectFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebApplicationRedirectFilter.cs
rename to src/Service.IntegratedWebClient/IntegratedWebApplicationRedirectFilter.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs b/src/Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs
rename to src/Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientModelConvention.cs b/src/Service.IntegratedWebClient/IntegratedWebClientModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientModelConvention.cs
rename to src/Service.IntegratedWebClient/IntegratedWebClientModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientOpenIdConnectOptionsSetup.cs b/src/Service.IntegratedWebClient/IntegratedWebClientOpenIdConnectOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientOpenIdConnectOptionsSetup.cs
rename to src/Service.IntegratedWebClient/IntegratedWebClientOpenIdConnectOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientOptions.cs b/src/Service.IntegratedWebClient/IntegratedWebClientOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientOptions.cs
rename to src/Service.IntegratedWebClient/IntegratedWebClientOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientServiceCollectionExtensions.cs b/src/Service.IntegratedWebClient/IntegratedWebClientServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientServiceCollectionExtensions.cs
rename to src/Service.IntegratedWebClient/IntegratedWebClientServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebclientMvcOptionsSetup.cs b/src/Service.IntegratedWebClient/IntegratedWebclientMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebclientMvcOptionsSetup.cs
rename to src/Service.IntegratedWebClient/IntegratedWebclientMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj b/src/Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj
similarity index 86%
rename from src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj
rename to src/Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj
index 2abb24c9a8..d2f0647978 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj
+++ b/src/Service.IntegratedWebClient/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/AuthorizationRequestModelBinder.cs b/src/Service.Mvc/AuthorizationRequestModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/AuthorizationRequestModelBinder.cs
rename to src/Service.Mvc/AuthorizationRequestModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/FormPostResult.cs b/src/Service.Mvc/FormPostResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/FormPostResult.cs
rename to src/Service.Mvc/FormPostResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/FragmentResult.cs b/src/Service.Mvc/FragmentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/FragmentResult.cs
rename to src/Service.Mvc/FragmentResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/IdentityServiceControllerExtensions.cs b/src/Service.Mvc/IdentityServiceControllerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/IdentityServiceControllerExtensions.cs
rename to src/Service.Mvc/IdentityServiceControllerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/LogoutRequestModelBinder.cs b/src/Service.Mvc/LogoutRequestModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/LogoutRequestModelBinder.cs
rename to src/Service.Mvc/LogoutRequestModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj b/src/Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj
similarity index 81%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj
rename to src/Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj
index b2bc6c4694..ab51007971 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj
+++ b/src/Service.Mvc/Microsoft.AspNetCore.Identity.Service.Mvc.csproj
@@ -13,6 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="../Service/Microsoft.AspNetCore.Identity.Service.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/QueryResult.cs b/src/Service.Mvc/QueryResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/QueryResult.cs
rename to src/Service.Mvc/QueryResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/TokenRequestModelBinder.cs b/src/Service.Mvc/TokenRequestModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/TokenRequestModelBinder.cs
rename to src/Service.Mvc/TokenRequestModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Mvc/UrlHelperExtensions.cs b/src/Service.Mvc/UrlHelperExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Mvc/UrlHelperExtensions.cs
rename to src/Service.Mvc/UrlHelperExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/IdentityServiceResultAssert.cs b/src/Service.Specification.Tests/IdentityServiceResultAssert.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/IdentityServiceResultAssert.cs
rename to src/Service.Specification.Tests/IdentityServiceResultAssert.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/IdentityServiceSpecificationTestBase.cs b/src/Service.Specification.Tests/IdentityServiceSpecificationTestBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/IdentityServiceSpecificationTestBase.cs
rename to src/Service.Specification.Tests/IdentityServiceSpecificationTestBase.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj b/src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
similarity index 80%
rename from src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
rename to src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
index 4b760b44a2..f6975aea88 100644
--- a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
+++ b/src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Identity.Specification.Tests\TestLogger.cs" Link="TestLogger.cs" />
+    <Compile Include="..\Specification.Tests\TestLogger.cs" Link="TestLogger.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Identity.Service/ApplicationClaimsPrincipalFactory.cs b/src/Service/ApplicationClaimsPrincipalFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/ApplicationClaimsPrincipalFactory.cs
rename to src/Service/ApplicationClaimsPrincipalFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/ApplicationErrorDescriber.cs b/src/Service/ApplicationErrorDescriber.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/ApplicationErrorDescriber.cs
rename to src/Service/ApplicationErrorDescriber.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/ApplicationManager.cs b/src/Service/ApplicationManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/ApplicationManager.cs
rename to src/Service/ApplicationManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/ApplicationOptions.cs b/src/Service/ApplicationOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/ApplicationOptions.cs
rename to src/Service/ApplicationOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/ApplicationValidator.cs b/src/Service/ApplicationValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/ApplicationValidator.cs
rename to src/Service/ApplicationValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/AuthorizationStatus.cs b/src/Service/AuthorizationStatus.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/AuthorizationStatus.cs
rename to src/Service/AuthorizationStatus.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/AuthorizeResult.cs b/src/Service/AuthorizeResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/AuthorizeResult.cs
rename to src/Service/AuthorizeResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/Claims/PairwiseSubTokenClaimProvider.cs b/src/Service/Claims/PairwiseSubTokenClaimProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/Claims/PairwiseSubTokenClaimProvider.cs
rename to src/Service/Claims/PairwiseSubTokenClaimProvider.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/ClientApplicationValidator.cs b/src/Service/ClientApplicationValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/ClientApplicationValidator.cs
rename to src/Service/ClientApplicationValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/Configuration/IdentityServiceOptionsSetup.cs b/src/Service/Configuration/IdentityServiceOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/Configuration/IdentityServiceOptionsSetup.cs
rename to src/Service/Configuration/IdentityServiceOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IApplicationClaimStore.cs b/src/Service/IApplicationClaimStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IApplicationClaimStore.cs
rename to src/Service/IApplicationClaimStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IApplicationClaimsPrincipalFactory.cs b/src/Service/IApplicationClaimsPrincipalFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IApplicationClaimsPrincipalFactory.cs
rename to src/Service/IApplicationClaimsPrincipalFactory.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IApplicationClientSecretStore.cs b/src/Service/IApplicationClientSecretStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IApplicationClientSecretStore.cs
rename to src/Service/IApplicationClientSecretStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IApplicationScopeStore.cs b/src/Service/IApplicationScopeStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IApplicationScopeStore.cs
rename to src/Service/IApplicationScopeStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IApplicationStore.cs b/src/Service/IApplicationStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IApplicationStore.cs
rename to src/Service/IApplicationStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IApplicationValidator.cs b/src/Service/IApplicationValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IApplicationValidator.cs
rename to src/Service/IApplicationValidator.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IQueryableApplicationStore.cs b/src/Service/IQueryableApplicationStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IQueryableApplicationStore.cs
rename to src/Service/IQueryableApplicationStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IRedirectUriStore.cs b/src/Service/IRedirectUriStore.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IRedirectUriStore.cs
rename to src/Service/IRedirectUriStore.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceBuilder.cs b/src/Service/IdentityServiceBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IdentityServiceBuilder.cs
rename to src/Service/IdentityServiceBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceError.cs b/src/Service/IdentityServiceError.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IdentityServiceError.cs
rename to src/Service/IdentityServiceError.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceResult.cs b/src/Service/IdentityServiceResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IdentityServiceResult.cs
rename to src/Service/IdentityServiceResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceServiceCollectionExtensions.cs b/src/Service/IdentityServiceServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/IdentityServiceServiceCollectionExtensions.cs
rename to src/Service/IdentityServiceServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/LogoutResult.cs b/src/Service/LogoutResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/LogoutResult.cs
rename to src/Service/LogoutResult.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/LogoutStatus.cs b/src/Service/LogoutStatus.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/LogoutStatus.cs
rename to src/Service/LogoutStatus.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj b/src/Service/Microsoft.AspNetCore.Identity.Service.csproj
similarity index 64%
rename from src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj
rename to src/Service/Microsoft.AspNetCore.Identity.Service.csproj
index da8b19045c..5cd4cb81db 100644
--- a/src/Microsoft.AspNetCore.Identity.Service/Microsoft.AspNetCore.Identity.Service.csproj
+++ b/src/Service/Microsoft.AspNetCore.Identity.Service.csproj
@@ -8,7 +8,7 @@
     <PackageTags>aspnetcore</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Identity.Service.Core\CryptographyHelpers.cs" Link="CryptographyHelpers.cs" />
+    <Compile Include="..\Service.Core\CryptographyHelpers.cs" Link="CryptographyHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity/Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="../Microsoft.AspNetCore.Identity.Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj" />
+    <ProjectReference Include="../Identity/Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="../Service.Core/Microsoft.AspNetCore.Identity.Service.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.AspNetCore.Identity.Service/Session.cs b/src/Service/Session.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/Session.cs
rename to src/Service/Session.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Service/SessionManager.cs b/src/Service/SessionManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Service/SessionManager.cs
rename to src/Service/SessionManager.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentityResultAssert.cs b/src/Specification.Tests/IdentityResultAssert.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentityResultAssert.cs
rename to src/Specification.Tests/IdentityResultAssert.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs b/src/Specification.Tests/IdentitySpecificationTestBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Specification.Tests/IdentitySpecificationTestBase.cs
rename to src/Specification.Tests/IdentitySpecificationTestBase.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
similarity index 89%
rename from src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
rename to src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
index 01577673b3..c987d8fa30 100644
--- a/src/Microsoft.AspNetCore.Identity.Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
+++ b/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/TestLogger.cs b/src/Specification.Tests/TestLogger.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Specification.Tests/TestLogger.cs
rename to src/Specification.Tests/TestLogger.cs
diff --git a/src/Microsoft.AspNetCore.Identity.Specification.Tests/UserManagerSpecificationTests.cs b/src/Specification.Tests/UserManagerSpecificationTests.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.Specification.Tests/UserManagerSpecificationTests.cs
rename to src/Specification.Tests/UserManagerSpecificationTests.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityRole.cs b/src/Stores/IdentityRole.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityRole.cs
rename to src/Stores/IdentityRole.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityRoleClaim.cs b/src/Stores/IdentityRoleClaim.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityRoleClaim.cs
rename to src/Stores/IdentityRoleClaim.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityUser.cs b/src/Stores/IdentityUser.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityUser.cs
rename to src/Stores/IdentityUser.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityUserClaim.cs b/src/Stores/IdentityUserClaim.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityUserClaim.cs
rename to src/Stores/IdentityUserClaim.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityUserLogin.cs b/src/Stores/IdentityUserLogin.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityUserLogin.cs
rename to src/Stores/IdentityUserLogin.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityUserRole.cs b/src/Stores/IdentityUserRole.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityUserRole.cs
rename to src/Stores/IdentityUserRole.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/IdentityUserToken.cs b/src/Stores/IdentityUserToken.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/IdentityUserToken.cs
rename to src/Stores/IdentityUserToken.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj b/src/Stores/Microsoft.Extensions.Identity.Stores.csproj
similarity index 88%
rename from src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj
rename to src/Stores/Microsoft.Extensions.Identity.Stores.csproj
index ce074e52f8..0a792aeca2 100644
--- a/src/Microsoft.Extensions.Identity.Stores/Microsoft.Extensions.Identity.Stores.csproj
+++ b/src/Stores/Microsoft.Extensions.Identity.Stores.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Extensions.Identity.Core\Microsoft.Extensions.Identity.Core.csproj" />
+    <ProjectReference Include="..\Core\Microsoft.Extensions.Identity.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.Extensions.Identity.Stores/RoleStoreBase.cs b/src/Stores/RoleStoreBase.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/RoleStoreBase.cs
rename to src/Stores/RoleStoreBase.cs
diff --git a/src/Microsoft.Extensions.Identity.Stores/UserStoreBase.cs b/src/Stores/UserStoreBase.cs
similarity index 100%
rename from src/Microsoft.Extensions.Identity.Stores/UserStoreBase.cs
rename to src/Stores/UserStoreBase.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/AccessDenied.cshtml b/src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/AccessDenied.cshtml
rename to src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
rename to src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml b/src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml
rename to src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml
rename to src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml b/src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
rename to src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Lockout.cshtml b/src/UI/Areas/Identity/Pages/Account/Lockout.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Lockout.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Lockout.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Lockout.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Lockout.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Lockout.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Login.cshtml b/src/UI/Areas/Identity/Pages/Account/Login.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Login.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Login.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Login.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Login.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Login.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Login.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
rename to src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml b/src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
rename to src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Logout.cshtml b/src/UI/Areas/Identity/Pages/Account/Logout.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Logout.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Logout.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Logout.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Logout.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Logout.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Logout.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/src/UI/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Register.cshtml b/src/UI/Areas/Identity/Pages/Account/Register.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Register.cshtml
rename to src/UI/Areas/Identity/Pages/Account/Register.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/Register.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/Register.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/Register.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPassword.cshtml b/src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPassword.cshtml
rename to src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml b/src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
rename to src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/_ViewImports.cshtml b/src/UI/Areas/Identity/Pages/Account/_ViewImports.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Account/_ViewImports.cshtml
rename to src/UI/Areas/Identity/Pages/Account/_ViewImports.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Error.cshtml b/src/UI/Areas/Identity/Pages/Error.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Error.cshtml
rename to src/UI/Areas/Identity/Pages/Error.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Error.cshtml.cs b/src/UI/Areas/Identity/Pages/Error.cshtml.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/Error.cshtml.cs
rename to src/UI/Areas/Identity/Pages/Error.cshtml.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_Layout.cshtml b/src/UI/Areas/Identity/Pages/_Layout.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_Layout.cshtml
rename to src/UI/Areas/Identity/Pages/_Layout.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/src/UI/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
rename to src/UI/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_ViewImports.cshtml b/src/UI/Areas/Identity/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_ViewImports.cshtml
rename to src/UI/Areas/Identity/Pages/_ViewImports.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_ViewStart.cshtml b/src/UI/Areas/Identity/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Pages/_ViewStart.cshtml
rename to src/UI/Areas/Identity/Pages/_ViewStart.cshtml
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Services/EmailSender.cs b/src/UI/Areas/Identity/Services/EmailSender.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Services/EmailSender.cs
rename to src/UI/Areas/Identity/Services/EmailSender.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Services/IEmailSender.cs b/src/UI/Areas/Identity/Services/IEmailSender.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/Areas/Identity/Services/IEmailSender.cs
rename to src/UI/Areas/Identity/Services/IEmailSender.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/IdentityBuilderUIExtensions.cs b/src/UI/IdentityBuilderUIExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/IdentityBuilderUIExtensions.cs
rename to src/UI/IdentityBuilderUIExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/IdentityDefaultUIConfigureOptions.cs b/src/UI/IdentityDefaultUIConfigureOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/IdentityDefaultUIConfigureOptions.cs
rename to src/UI/IdentityDefaultUIConfigureOptions.cs
diff --git a/src/Microsoft.AspNetCore.Identity.UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
similarity index 85%
rename from src/Microsoft.AspNetCore.Identity.UI/Microsoft.AspNetCore.Identity.UI.csproj
rename to src/UI/Microsoft.AspNetCore.Identity.UI.csproj
index fab7088738..d8fec1a076 100644
--- a/src/Microsoft.AspNetCore.Identity.UI/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Identity.Stores\Microsoft.Extensions.Identity.Stores.csproj" />
+    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="..\Stores\Microsoft.Extensions.Identity.Stores.csproj" />
   </ItemGroup>
     
 </Project>
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/css/site.css b/src/UI/wwwroot/Identity/css/site.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/css/site.css
rename to src/UI/wwwroot/Identity/css/site.css
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/css/site.min.css b/src/UI/wwwroot/Identity/css/site.min.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/css/site.min.css
rename to src/UI/wwwroot/Identity/css/site.min.css
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/js/site.js b/src/UI/wwwroot/Identity/js/site.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/js/site.js
rename to src/UI/wwwroot/Identity/js/site.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/js/site.min.js b/src/UI/wwwroot/Identity/js/site.min.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/js/site.min.js
rename to src/UI/wwwroot/Identity/js/site.min.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/.bower.json b/src/UI/wwwroot/Identity/lib/bootstrap/.bower.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/.bower.json
rename to src/UI/wwwroot/Identity/lib/bootstrap/.bower.json
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/LICENSE b/src/UI/wwwroot/Identity/lib/bootstrap/LICENSE
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/LICENSE
rename to src/UI/wwwroot/Identity/lib/bootstrap/LICENSE
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js b/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js b/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/js/npm.js b/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/npm.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/bootstrap/dist/js/npm.js
rename to src/UI/wwwroot/Identity/lib/bootstrap/dist/js/npm.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json b/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json
rename to src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/.bower.json b/src/UI/wwwroot/Identity/lib/jquery-validation/.bower.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/.bower.json
rename to src/UI/wwwroot/Identity/lib/jquery-validation/.bower.json
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/LICENSE.md b/src/UI/wwwroot/Identity/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/LICENSE.md
rename to src/UI/wwwroot/Identity/lib/jquery-validation/LICENSE.md
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js b/src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js
rename to src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js b/src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js
rename to src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js b/src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js
rename to src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js b/src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js
rename to src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/.bower.json b/src/UI/wwwroot/Identity/lib/jquery/.bower.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/.bower.json
rename to src/UI/wwwroot/Identity/lib/jquery/.bower.json
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/LICENSE.txt b/src/UI/wwwroot/Identity/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/LICENSE.txt
rename to src/UI/wwwroot/Identity/lib/jquery/LICENSE.txt
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/dist/jquery.js b/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/dist/jquery.js
rename to src/UI/wwwroot/Identity/lib/jquery/dist/jquery.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/dist/jquery.min.js b/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/dist/jquery.min.js
rename to src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.js
diff --git a/src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/dist/jquery.min.map b/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/Microsoft.AspNetCore.Identity.UI/wwwroot/Identity/lib/jquery/dist/jquery.min.map
rename to src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.map
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryContext.cs b/test/EF.InMemory.Test/InMemoryContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryContext.cs
rename to test/EF.InMemory.Test/InMemoryContext.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryEFOnlyUsersTest.cs b/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryEFOnlyUsersTest.cs
rename to test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryEFUserStoreTest.cs b/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryEFUserStoreTest.cs
rename to test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryStoreWithGenericsTest.cs
rename to test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
similarity index 60%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
rename to test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
index a73a42dd5f..178a2a1dda 100644
--- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
+++ b/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+    <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>
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/RoleStoreTest.cs b/test/EF.InMemory.Test/RoleStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/RoleStoreTest.cs
rename to test/EF.InMemory.Test/RoleStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/TestIdentityFactory.cs b/test/EF.InMemory.Test/TestIdentityFactory.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/TestIdentityFactory.cs
rename to test/EF.InMemory.Test/TestIdentityFactory.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/ApiConsistencyTest.cs b/test/EF.Test/ApiConsistencyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/ApiConsistencyTest.cs
rename to test/EF.Test/ApiConsistencyTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/CustomPocoTest.cs b/test/EF.Test/CustomPocoTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/CustomPocoTest.cs
rename to test/EF.Test/CustomPocoTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DbUtil.cs b/test/EF.Test/DbUtil.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DbUtil.cs
rename to test/EF.Test/DbUtil.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs b/test/EF.Test/DefaultPocoTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs
rename to test/EF.Test/DefaultPocoTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
similarity index 78%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
rename to test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
index 850afff172..bc8464f59b 100644
--- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
+++ b/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+    <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>
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreOnlyUsersTestBase.cs b/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreOnlyUsersTestBase.cs
rename to test/EF.Test/SqlStoreOnlyUsersTestBase.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs b/test/EF.Test/SqlStoreTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs
rename to test/EF.Test/SqlStoreTestBase.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserOnlyCustomContextTest.cs b/test/EF.Test/UserOnlyCustomContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserOnlyCustomContextTest.cs
rename to test/EF.Test/UserOnlyCustomContextTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserOnlyTest.cs b/test/EF.Test/UserOnlyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserOnlyTest.cs
rename to test/EF.Test/UserOnlyTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreGuidKeyTest.cs b/test/EF.Test/UserStoreGuidKeyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreGuidKeyTest.cs
rename to test/EF.Test/UserStoreGuidKeyTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreIntKeyTest.cs b/test/EF.Test/UserStoreIntKeyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreIntKeyTest.cs
rename to test/EF.Test/UserStoreIntKeyTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreStringKeyTest.cs b/test/EF.Test/UserStoreStringKeyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreStringKeyTest.cs
rename to test/EF.Test/UserStoreStringKeyTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs b/test/EF.Test/UserStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs
rename to test/EF.Test/UserStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreWithGenericsTest.cs b/test/EF.Test/UserStoreWithGenericsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreWithGenericsTest.cs
rename to test/EF.Test/UserStoreWithGenericsTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Utilities/ScratchDatabaseFixture.cs b/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Utilities/ScratchDatabaseFixture.cs
rename to test/EF.Test/Utilities/ScratchDatabaseFixture.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Utilities/SqlServerTestStore.cs b/test/EF.Test/Utilities/SqlServerTestStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Utilities/SqlServerTestStore.cs
rename to test/EF.Test/Utilities/SqlServerTestStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Utilities/TestEnvironment.cs b/test/EF.Test/Utilities/TestEnvironment.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Utilities/TestEnvironment.cs
rename to test/EF.Test/Utilities/TestEnvironment.cs
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/config.json b/test/EF.Test/config.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/config.json
rename to test/EF.Test/config.json
diff --git a/test/Microsoft.AspNetCore.Identity.Test/ApiConsistencyTest.cs b/test/Identity.Test/ApiConsistencyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/ApiConsistencyTest.cs
rename to test/Identity.Test/ApiConsistencyTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/IdentityBuilderTest.cs b/test/Identity.Test/IdentityBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/IdentityBuilderTest.cs
rename to test/Identity.Test/IdentityBuilderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/IdentityOptionsTest.cs b/test/Identity.Test/IdentityOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/IdentityOptionsTest.cs
rename to test/Identity.Test/IdentityOptionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/IdentityResultTest.cs b/test/Identity.Test/IdentityResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/IdentityResultTest.cs
rename to test/Identity.Test/IdentityResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
similarity index 75%
rename from test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
rename to test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
index ad93881f65..903bcb51d1 100644
--- a/test/Microsoft.AspNetCore.Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
+++ b/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="..\..\src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.Test/NoopRoleStore.cs b/test/Identity.Test/NoopRoleStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/NoopRoleStore.cs
rename to test/Identity.Test/NoopRoleStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/NoopUserStore.cs b/test/Identity.Test/NoopUserStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/NoopUserStore.cs
rename to test/Identity.Test/NoopUserStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/PasswordHasherTest.cs b/test/Identity.Test/PasswordHasherTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/PasswordHasherTest.cs
rename to test/Identity.Test/PasswordHasherTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/PasswordValidatorTest.cs b/test/Identity.Test/PasswordValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/PasswordValidatorTest.cs
rename to test/Identity.Test/PasswordValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/PrincipalExtensionsTest.cs b/test/Identity.Test/PrincipalExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/PrincipalExtensionsTest.cs
rename to test/Identity.Test/PrincipalExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/RoleManagerTest.cs b/test/Identity.Test/RoleManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/RoleManagerTest.cs
rename to test/Identity.Test/RoleManagerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/RoleValidatorTest.cs b/test/Identity.Test/RoleValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/RoleValidatorTest.cs
rename to test/Identity.Test/RoleValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/SecurityStampValidatorTest.cs b/test/Identity.Test/SecurityStampValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/SecurityStampValidatorTest.cs
rename to test/Identity.Test/SecurityStampValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs b/test/Identity.Test/SignInManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs
rename to test/Identity.Test/SignInManagerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/UserClaimsPrincipalFactoryTest.cs b/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/UserClaimsPrincipalFactoryTest.cs
rename to test/Identity.Test/UserClaimsPrincipalFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/UserManagerTest.cs b/test/Identity.Test/UserManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/UserManagerTest.cs
rename to test/Identity.Test/UserManagerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Test/UserValidatorTest.cs b/test/Identity.Test/UserValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Test/UserValidatorTest.cs
rename to test/Identity.Test/UserValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/ControllerTest.cs b/test/InMemory.Test/ControllerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/ControllerTest.cs
rename to test/InMemory.Test/ControllerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/FunctionalTest.cs b/test/InMemory.Test/FunctionalTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/FunctionalTest.cs
rename to test/InMemory.Test/FunctionalTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryStore.cs b/test/InMemory.Test/InMemoryStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryStore.cs
rename to test/InMemory.Test/InMemoryStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryStoreTest.cs b/test/InMemory.Test/InMemoryStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryStoreTest.cs
rename to test/InMemory.Test/InMemoryStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryUserStore.cs b/test/InMemory.Test/InMemoryUserStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryUserStore.cs
rename to test/InMemory.Test/InMemoryUserStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryUserStoreTest.cs b/test/InMemory.Test/InMemoryUserStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/InMemoryUserStoreTest.cs
rename to test/InMemory.Test/InMemoryUserStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
similarity index 70%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
rename to test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
index 4524db7ce2..a10e779d7e 100644
--- a/test/Microsoft.AspNetCore.Identity.InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
+++ b/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+    <ProjectReference Include="..\..\src\Identity\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReference Include="..\..\src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.InMemory.Test/TestClock.cs b/test/InMemory.Test/TestClock.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.InMemory.Test/TestClock.cs
rename to test/InMemory.Test/TestClock.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj b/test/Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
similarity index 68%
rename from test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
rename to test/Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
index e10ac37dd9..eeffdef848 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
+++ b/test/Service.Abstractions.Test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Service.Abstractions\Microsoft.AspNetCore.Identity.Service.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/TokenGeneratingContextTest.cs b/test/Service.Abstractions.Test/TokenGeneratingContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/TokenGeneratingContextTest.cs
rename to test/Service.Abstractions.Test/TokenGeneratingContextTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/AccessTokenTest.cs b/test/Service.Abstractions.Test/Tokens/AccessTokenTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/AccessTokenTest.cs
rename to test/Service.Abstractions.Test/Tokens/AccessTokenTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/AuthorizationCodeTest.cs b/test/Service.Abstractions.Test/Tokens/AuthorizationCodeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/AuthorizationCodeTest.cs
rename to test/Service.Abstractions.Test/Tokens/AuthorizationCodeTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/IdTokenTest.cs b/test/Service.Abstractions.Test/Tokens/IdTokenTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/IdTokenTest.cs
rename to test/Service.Abstractions.Test/Tokens/IdTokenTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/RefreshTokenTest.cs b/test/Service.Abstractions.Test/Tokens/RefreshTokenTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Abstractions.Test/Tokens/RefreshTokenTest.cs
rename to test/Service.Abstractions.Test/Tokens/RefreshTokenTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeExchangeIntegrationTest.cs b/test/Service.Core.Test/AuthorizationCodeExchangeIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeExchangeIntegrationTest.cs
rename to test/Service.Core.Test/AuthorizationCodeExchangeIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeIssuerTest.cs b/test/Service.Core.Test/AuthorizationCodeIssuerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationCodeIssuerTest.cs
rename to test/Service.Core.Test/AuthorizationCodeIssuerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationRequestFactoryTest.cs b/test/Service.Core.Test/AuthorizationRequestFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizationRequestFactoryTest.cs
rename to test/Service.Core.Test/AuthorizationRequestFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizeIntegrationTest.cs b/test/Service.Core.Test/AuthorizeIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/AuthorizeIntegrationTest.cs
rename to test/Service.Core.Test/AuthorizeIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/DefaultTokenClaimsManagerTest.cs b/test/Service.Core.Test/Claims/DefaultTokenClaimsManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/DefaultTokenClaimsManagerTest.cs
rename to test/Service.Core.Test/Claims/DefaultTokenClaimsManagerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/DefaultTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/DefaultTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/DefaultTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/DefaultTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/GrantedTokensTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/GrantedTokensTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/GrantedTokensTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/GrantedTokensTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/NonceTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/NonceTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/NonceTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/NonceTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/ProofOfKeyForCodeExchangeTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/ProofOfKeyForCodeExchangeTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/ProofOfKeyForCodeExchangeTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/ProofOfKeyForCodeExchangeTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/ScopeTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/ScopeTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/ScopeTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/ScopeTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/TimeStampTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/TimeStampTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/TimeStampTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/TimeStampTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/TokenHashTokenClaimsProviderTest.cs b/test/Service.Core.Test/Claims/TokenHashTokenClaimsProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Claims/TokenHashTokenClaimsProviderTest.cs
rename to test/Service.Core.Test/Claims/TokenHashTokenClaimsProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/CryptoUtilities.cs b/test/Service.Core.Test/CryptoUtilities.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/CryptoUtilities.cs
rename to test/Service.Core.Test/CryptoUtilities.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultAuthorizationResponseFactoryTest.cs b/test/Service.Core.Test/DefaultAuthorizationResponseFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultAuthorizationResponseFactoryTest.cs
rename to test/Service.Core.Test/DefaultAuthorizationResponseFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultAuthorizationResponseParameterProviderTest.cs b/test/Service.Core.Test/DefaultAuthorizationResponseParameterProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultAuthorizationResponseParameterProviderTest.cs
rename to test/Service.Core.Test/DefaultAuthorizationResponseParameterProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultSigningCredentialsPolicyProviderTest.cs b/test/Service.Core.Test/DefaultSigningCredentialsPolicyProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultSigningCredentialsPolicyProviderTest.cs
rename to test/Service.Core.Test/DefaultSigningCredentialsPolicyProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultSigningCredentialsSourceTest.cs b/test/Service.Core.Test/DefaultSigningCredentialsSourceTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultSigningCredentialsSourceTest.cs
rename to test/Service.Core.Test/DefaultSigningCredentialsSourceTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultTokenResponseFactoryTest.cs b/test/Service.Core.Test/DefaultTokenResponseFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultTokenResponseFactoryTest.cs
rename to test/Service.Core.Test/DefaultTokenResponseFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultTokenResponseParameterProviderTest.cs b/test/Service.Core.Test/DefaultTokenResponseParameterProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/DefaultTokenResponseParameterProviderTest.cs
rename to test/Service.Core.Test/DefaultTokenResponseParameterProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/FormPostResponseGeneratorTest.cs b/test/Service.Core.Test/FormPostResponseGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/FormPostResponseGeneratorTest.cs
rename to test/Service.Core.Test/FormPostResponseGeneratorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/FragmentResponseGeneratorTest.cs b/test/Service.Core.Test/FragmentResponseGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/FragmentResponseGeneratorTest.cs
rename to test/Service.Core.Test/FragmentResponseGeneratorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/IdentityServiceErrorComparer.cs b/test/Service.Core.Test/IdentityServiceErrorComparer.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/IdentityServiceErrorComparer.cs
rename to test/Service.Core.Test/IdentityServiceErrorComparer.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/JwtAccessTokenIssuerTest.cs b/test/Service.Core.Test/JwtAccessTokenIssuerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/JwtAccessTokenIssuerTest.cs
rename to test/Service.Core.Test/JwtAccessTokenIssuerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/JwtIdTokenIssuerTest.cs b/test/Service.Core.Test/JwtIdTokenIssuerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/JwtIdTokenIssuerTest.cs
rename to test/Service.Core.Test/JwtIdTokenIssuerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/JwtRefreshTokenIssuerTest.cs b/test/Service.Core.Test/JwtRefreshTokenIssuerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/JwtRefreshTokenIssuerTest.cs
rename to test/Service.Core.Test/JwtRefreshTokenIssuerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj b/test/Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
similarity index 70%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
rename to test/Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
index 5d0581a952..ca7fb2a77f 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
+++ b/test/Service.Core.Test/Microsoft.AspNetCore.Identity.Service.Core.Test.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.Core\Microsoft.AspNetCore.Identity.Service.Core.csproj" />
+    <ProjectReference Include="..\..\src\Service.Core\Microsoft.AspNetCore.Identity.Service.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/QueryResponseGeneratorTest.cs b/test/Service.Core.Test/QueryResponseGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/QueryResponseGeneratorTest.cs
rename to test/Service.Core.Test/QueryResponseGeneratorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/TokenHasherTest.cs b/test/Service.Core.Test/TokenHasherTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/TokenHasherTest.cs
rename to test/Service.Core.Test/TokenHasherTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Core.Test/TokenRequestFactoryTest.cs b/test/Service.Core.Test/TokenRequestFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Core.Test/TokenRequestFactoryTest.cs
rename to test/Service.Core.Test/TokenRequestFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/InMemoryContext.cs b/test/Service.EF.InMemory.Test/InMemoryContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/InMemoryContext.cs
rename to test/Service.EF.InMemory.Test/InMemoryContext.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/InMemoryEFApplicationStoreTest.cs b/test/Service.EF.InMemory.Test/InMemoryEFApplicationStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/InMemoryEFApplicationStoreTest.cs
rename to test/Service.EF.InMemory.Test/InMemoryEFApplicationStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj b/test/Service.EF.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj
similarity index 51%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj
rename to test/Service.EF.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj
index a58cd334b3..7f64b41a35 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj
+++ b/test/Service.EF.InMemory.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.InMemory.Test.csproj
@@ -9,10 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj" />
+    <ProjectReference Include="..\..\src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\..\src\Service.EF\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/ApplicationStoreTest.cs b/test/Service.EF.Test/ApplicationStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/ApplicationStoreTest.cs
rename to test/Service.EF.Test/ApplicationStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj b/test/Service.EF.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj
similarity index 77%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj
rename to test/Service.EF.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj
index cdbdc32315..059ef92083 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj
+++ b/test/Service.EF.Test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test.csproj
@@ -13,9 +13,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj" />
+    <ProjectReference Include="..\..\src\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\..\src\Service.EF\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/DbUtil.cs b/test/Service.EF.Test/Utilities/DbUtil.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/DbUtil.cs
rename to test/Service.EF.Test/Utilities/DbUtil.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/ScratchDatabaseFixture.cs b/test/Service.EF.Test/Utilities/ScratchDatabaseFixture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/ScratchDatabaseFixture.cs
rename to test/Service.EF.Test/Utilities/ScratchDatabaseFixture.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/SqlServerTestStore.cs b/test/Service.EF.Test/Utilities/SqlServerTestStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/SqlServerTestStore.cs
rename to test/Service.EF.Test/Utilities/SqlServerTestStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/TestEnvironment.cs b/test/Service.EF.Test/Utilities/TestEnvironment.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/Utilities/TestEnvironment.cs
rename to test/Service.EF.Test/Utilities/TestEnvironment.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/config.json b/test/Service.EF.Test/config.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.Test/config.json
rename to test/Service.EF.Test/config.json
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Extensions/CookieComparison.cs b/test/Service.FunctionalTests/Extensions/CookieComparison.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Extensions/CookieComparison.cs
rename to test/Service.FunctionalTests/Extensions/CookieComparison.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Extensions/ResponseAssert.cs b/test/Service.FunctionalTests/Extensions/ResponseAssert.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Extensions/ResponseAssert.cs
rename to test/Service.FunctionalTests/Extensions/ResponseAssert.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/AutoSignInFilter.cs b/test/Service.FunctionalTests/Infrastructure/AutoSignInFilter.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/AutoSignInFilter.cs
rename to test/Service.FunctionalTests/Infrastructure/AutoSignInFilter.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/CookieContainerHandler.cs b/test/Service.FunctionalTests/Infrastructure/CookieContainerHandler.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/CookieContainerHandler.cs
rename to test/Service.FunctionalTests/Infrastructure/CookieContainerHandler.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/CredentialsServerBuilder.cs b/test/Service.FunctionalTests/Infrastructure/CredentialsServerBuilder.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/CredentialsServerBuilder.cs
rename to test/Service.FunctionalTests/Infrastructure/CredentialsServerBuilder.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/EntityFrameworkSeedReferenceData.cs b/test/Service.FunctionalTests/Infrastructure/EntityFrameworkSeedReferenceData.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/EntityFrameworkSeedReferenceData.cs
rename to test/Service.FunctionalTests/Infrastructure/EntityFrameworkSeedReferenceData.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/LoopBackHandler.cs b/test/Service.FunctionalTests/Infrastructure/LoopBackHandler.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/LoopBackHandler.cs
rename to test/Service.FunctionalTests/Infrastructure/LoopBackHandler.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/SeedData.cs b/test/Service.FunctionalTests/Infrastructure/SeedData.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Infrastructure/SeedData.cs
rename to test/Service.FunctionalTests/Infrastructure/SeedData.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Microsoft.AspnetCore.Identity.Service.FunctionalTests.csproj b/test/Service.FunctionalTests/Microsoft.AspnetCore.Identity.Service.FunctionalTests.csproj
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/Microsoft.AspnetCore.Identity.Service.FunctionalTests.csproj
rename to test/Service.FunctionalTests/Microsoft.AspnetCore.Identity.Service.FunctionalTests.csproj
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/TraditionalWebApplicationTests.cs b/test/Service.FunctionalTests/TraditionalWebApplicationTests.cs
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/TraditionalWebApplicationTests.cs
rename to test/Service.FunctionalTests/TraditionalWebApplicationTests.cs
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/test-cert.pfx b/test/Service.FunctionalTests/test-cert.pfx
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/test-cert.pfx
rename to test/Service.FunctionalTests/test-cert.pfx
diff --git a/test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/xunit.runner.json b/test/Service.FunctionalTests/xunit.runner.json
similarity index 100%
rename from test/Microsoft.AspnetCore.Identity.Service.FunctionalTests/xunit.runner.json
rename to test/Service.FunctionalTests/xunit.runner.json
diff --git a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/InMemoryStore.cs b/test/Service.InMemory.Test/InMemoryStore.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/InMemoryStore.cs
rename to test/Service.InMemory.Test/InMemoryStore.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/InMemoryStoreTest.cs b/test/Service.InMemory.Test/InMemoryStoreTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/InMemoryStoreTest.cs
rename to test/Service.InMemory.Test/InMemoryStoreTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj b/test/Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj
similarity index 68%
rename from test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj
rename to test/Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj
index 9ff248c8c5..703a12ee7e 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj
+++ b/test/Service.InMemory.Test/Microsoft.AspNetCore.Identity.Service.InMemory.Test.csproj
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj" />
+    <ProjectReference Include="..\..\src\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\..\src\Service.Specification.Tests\Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/TestApplication.cs b/test/Service.InMemory.Test/TestApplication.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.InMemory.Test/TestApplication.cs
rename to test/Service.InMemory.Test/TestApplication.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/ApplicationManagerTest.cs b/test/Service.Test/ApplicationManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Test/ApplicationManagerTest.cs
rename to test/Service.Test/ApplicationManagerTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/ApplicationValidatorTest.cs b/test/Service.Test/ApplicationValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Test/ApplicationValidatorTest.cs
rename to test/Service.Test/ApplicationValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/ClientApplicationValidatorTest.cs b/test/Service.Test/ClientApplicationValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Test/ClientApplicationValidatorTest.cs
rename to test/Service.Test/ClientApplicationValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/IdentityOptionsServiceCollectionExtensionsTest.cs b/test/Service.Test/IdentityOptionsServiceCollectionExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Identity.Service.Test/IdentityOptionsServiceCollectionExtensionsTest.cs
rename to test/Service.Test/IdentityOptionsServiceCollectionExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj b/test/Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
similarity index 52%
rename from test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
rename to test/Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
index 726e9edf65..09b9dc1d80 100644
--- a/test/Microsoft.AspNetCore.Identity.Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
+++ b/test/Service.Test/Microsoft.AspNetCore.Identity.Service.Test.csproj
@@ -4,8 +4,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Identity.Service\Microsoft.AspNetCore.Identity.Service.csproj" />
+    <ProjectReference Include="..\..\src\Service.EF\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\Service\Microsoft.AspNetCore.Identity.Service.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Identity.OpenIdConnect.WebSite.csproj b/test/WebSites/Identity.OpenIdConnect.WebSite/Identity.OpenIdConnect.WebSite.csproj
index 0aca331420..93f12b52d8 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Identity.OpenIdConnect.WebSite.csproj
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Identity.OpenIdConnect.WebSite.csproj
@@ -43,10 +43,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Diagnostics.Identity.Service\Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Identity.Service.AzureKeyVault\Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj" />
+    <ProjectReference Include="..\..\..\src\Service.Diagnostics\Microsoft.AspNetCore.Diagnostics.Identity.Service.csproj" />
+    <ProjectReference Include="..\..\..\src\Service.EF\Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\..\src\Service.IntegratedWebClient\Microsoft.AspNetCore.Identity.Service.IntegratedWebClient.csproj" />
+    <ProjectReference Include="..\..\..\src\Service.AzureKeyVault\Microsoft.AspNetCore.Identity.Service.AzureKeyVault.csproj" />
   </ItemGroup>
 
 </Project>