diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index 88bc0ce5b9..80831e61b7 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -76,8 +76,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TestBase", "src\Vo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.Web.Mvc", "src\AbpDesk\AbpDesk.Web.Mvc\AbpDesk.Web.Mvc.csproj", "{12E14D95-4ABA-4290-AB1D-CCF5EB158411}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Domain", "src\Volo.Abp.Identity\Volo.Abp.Identity.Domain.csproj", "{17DBB40A-243E-41F7-A672-FA316ECB1E33}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.EntityFrameworkCore", "src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj", "{439DFC0F-1BA2-464F-900E-EA7E18C08975}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Tests", "test\Volo.Abp.Identity.Tests\Volo.Abp.Identity.Tests.csproj", "{4AB91077-82DC-4335-9274-BCE017BD9C8B}"
@@ -134,7 +132,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Http.Client", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Http.Client.Tests", "test\Volo.Abp.Http.Client.Tests\Volo.Abp.Http.Client.Tests.csproj", "{703BD43C-02B9-413F-854C-9CBA0C963196}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Application.Tests", "test\Volo.Abp.Identity.Application.Tests\Volo.Abp.Identity.Application.Tests.csproj", "{40E21A35-1C66-4E89-A16E-0475011F7EFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Application.Tests", "test\Volo.Abp.Identity.Application.Tests\Volo.Abp.Identity.Application.Tests.csproj", "{40E21A35-1C66-4E89-A16E-0475011F7EFD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Domain", "src\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj", "{43D4005C-4F04-4128-937B-52BEAC5A113B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -222,10 +222,6 @@ Global
 		{12E14D95-4ABA-4290-AB1D-CCF5EB158411}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12E14D95-4ABA-4290-AB1D-CCF5EB158411}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12E14D95-4ABA-4290-AB1D-CCF5EB158411}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17DBB40A-243E-41F7-A672-FA316ECB1E33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17DBB40A-243E-41F7-A672-FA316ECB1E33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17DBB40A-243E-41F7-A672-FA316ECB1E33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17DBB40A-243E-41F7-A672-FA316ECB1E33}.Release|Any CPU.Build.0 = Release|Any CPU
 		{439DFC0F-1BA2-464F-900E-EA7E18C08975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{439DFC0F-1BA2-464F-900E-EA7E18C08975}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{439DFC0F-1BA2-464F-900E-EA7E18C08975}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -342,6 +338,10 @@ Global
 		{40E21A35-1C66-4E89-A16E-0475011F7EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40E21A35-1C66-4E89-A16E-0475011F7EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40E21A35-1C66-4E89-A16E-0475011F7EFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43D4005C-4F04-4128-937B-52BEAC5A113B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43D4005C-4F04-4128-937B-52BEAC5A113B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43D4005C-4F04-4128-937B-52BEAC5A113B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43D4005C-4F04-4128-937B-52BEAC5A113B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -376,7 +376,6 @@ Global
 		{E6E2467C-184A-4A0A-929F-932D5097953E} = {61708AC8-CE70-4351-9B31-13EA8213D208}
 		{8CECCEAF-F0D8-4257-96BA-EACF4763AF42} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
 		{12E14D95-4ABA-4290-AB1D-CCF5EB158411} = {1187F469-0063-4065-9419-A1D956C80145}
-		{17DBB40A-243E-41F7-A672-FA316ECB1E33} = {1895A5C9-50D4-4568-9A3A-14657E615A5E}
 		{439DFC0F-1BA2-464F-900E-EA7E18C08975} = {1895A5C9-50D4-4568-9A3A-14657E615A5E}
 		{4AB91077-82DC-4335-9274-BCE017BD9C8B} = {146F561E-C7B8-4166-9383-47E1BC1A2E62}
 		{B31FFAE3-5DAC-4E51-BD17-F7446B741A36} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
@@ -406,6 +405,7 @@ Global
 		{D5E2FB37-0194-480A-B952-5FFECC1200EB} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
 		{703BD43C-02B9-413F-854C-9CBA0C963196} = {37087D1B-3693-4E96-983D-A69F210BDE53}
 		{40E21A35-1C66-4E89-A16E-0475011F7EFD} = {146F561E-C7B8-4166-9383-47E1BC1A2E62}
+		{43D4005C-4F04-4128-937B-52BEAC5A113B} = {1895A5C9-50D4-4568-9A3A-14657E615A5E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj
index f7e7977aae..39a7450fa0 100644
--- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj
+++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\Volo.Abp.Identity\Volo.Abp.Identity.Domain.csproj" />
+    <ProjectReference Include="..\..\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
     <ProjectReference Include="..\AbpDesk.Application\AbpDesk.Application.csproj" />
     <ProjectReference Include="..\AbpDesk.Application.Contracts\AbpDesk.Application.Contracts.csproj" />
     <ProjectReference Include="..\AbpDesk.EntityFrameworkCore\AbpDesk.EntityFrameworkCore.csproj" />
diff --git a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj
index 15fc9e1612..3f278b70a4 100644
--- a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj
+++ b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Identity\Volo.Abp.Identity.Domain.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
index 514f52ba74..7b59b8606d 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
@@ -4,7 +4,7 @@ using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Identity
 {
-    [DependsOn(typeof(AbpIdentityModule), typeof(AbpIdentityApplicationContractsModule), typeof(AbpAutoMapperModule))]
+    [DependsOn(typeof(AbpIdentityDomainModule), typeof(AbpIdentityApplicationContractsModule), typeof(AbpAutoMapperModule))]
     public class AbpIdentityApplicationModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
diff --git a/src/Volo.Abp.Identity/Properties/AssemblyInfo.cs b/src/Volo.Abp.Identity.Domain/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Properties/AssemblyInfo.cs
rename to src/Volo.Abp.Identity.Domain/Properties/AssemblyInfo.cs
diff --git a/src/Volo.Abp.Identity/Volo.Abp.Identity.Domain.csproj b/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
similarity index 100%
rename from src/Volo.Abp.Identity/Volo.Abp.Identity.Domain.csproj
rename to src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/AbpIdentityModule.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
similarity index 75%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/AbpIdentityModule.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
index f9b35ac40b..e823e0e5e0 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/AbpIdentityModule.cs
+++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -3,13 +3,13 @@ using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Identity
 {
-    public class AbpIdentityModule : AbpModule
+    public class AbpIdentityDomainModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
         {
             //TODO: How to configure options of AddIdentity (and return value)
             services.AddIdentity<IdentityUser, IdentityRole>();
-            services.AddAssemblyOf<AbpIdentityModule>();
+            services.AddAssemblyOf<AbpIdentityDomainModule>();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IIdentityRoleRepository.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IIdentityRoleRepository.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IIdentityUserRepository.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IIdentityUserRepository.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRole.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRole.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleClaim.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleClaim.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleClaim.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleClaim.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleManager.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUser.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUser.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserClaim.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserClaim.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserClaim.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserClaim.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserLogin.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserLogin.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserManager.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserManager.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserRole.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRole.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserRole.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRole.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserToken.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs
similarity index 100%
rename from src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserToken.cs
rename to src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs
diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj
index 2818b41624..2b760a34af 100644
--- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj
+++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Identity\Volo.Abp.Identity.Domain.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreModule.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreModule.cs
index 748a217718..8083fff741 100644
--- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreModule.cs
+++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreModule.cs
@@ -4,7 +4,7 @@ using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Identity.EntityFrameworkCore
 {
-    [DependsOn(typeof(AbpIdentityModule), typeof(AbpEntityFrameworkCoreModule))]
+    [DependsOn(typeof(AbpIdentityDomainModule), typeof(AbpEntityFrameworkCoreModule))]
     public class AbpIdentityEntityFrameworkCoreModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
diff --git a/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj b/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj
index 0408b23e92..b09dc3c4c5 100644
--- a/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj
+++ b/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Volo.Abp.Identity\Volo.Abp.Identity.Domain.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
     <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
     <ProjectReference Include="..\..\src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj" />
   </ItemGroup>
diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestModule.cs b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestModule.cs
index e5db099dec..a236b22779 100644
--- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestModule.cs
+++ b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestModule.cs
@@ -8,7 +8,7 @@ using Volo.Abp.Modularity;
 
 namespace Volo.Abp.Identity
 {
-    [DependsOn(typeof(AbpIdentityModule), typeof(AbpIdentityEntityFrameworkCoreModule))]
+    [DependsOn(typeof(AbpIdentityDomainModule), typeof(AbpIdentityEntityFrameworkCoreModule))]
     public class AbpIdentityTestModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)