diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index edd459ab29..3724db61e3 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -54,8 +54,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AbpDesk", "AbpDesk", "{1187
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Domain", "src\AbpDesk\AbpDesk.Domain\AbpDesk.Domain.xproj", "{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.UI", "src\AbpDesk\AbpDesk.UI\AbpDesk.UI.xproj", "{12E14D95-4ABA-4290-AB1D-CCF5EB158411}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application.Contracts", "src\AbpDesk\AbpDesk.Application.Contracts\AbpDesk.Application.Contracts.xproj", "{E45B2BA3-7917-4236-99CD-B0A25285A652}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application", "src\AbpDesk\AbpDesk.Application\AbpDesk.Application.xproj", "{B6E622CE-0AEE-45DA-81AB-C244196CB583}"
@@ -74,6 +72,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application.Tests",
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.TestBase", "src\Volo.Abp.TestBase\Volo.Abp.TestBase.xproj", "{8CECCEAF-F0D8-4257-96BA-EACF4763AF42}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Web.Mvc", "src\AbpDesk\AbpDesk.Web.Mvc\AbpDesk.Web.Mvc.xproj", "{12E14D95-4ABA-4290-AB1D-CCF5EB158411}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,10 +144,6 @@ Global
 		{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E14D95-4ABA-4290-AB1D-CCF5EB158411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
 		{E45B2BA3-7917-4236-99CD-B0A25285A652}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E45B2BA3-7917-4236-99CD-B0A25285A652}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E45B2BA3-7917-4236-99CD-B0A25285A652}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -180,6 +176,10 @@ Global
 		{8CECCEAF-F0D8-4257-96BA-EACF4763AF42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CECCEAF-F0D8-4257-96BA-EACF4763AF42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CECCEAF-F0D8-4257-96BA-EACF4763AF42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12E14D95-4ABA-4290-AB1D-CCF5EB158411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -206,7 +206,6 @@ Global
 		{A1AE63E9-0CF4-4AFB-A584-65D826DEA3CB} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
 		{1187F469-0063-4065-9419-A1D956C80145} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8} = {1187F469-0063-4065-9419-A1D956C80145}
-		{12E14D95-4ABA-4290-AB1D-CCF5EB158411} = {1187F469-0063-4065-9419-A1D956C80145}
 		{E45B2BA3-7917-4236-99CD-B0A25285A652} = {1187F469-0063-4065-9419-A1D956C80145}
 		{B6E622CE-0AEE-45DA-81AB-C244196CB583} = {1187F469-0063-4065-9419-A1D956C80145}
 		{35624E7C-6501-4B42-9AA7-70555666A8B3} = {1187F469-0063-4065-9419-A1D956C80145}
@@ -216,5 +215,6 @@ Global
 		{61708AC8-CE70-4351-9B31-13EA8213D208} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{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}
 	EndGlobalSection
 EndGlobal
diff --git a/Volo.Abp.v3.ncrunchsolution b/Volo.Abp.v3.ncrunchsolution
deleted file mode 100644
index 10420ac91d..0000000000
--- a/Volo.Abp.v3.ncrunchsolution
+++ /dev/null
@@ -1,6 +0,0 @@
-<SolutionConfiguration>
-  <Settings>
-    <AllowParallelTestExecution>True</AllowParallelTestExecution>
-    <SolutionConfigured>True</SolutionConfigured>
-  </Settings>
-</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/AbpDesk/AbpDesk.UI/AbpDesk.UI.xproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/AbpDesk.UI.xproj
rename to src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj
diff --git a/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
similarity index 98%
rename from src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs
rename to src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
index 0aa9edcea6..7cfbb093ff 100644
--- a/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
@@ -17,7 +17,7 @@ namespace AbpDesk
     //TODO: Rename project to AbpDesk.Web.Mvc
 
     [DependsOn(typeof(AbpAspNetCoreMvcModule), typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule))]
