diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs
similarity index 91%
rename from templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs
index b4ff9e358d..aede7399b7 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Authorization
 {
     public class MyProjectNamePermissionDefinitionProvider : PermissionDefinitionProvider
     {
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs
similarity index 85%
rename from templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs
index 00d1124498..d4c035a652 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs
@@ -1,6 +1,6 @@
 using Volo.Abp.Reflection;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Authorization
 {
     public class MyProjectNamePermissions
     {
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/en.json
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json
rename to templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/en.json
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj
index 317662c6ac..6b7caa489c 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj
@@ -4,20 +4,20 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="MyCompanyName\MyProjectName\Localization\ApplicationContracts\*.json" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="MyCompanyName\MyProjectName\Localization\ApplicationContracts\*.json" />
+    <EmbeddedResource Include="Localization\MyProjectName\ApplicationContracts\*.json" />
+    <Content Remove="Localization\MyProjectName\ApplicationContracts\*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json
deleted file mode 100644
index 15d26f90a0..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-      "Permission:MyProjectName": "MyProjectName"
-    }
-  }
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Todos/ITodoAppService.cs b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Todos/ITodoAppService.cs
deleted file mode 100644
index 2cbf8c59de..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Todos/ITodoAppService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace MyCompanyName.MyProjectName.Todos
-{
-    public interface ITodoAppService
-    {
-        Task<PagedResultDto<TodoDto>> GetListAsync();
-    }
-}
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Todos/TodoDto.cs b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Todos/TodoDto.cs
deleted file mode 100644
index 695de83e12..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Todos/TodoDto.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace MyCompanyName.MyProjectName.Todos
-{
-    public class TodoDto : EntityDto<Guid>
-    {
-        public string Text { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs
similarity index 76%
rename from templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs
index 84be3eb86f..27f2c6e096 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs
@@ -1,7 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.Localization;
+using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Application;
-using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
@@ -25,7 +23,7 @@ namespace MyCompanyName.MyProjectName
             {
                 options.Resources
                     .Get<MyProjectNameResource>()
-                    .AddVirtualJson("/MyCompanyName/MyProjectName/Localization/ApplicationContracts");
+                    .AddVirtualJson("/Localization/MyProjectName/ApplicationContracts");
             });
         }
     }
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj
index 03a3c8d193..59d547ae8c 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj
@@ -4,11 +4,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
   </ItemGroup>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs b/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs
deleted file mode 100644
index 8a01585f69..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using AutoMapper;
-
-namespace MyCompanyName.MyProjectName
-{
-    public class MyProjectNameApplicationAutoMapperProfile : Profile
-    {
-        public MyProjectNameApplicationAutoMapperProfile()
-        {
-            
-        }
-    }
-}
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/Todos/TodoAppService.cs b/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/Todos/TodoAppService.cs
deleted file mode 100644
index 74bcdf4c24..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/Todos/TodoAppService.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-namespace MyCompanyName.MyProjectName.Todos
-{
-    public class TodoAppService : ApplicationService, ITodoAppService
-    {
-        public Task<PagedResultDto<TodoDto>> GetListAsync()
-        {
-            return Task.FromResult(
-                new PagedResultDto<TodoDto>(2, new List<TodoDto>
-                    {
-                        new TodoDto {Id = GuidGenerator.Create(), Text = "Todo item one"},
-                        new TodoDto {Id = GuidGenerator.Create(), Text = "Todo item two"}
-                    }
-                ));
-        }
-    }
-}
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs b/templates/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
new file mode 100644
index 0000000000..8b471075de
--- /dev/null
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
@@ -0,0 +1,14 @@
+using AutoMapper;
+
+namespace MyCompanyName.MyProjectName
+{
+    public class MyProjectNameApplicationAutoMapperProfile : Profile
+    {
+        public MyProjectNameApplicationAutoMapperProfile()
+        {
+            /* You can configure your AutoMapper mapping configuration here.
+             * Alternatively, you can split your mapping configurations
+             * into multiple profile classes for a better organization. */
+        }
+    }
+}
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs b/templates/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
similarity index 64%
rename from templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
index 891ff26af3..182ca13137 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
@@ -1,7 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
-using Volo.Abp.Settings;
 
 namespace MyCompanyName.MyProjectName
 {
@@ -16,6 +14,10 @@ namespace MyCompanyName.MyProjectName
         {
             Configure<AbpAutoMapperOptions>(options =>
             {
+                /* Using `true` for the `validate` parameter to
+                 * validate the profile on application startup.
+                 * See http://docs.automapper.org/en/stable/Configuration-validation.html for more info
+                 * about the configuration validation. */
                 options.AddProfile<MyProjectNameApplicationAutoMapperProfile>(validate: true);
             });
         }
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/DomainShared/en.json
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json
rename to templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/DomainShared/en.json
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
index 21e138f24b..e5698774eb 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
@@ -4,11 +4,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\MyProjectName\DomainShared\*.json" />
+    <Content Remove="Localization\MyProjectName\DomainShared\*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs
deleted file mode 100644
index 98c279b543..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-using Volo.Abp.Localization;
-using MyCompanyName.MyProjectName.Localization;
-
-namespace MyCompanyName.MyProjectName
-{
-    [DependsOn(
-        typeof(AbpLocalizationModule)
-        )]
-    public class MyProjectNameDomainSharedModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources.Add<MyProjectNameResource>("en");
-            });
-        }
-    }
-}
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
similarity index 63%
rename from templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
index 81f815a022..d41110a5a3 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
@@ -1,27 +1,30 @@
-using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Modularity;
 using Volo.Abp.Localization;
