diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index 6a40c7dd56..7bc9e99cd2 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -84,6 +84,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-files", "docker-file
docker\up.ps1 = docker\up.ps1
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.UI", "Abp.UI", "{44F530AA-CF9B-4B73-8D9B-E9C6C66A01FE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -232,5 +234,6 @@ Global
{63244DC7-34BE-44E1-BF6F-F2672E59AF36} = {1187F469-0063-4065-9419-A1D956C80145}
{ADFAF85B-B785-41EA-B57D-422775989FA6} = {1187F469-0063-4065-9419-A1D956C80145}
{0BEA55D6-E0B8-40DD-A256-B34C4DD990A5} = {CBCC288A-53C3-402F-99F7-E468738560F5}
+ {44F530AA-CF9B-4B73-8D9B-E9C6C66A01FE} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
EndGlobalSection
EndGlobal
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
index 1f15975a11..addd8cdc92 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
@@ -9,7 +9,7 @@ using Volo.Abp;
using Volo.Abp.AspNetCore.Modularity;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Modularity;
-using Volo.Abp.Ui.Navigation;
+using Volo.Abp.UI.Navigation;
namespace AbpDesk.Web.Mvc
{
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
index b584053d14..1df5245c7e 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
@@ -1,5 +1,5 @@
using System.Threading.Tasks;
-using Volo.Abp.Ui.Navigation;
+using Volo.Abp.UI.Navigation;
namespace AbpDesk.Web.Mvc.Navigation
{
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml
index a2968363af..c8e48398aa 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml
@@ -1,5 +1,5 @@
@using System.Threading.Tasks
-@model Volo.Abp.Ui.Navigation.ApplicationMenu
+@model Volo.Abp.UI.Navigation.ApplicationMenu
@Model.DisplayName
@foreach (var menuItem in Model.Items)
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs
index bf20652dfc..64777e2b3a 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Ui.Navigation;
+using Volo.Abp.UI.Navigation;
namespace AbpDesk.Web.Mvc.Views.Shared.Components.Menu
{
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml
index e6eb0a966a..076fe5f970 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-@using Volo.Abp.Ui.Navigation
+@using Volo.Abp.UI.Navigation
@{
Layout = null;
}
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
index fff323edf4..d723aeec44 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using JetBrains.Annotations;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public class ApplicationMenu : IHasMenuItems
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
index 9ad5a1db55..d5b59a1905 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using JetBrains.Annotations;
using Volo.ExtensionMethods.Collections.Generic;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public class ApplicationMenuItem : IHasMenuItems
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
index 82b3058902..adfa8f2f40 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public interface IHasMenuItems
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
index f07b3cd0b9..041c8d126a 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
@@ -1,6 +1,6 @@
using Volo.DependencyInjection;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public interface IMenuConfigurationContext : IServiceProviderAccessor
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
index e38ad24a14..6a67281172 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public interface IMenuContributor
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
index 81ae9d9318..c22c771e7b 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public interface IMenuManager
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
index 98d650b758..f4d7ad6461 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
@@ -1,6 +1,6 @@
using System;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public class MenuConfigurationContext : IMenuConfigurationContext
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
index 20b900d3cc..dc99e66e83 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Volo.DependencyInjection;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
//TODO: We can move Navigation to a dedicated dll, or to a Volo.Abp.Ui dll.
public class MenuManager : IMenuManager, ITransientDependency
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
index b39f5d5df0..2237add732 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using JetBrains.Annotations;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public class NavigationOptions
{
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
index 5df07aec5c..f69a19357e 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public static class StandardMenus
{
diff --git a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
index 357707c40d..346b5d83ec 100644
--- a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
@@ -6,7 +6,7 @@ using Volo.Abp.TestBase;
using Volo.ExtensionMethods.Collections.Generic;
using Xunit;
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
{
public class MenuManager_Tests : AbpIntegratedTest
{