-    public class AbpDeskWebAppModule : AbpModule
+    public class AbpDeskWebMvcModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
         {
diff --git a/src/AbpDesk/AbpDesk.UI/Controllers/HomeController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/Controllers/HomeController.cs
rename to src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs
diff --git a/src/AbpDesk/AbpDesk.UI/Controllers/TicketsController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/TicketsController.cs
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/Controllers/TicketsController.cs
rename to src/AbpDesk/AbpDesk.Web.Mvc/Controllers/TicketsController.cs
diff --git a/src/AbpDesk/AbpDesk.UI/Models/Tickets/IndexViewModel.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Models/Tickets/IndexViewModel.cs
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/Models/Tickets/IndexViewModel.cs
rename to src/AbpDesk/AbpDesk.Web.Mvc/Models/Tickets/IndexViewModel.cs
diff --git a/src/AbpDesk/AbpDesk.UI/Program.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Program.cs
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/Program.cs
rename to src/AbpDesk/AbpDesk.Web.Mvc/Program.cs
diff --git a/src/AbpDesk/AbpDesk.UI/Properties/launchSettings.json b/src/AbpDesk/AbpDesk.Web.Mvc/Properties/launchSettings.json
similarity index 95%
rename from src/AbpDesk/AbpDesk.UI/Properties/launchSettings.json
rename to src/AbpDesk/AbpDesk.Web.Mvc/Properties/launchSettings.json
index 2068644ea0..aaa78fc0c1 100644
--- a/src/AbpDesk/AbpDesk.UI/Properties/launchSettings.json
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "AbpDesk.UI": {
+    "AbpDesk.Web.Mvc": {
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "http://localhost:5000",
diff --git a/src/AbpDesk/AbpDesk.UI/Startup.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
similarity index 88%
rename from src/AbpDesk/AbpDesk.UI/Startup.cs
rename to src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
index 12d379b6d0..e9351ebaff 100644
--- a/src/AbpDesk/AbpDesk.UI/Startup.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
@@ -9,7 +9,7 @@ namespace AbpDesk
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddApplication<AbpDeskWebAppModule>();
+            services.AddApplication<AbpDeskWebMvcModule>();
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
diff --git a/src/AbpDesk/AbpDesk.UI/Views/Tickets/Index.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Tickets/Index.cshtml
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/Views/Tickets/Index.cshtml
rename to src/AbpDesk/AbpDesk.Web.Mvc/Views/Tickets/Index.cshtml
diff --git a/src/AbpDesk/AbpDesk.UI/appsettings.json b/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/appsettings.json
rename to src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json
diff --git a/src/AbpDesk/AbpDesk.UI/compilerconfig.json b/src/AbpDesk/AbpDesk.Web.Mvc/compilerconfig.json
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/compilerconfig.json
rename to src/AbpDesk/AbpDesk.Web.Mvc/compilerconfig.json
diff --git a/src/AbpDesk/AbpDesk.UI/compilerconfig.json.defaults b/src/AbpDesk/AbpDesk.Web.Mvc/compilerconfig.json.defaults
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/compilerconfig.json.defaults
rename to src/AbpDesk/AbpDesk.Web.Mvc/compilerconfig.json.defaults
diff --git a/src/AbpDesk/AbpDesk.UI/project.json b/src/AbpDesk/AbpDesk.Web.Mvc/project.json
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/project.json
rename to src/AbpDesk/AbpDesk.Web.Mvc/project.json
diff --git a/src/AbpDesk/AbpDesk.UI/web.config b/src/AbpDesk/AbpDesk.Web.Mvc/web.config
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/web.config
rename to src/AbpDesk/AbpDesk.Web.Mvc/web.config
diff --git a/src/AbpDesk/AbpDesk.UI/wwwroot/global-styles.css b/src/AbpDesk/AbpDesk.Web.Mvc/wwwroot/global-styles.css
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/wwwroot/global-styles.css
rename to src/AbpDesk/AbpDesk.Web.Mvc/wwwroot/global-styles.css
diff --git a/src/AbpDesk/AbpDesk.UI/wwwroot/global-styles.min.css b/src/AbpDesk/AbpDesk.Web.Mvc/wwwroot/global-styles.min.css
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/wwwroot/global-styles.min.css
rename to src/AbpDesk/AbpDesk.Web.Mvc/wwwroot/global-styles.min.css
diff --git a/src/AbpDesk/AbpDesk.UI/wwwroot/global-styles.scss b/src/AbpDesk/AbpDesk.Web.Mvc/wwwroot/global-styles.scss
similarity index 100%
rename from src/AbpDesk/AbpDesk.UI/wwwroot/global-styles.scss
rename to src/AbpDesk/AbpDesk.Web.Mvc/wwwroot/global-styles.scss