+using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
-using Volo.Abp.Modularity;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.VirtualFileSystem;
 
 namespace MyCompanyName.MyProjectName
 {
     [DependsOn(
-        typeof(MyProjectNameDomainSharedModule)
-        )]
-    public class MyProjectNameDomainModule : AbpModule
+        typeof(AbpLocalizationModule)
+    )]
+    public class MyProjectNameDomainSharedModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<VirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<MyProjectNameDomainModule>();
+                options.FileSets.AddEmbedded<MyProjectNameDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
-                options.Resources.Get<MyProjectNameResource>().AddVirtualJson("/MyCompanyName/MyProjectName/Localization/Domain");
+                options.Resources
+                    .Add<MyProjectNameResource>("en")
+                    .AddBaseTypes(typeof(AbpValidationResource))
+                    .AddVirtualJson("/Localization/MyProjectName/DomainShared");
             });
 
             Configure<ExceptionLocalizationOptions>(options =>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameErrorCodes.cs
similarity index 68%
rename from templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameErrorCodes.cs
index 55a2ed72bc..510927a7f1 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameErrorCodes.cs
@@ -1,6 +1,6 @@
 namespace MyCompanyName.MyProjectName
 {
-    public static class MyProjectNameDomainErrorCodes
+    public static class MyProjectNameErrorCodes
     {
         //Add your business exception error codes here...
     }
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
index 59e1709df7..99594df85b 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
@@ -4,20 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="MyCompanyName\MyProjectName\Localization\Domain\*.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Remove="MyCompanyName\MyProjectName\Localization\Domain\*.json" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json b/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json
deleted file mode 100644
index e4557f0ad2..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-  
-    }
-  }
\ No newline at end of file
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
new file mode 100644
index 0000000000..71952ccbae
--- /dev/null
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
@@ -0,0 +1,12 @@
+using Volo.Abp.Modularity;
+
+namespace MyCompanyName.MyProjectName
+{
+    [DependsOn(
+        typeof(MyProjectNameDomainSharedModule)
+        )]
+    public class MyProjectNameDomainModule : AbpModule
+    {
+
+    }
+}
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs
similarity index 87%
rename from templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs
index 0d5cee1168..f82e77b59e 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs
@@ -1,6 +1,6 @@
 using Volo.Abp.Settings;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Settings
 {
     public class MyProjectNameSettingDefinitionProvider : SettingDefinitionProvider
     {
diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs b/templates/service/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs
similarity index 83%
rename from templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs
rename to templates/service/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs
index 5a50555ea5..08767672ea 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs
@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.Settings
 {
     public static class MyProjectNameSettings
     {
diff --git a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs
rename to templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs
rename to templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
similarity index 64%
rename from templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
rename to templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
index ed7788dab7..c337573d14 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
+++ b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
@@ -21,16 +21,18 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
             builder.Entity<Question>(b =>
             {
                 //Configure table & schema name
-                //b.ToTable(options.TablePrefix + "Questions", options.Schema);
-                
+                b.ToTable(options.TablePrefix + "Questions", options.Schema);
+            
+                b.ConfigureFullAuditedAggregateRoot();
+            
                 //Properties
-                //b.Property(q => q.Title).IsRequired().HasMaxLength(QuestionConsts.MaxTitleLength);
+                b.Property(q => q.Title).IsRequired().HasMaxLength(QuestionConsts.MaxTitleLength);
                 
-                //Configure relations
-                //b.HasMany(question => question.Tags).WithOne().HasForeignKey(qt => qt.QuestionId);
+                //Relations
+                b.HasMany(question => question.Tags).WithOne().HasForeignKey(qt => qt.QuestionId);
 
-                //Configure indexes
-                //b.HasIndex(q => q.CreationTime);
+                //Indexes
+                b.HasIndex(q => q.CreationTime);
             });
             */
         }
diff --git a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs
rename to templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
index 0ca5581406..98af2369f0 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj
index c169b10e80..afa1abf52f 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj
@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs b/templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj
index 4050c826f6..ea8716cd47 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj
@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/Todos/TodosController.cs b/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/Todos/TodosController.cs
deleted file mode 100644
index ed74421bde..0000000000
--- a/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/Todos/TodosController.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.AspNetCore.Mvc;
-
-namespace MyCompanyName.MyProjectName.Todos
-{
-    [RemoteService]
-    [Area("MyProjectName")]
-    [Route("api/MyProjectName/todos")]
-    [Authorize]
-    public class TodosController : AbpController
-    {
-        private readonly ITodoAppService _todoAppService;
-
-        public TodosController(ITodoAppService todoAppService)
-        {
-            _todoAppService = todoAppService;
-        }
-
-        [HttpGet]
-        [Route("")]
-        public Task<PagedResultDto<TodoDto>> GetListAsync()
-        {
-            return _todoAppService.GetListAsync();
-        }
-    }
-}
diff --git a/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs b/templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs
rename to templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs
rename to templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs
rename to templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbModule.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs
rename to templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbModule.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs
similarity index 100%
rename from templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs
rename to templates/service/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs
diff --git a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj
index ec90deacf4..2a8d540aae 100644
--- a/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj
+++ b/templates/service/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj
@@ -4,12 +4,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MongoDB\Volo.Abp.MongoDB.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
+  </ItemGroup>
+
 </Project>