diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissionDefinitionProvider.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs
similarity index 100%
rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissionDefinitionProvider.cs
rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs
similarity index 100%
rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissions.cs
rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
index 8a01585f69..8b471075de 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
@@ -6,7 +6,9 @@ namespace MyCompanyName.MyProjectName
     {
         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/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
index 025eb7e3bb..182ca13137 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
@@ -14,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/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
index 39341e9dba..16b0f56b7f 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.Localization;
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.VirtualFileSystem;
 
 namespace MyCompanyName.MyProjectName
@@ -22,6 +23,7 @@ namespace MyCompanyName.MyProjectName
             {
                 options.Resources
                     .Add<MyProjectNameResource>("en")
+                    .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Localization/MyProjectName/DomainShared");
             });
 
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameErrorCodes.cs
similarity index 68%
rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs
rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameErrorCodes.cs
index 55a2ed72bc..510927a7f1 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs
+++ b/templates/mvc-module/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/mvc-module/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/Domain/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/Domain/en.json
deleted file mode 100644
index 92e4e9582b..0000000000
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/Domain/en.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "en",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
index 8376aba526..c9a5a8c185 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
@@ -15,9 +15,4 @@
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Localization\MyProjectName\Domain\*.json" />
-    <Content Remove="Localization\MyProjectName\Domain\*.json" />
-  </ItemGroup>
-
 </Project>
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
index 849aa1073a..71952ccbae 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
@@ -1,7 +1,4 @@
-using MyCompanyName.MyProjectName.Localization;
-using Volo.Abp.Localization;
-using Volo.Abp.Modularity;
-using Volo.Abp.VirtualFileSystem;
+using Volo.Abp.Modularity;
 
 namespace MyCompanyName.MyProjectName
 {
@@ -10,19 +7,6 @@ namespace MyCompanyName.MyProjectName
         )]
     public class MyProjectNameDomainModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<VirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<MyProjectNameDomainModule>();
-            });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<MyProjectNameResource>()
-                    .AddVirtualJson("/Localization/MyProjectName/Domain");
-            });
-        }
     }
 }
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
index ed7788dab7..c337573d14 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs
+++ b/templates/mvc-module/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/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
index a0f14e727d..2ff3773dc4 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
@@ -6,7 +6,9 @@ namespace MyCompanyName.MyProjectName
     {
         public MyProjectNameWebAutoMapperProfile()
         {
-            //Create mappings.
+            /* 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/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index ab6fd865bd..d19ebe7d82 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -42,14 +42,16 @@ namespace MyCompanyName.MyProjectName
             {
                 options.Resources
                     .Get<MyProjectNameResource>()
-                    .AddBaseTypes(
-                        typeof(AbpValidationResource),
-                        typeof(AbpUiResource)
-                    ).AddVirtualJson("/Localization/Resources/MyProjectName");
+                    .AddBaseTypes(typeof(AbpUiResource))
+                    .AddVirtualJson("/Localization/MyProjectName/Web");
             });
 
             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<MyProjectNameWebAutoMapperProfile>(validate: true);
             });
 
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
index 4b00856bd9..3eac8ccc89 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
@@ -21,10 +21,10 @@ namespace MyCompanyName.MyProjectName
         {
             Configure<AbpAutoMapperOptions>(options =>
             {
-                /* use `true` for the `validate` parameter if you want to
+                /* Use `true` for the `validate` parameter if you want to
                  * validate the profile on application startup.
-                 * See http://docs.automapper.org/en/stable/Configuration-validation.html for more
-                 * about configuration validation. */
+                 * See http://docs.automapper.org/en/stable/Configuration-validation.html for more info
+                 * about the configuration validation. */
                 options.AddProfile<MyProjectNameApplicationAutoMapperProfile>();
             });
         }
diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs b/templates/mvc/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs
index 74d4879295..f8248c5690 100644
--- a/templates/mvc/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs
+++ b/templates/mvc/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs
@@ -7,6 +7,8 @@ using Volo.Abp.Uow;
 
 namespace MyCompanyName.MyProjectName
 {
+    /* All test classes are derived from this class, directly or indirectly.
+     */
     public abstract class MyProjectNameTestBase<TStartupModule> : AbpIntegratedTest<TStartupModule> 
         where TStartupModule : IAbpModule
     {