diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
index 57ea05c73e..8cbb8fa01a 100644
--- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
+++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
@@ -10,6 +10,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
+using MyCompanyName.MyProjectName.Web;
using StackExchange.Redis;
using Volo.Abp;
using Volo.Abp.AspNetCore.Authentication.OAuth;
diff --git a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
index 78234ce6b4..85e77ff406 100644
--- a/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
+++ b/templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.EntityFrameworkCore;
using MyCompanyName.MyProjectName.MultiTenancy;
+using MyCompanyName.MyProjectName.Web;
using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.Account.Web;
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index 384116e607..bf055b7d8b 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -7,7 +7,7 @@
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
true
Library
- MyCompanyName.MyProjectName
+ MyCompanyName.MyProjectName.Web
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs
index b844d86ae2..3d63d39465 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Volo.Abp.UI.Navigation;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
public class MyProjectNameMenuContributor : IMenuContributor
{
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
index 2ff3773dc4..980df394b5 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
@@ -1,6 +1,6 @@
using AutoMapper;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
public class MyProjectNameWebAutoMapperProfile : Profile
{
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index fb8e71f4ea..527dfa91b8 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -10,7 +10,7 @@ using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
[DependsOn(
typeof(MyProjectNameHttpApiModule),
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs
index 3c1f22206a..5f158525f3 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs
@@ -6,7 +6,7 @@ using MyCompanyName.MyProjectName.MultiTenancy;
using Volo.Abp.TenantManagement.Web.Navigation;
using Volo.Abp.UI.Navigation;
-namespace MyCompanyName.MyProjectName.Menus
+namespace MyCompanyName.MyProjectName.Web.Menus
{
public class MyProjectNameMenuContributor : IMenuContributor
{
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index 77e1810290..84ba69f73e 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -4,7 +4,7 @@
netcoreapp2.2
- MyCompanyName.MyProjectName
+ MyCompanyName.MyProjectName.Web
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
true
true
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
index aba2d3920e..ce09452496 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
@@ -1,7 +1,7 @@
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components;
using Volo.Abp.DependencyInjection;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
[Dependency(ReplaceServices = true)]
public class MyProjectNameBrandingProvider : DefaultBrandingProvider
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
index b8069ae329..e728b8a6e7 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
@@ -1,6 +1,6 @@
using AutoMapper;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
public class MyProjectNameWebAutoMapperProfile : Profile
{
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index bc9d41a476..84cacf1d48 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -1,14 +1,14 @@
-using Localization.Resources.AbpUi;
+using System.IO;
+using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.EntityFrameworkCore;
-using MyCompanyName.MyProjectName.Menus;
-using Swashbuckle.AspNetCore.Swagger;
-using System.IO;
-using Microsoft.Extensions.Configuration;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
+using MyCompanyName.MyProjectName.Web.Menus;
+using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.Authentication.JwtBearer;
@@ -30,7 +30,7 @@ using Volo.Abp.UI;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
[DependsOn(
typeof(MyProjectNameHttpApiModule),
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
index 5efecf03a5..2565dc8267 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
@@ -1,7 +1,6 @@
@page
-@using MyCompanyName.MyProjectName.Pages
-@inherits MyProjectNamePageBase
-@model IndexModel
+@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePageBase
+@model MyCompanyName.MyProjectName.Web.Pages.IndexModel
@section styles {
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs
index 024461326e..f8d2476c5b 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs
@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Pages
+namespace MyCompanyName.MyProjectName.Web.Pages
{
public class IndexModel : MyProjectNamePageModelBase
{
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs
index fde2c858b9..217c70d491 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Internal;
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-namespace MyCompanyName.MyProjectName.Pages
+namespace MyCompanyName.MyProjectName.Web.Pages
{
public abstract class MyProjectNamePageBase : AbpPage
{
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs
index 88795db56d..afd22b08c4 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs
@@ -1,7 +1,7 @@
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-namespace MyCompanyName.MyProjectName.Pages
+namespace MyCompanyName.MyProjectName.Web.Pages
{
public abstract class MyProjectNamePageModelBase : AbpPageModel
{
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
index 22b560f34f..ca7eeab845 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting;
using Serilog;
using Serilog.Events;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
public class Program
{
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Startup.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Startup.cs
index 2e788dc051..db5c45e654 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Startup.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Startup.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Volo.Abp;
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Web
{
public class Startup
{
diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
index f99735b782..b39a72d70b 100644
--- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
+++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
@@ -7,7 +7,8 @@ using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using MyCompanyName.MyProjectName.Localization;
-using MyCompanyName.MyProjectName.Menus;
+using MyCompanyName.MyProjectName.Web;
+using MyCompanyName.MyProjectName.Web.Menus;
using Volo.Abp;
using Volo.Abp.AspNetCore.TestBase;
using Volo.Abp.Localization;