59 files changed, 175 insertions, 84 deletions
diff --git a/ExamTemplate/Common/ErrorMessages.cs b/ExamTemplate/Common/ExamTemplate.Common/ErrorMessages.cs
index fa15b8c..fa15b8c 100644
--- a/ExamTemplate/Common/ErrorMessages.cs
+++ b/ExamTemplate/Common/ExamTemplate.Common/ErrorMessages.cs
diff --git a/ExamTemplate/Common/Common.csproj b/ExamTemplate/Common/ExamTemplate.Common/ExamTemplate.Common.csproj
index 563e6f9..563e6f9 100644
--- a/ExamTemplate/Common/Common.csproj
+++ b/ExamTemplate/Common/ExamTemplate.Common/ExamTemplate.Common.csproj
diff --git a/ExamTemplate/Common/RoleConst.cs b/ExamTemplate/Common/ExamTemplate.Common/RoleConst.cs
index 7d72fea..7d72fea 100644
--- a/ExamTemplate/Common/RoleConst.cs
+++ b/ExamTemplate/Common/ExamTemplate.Common/RoleConst.cs
diff --git a/ExamTemplate/Data/Models/BaseModel.cs b/ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs
index 5e7b75c..5e7b75c 100644
--- a/ExamTemplate/Data/Models/BaseModel.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs
diff --git a/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj b/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj
new file mode 100644
index 0000000..7e76cb8
--- /dev/null
+++ b/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.5" />
+  </ItemGroup>
+
+</Project>
diff --git a/ExamTemplate/Data/Models/User.cs b/ExamTemplate/Data/ExamTemplate.Data.Models/User.cs
index 8fa698d..8fa698d 100644
--- a/ExamTemplate/Data/Models/User.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data.Models/User.cs
diff --git a/ExamTemplate/Data/Data.csproj b/ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj
index 098f532..0e2657c 100644
--- a/ExamTemplate/Data/Data.csproj
+++ b/ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\ExamTemplate.Data.Models\ExamTemplate.Data.Models.csproj" />
+    <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs
index d15b462..d15b462 100644
--- a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs
diff --git a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs
index a2f78ad..a2f78ad 100644
--- a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs
diff --git a/ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs
index 3286121..3286121 100644
--- a/ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs
diff --git a/ExamTemplate/Data/TemplateContext.cs b/ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs
index 268812d..268812d 100644
--- a/ExamTemplate/Data/TemplateContext.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs
diff --git a/ExamTemplate/Data/TemplateContextFactory.cs b/ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs
index dff2e9e..8b2c0fa 100644
--- a/ExamTemplate/Data/TemplateContextFactory.cs
+++ b/ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs
@@ -10,7 +10,7 @@ namespace ExamTemplate.Data
 		public TemplateContext CreateDbContext(string[] args)
 		{
 			var configuration = new ConfigurationBuilder()
-				.SetBasePath(Directory.GetCurrentDirectory() + "/../Web/")
+				.SetBasePath(Directory.GetCurrentDirectory() + "/../../Web/CarShop.Web/")
 				.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
 				.AddJsonFile("appsettings.Development.json", optional: true)
 				.Build();
diff --git a/ExamTemplate/ExamTemplate.sln b/ExamTemplate/ExamTemplate.sln
index 9dcfe98..1dc8d33 100644
--- a/ExamTemplate/ExamTemplate.sln
+++ b/ExamTemplate/ExamTemplate.sln
@@ -3,13 +3,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.6.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{5676382D-F650-45BF-96CD-1E99F4965233}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{B111A251-61F2-4737-AC8C-553BD4C4375F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "Services\Services.csproj", "{4BA16964-42F1-4481-8A47-1610B04398AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Common", "Common\ExamTemplate.Common\ExamTemplate.Common.csproj", "{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "Web\Web.csproj", "{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{6915D897-20EC-44F0-BED2-0FD9A2F37786}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{E182AE4B-1240-4AA7-A91C-29EC71C5C818}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Data", "Data\ExamTemplate.Data\ExamTemplate.Data.csproj", "{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Data.Models", "Data\ExamTemplate.Data.Models\ExamTemplate.Data.Models.csproj", "{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{9623FE1E-5B38-4DD5-96E1-00847C1AE386}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Services", "Services\ExamTemplate.Services\ExamTemplate.Services.csproj", "{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Services.Models", "Services\ExamTemplate.Services.Models\ExamTemplate.Services.Models.csproj", "{DCA531EE-5E78-41E0-B167-81510D31F421}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{F538D286-9CCB-42E9-921B-AEE5252E5845}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Web", "Web\ExamTemplate.Web\ExamTemplate.Web.csproj", "{AE877E66-7E65-46D8-A604-C5D60FB62EA9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamTemplate.Web.Models", "Web\ExamTemplate.Web.Models\ExamTemplate.Web.Models.csproj", "{199377D0-3918-41D1-942E-6EA8F84E8980}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,53 +38,98 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x64.Build.0 = Debug|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Debug|x86.Build.0 = Debug|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x64.ActiveCfg = Release|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x64.Build.0 = Release|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x86.ActiveCfg = Release|Any CPU
-		{5676382D-F650-45BF-96CD-1E99F4965233}.Release|x86.Build.0 = Release|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x64.Build.0 = Debug|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Debug|x86.Build.0 = Debug|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x64.ActiveCfg = Release|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x64.Build.0 = Release|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x86.ActiveCfg = Release|Any CPU
-		{4BA16964-42F1-4481-8A47-1610B04398AE}.Release|x86.Build.0 = Release|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x64.Build.0 = Debug|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Debug|x86.Build.0 = Debug|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x64.ActiveCfg = Release|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x64.Build.0 = Release|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x86.ActiveCfg = Release|Any CPU
-		{5AEF48AD-2352-43FC-8B6E-2E2A1FF3001E}.Release|x86.Build.0 = Release|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x64.Build.0 = Debug|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Debug|x86.Build.0 = Debug|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x64.ActiveCfg = Release|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x64.Build.0 = Release|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x86.ActiveCfg = Release|Any CPU
-		{E182AE4B-1240-4AA7-A91C-29EC71C5C818}.Release|x86.Build.0 = Release|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Debug|x64.Build.0 = Debug|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Debug|x86.Build.0 = Debug|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Release|x64.ActiveCfg = Release|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Release|x64.Build.0 = Release|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Release|x86.ActiveCfg = Release|Any CPU
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184}.Release|x86.Build.0 = Release|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Release|x64.Build.0 = Release|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD}.Release|x86.Build.0 = Release|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Release|x64.Build.0 = Release|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957}.Release|x86.Build.0 = Release|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Release|x64.Build.0 = Release|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F}.Release|x86.Build.0 = Release|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Debug|x64.Build.0 = Debug|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Debug|x86.Build.0 = Debug|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Release|x64.ActiveCfg = Release|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Release|x64.Build.0 = Release|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Release|x86.ActiveCfg = Release|Any CPU
+		{DCA531EE-5E78-41E0-B167-81510D31F421}.Release|x86.Build.0 = Release|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Debug|x64.Build.0 = Debug|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Debug|x86.Build.0 = Debug|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Release|x64.ActiveCfg = Release|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Release|x64.Build.0 = Release|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9}.Release|x86.Build.0 = Release|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Debug|x64.Build.0 = Debug|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Debug|x86.Build.0 = Debug|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Release|Any CPU.Build.0 = Release|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Release|x64.ActiveCfg = Release|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Release|x64.Build.0 = Release|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Release|x86.ActiveCfg = Release|Any CPU
+		{199377D0-3918-41D1-942E-6EA8F84E8980}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{6ED9F9D8-E02F-4516-8719-A6C9E4A4B184} = {B111A251-61F2-4737-AC8C-553BD4C4375F}
+		{77885AAB-EF5B-4565-BB6B-800C7CCFD3AD} = {6915D897-20EC-44F0-BED2-0FD9A2F37786}
+		{6A03BA8B-06ED-4EE6-AB0C-E03AF4793957} = {6915D897-20EC-44F0-BED2-0FD9A2F37786}
+		{9F37083F-F0FE-4488-9D5D-DA92FEAB003F} = {9623FE1E-5B38-4DD5-96E1-00847C1AE386}
+		{DCA531EE-5E78-41E0-B167-81510D31F421} = {9623FE1E-5B38-4DD5-96E1-00847C1AE386}
+		{AE877E66-7E65-46D8-A604-C5D60FB62EA9} = {F538D286-9CCB-42E9-921B-AEE5252E5845}
+		{199377D0-3918-41D1-942E-6EA8F84E8980} = {F538D286-9CCB-42E9-921B-AEE5252E5845}
 	EndGlobalSection
 EndGlobal
diff --git a/ExamTemplate/Services/Models/BaseServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/BaseServiceModel.cs
index 62d0da3..62d0da3 100644
--- a/ExamTemplate/Services/Models/BaseServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/BaseServiceModel.cs
diff --git a/ExamTemplate/Services/ExamTemplate.Services.Models/ExamTemplate.Services.Models.csproj b/ExamTemplate/Services/ExamTemplate.Services.Models/ExamTemplate.Services.Models.csproj
new file mode 100644
index 0000000..563e6f9
--- /dev/null
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/ExamTemplate.Services.Models.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/User/LoginUserServiceModel.cs
index 20aaaeb..20aaaeb 100644
--- a/ExamTemplate/Services/Models/User/LoginUserServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/User/LoginUserServiceModel.cs
diff --git a/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/User/RegisterUserServiceModel.cs
index b08d5ba..b08d5ba 100644
--- a/ExamTemplate/Services/Models/User/RegisterUserServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/User/RegisterUserServiceModel.cs
diff --git a/ExamTemplate/Services/Models/User/UserServiceModel.cs b/ExamTemplate/Services/ExamTemplate.Services.Models/User/UserServiceModel.cs
index 0e8b939..0e8b939 100644
--- a/ExamTemplate/Services/Models/User/UserServiceModel.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services.Models/User/UserServiceModel.cs
diff --git a/ExamTemplate/Services/Configurations/ServiceUserMappings.cs b/ExamTemplate/Services/ExamTemplate.Services/Configurations/ServiceUserMappings.cs
index 787b90f..787b90f 100644
--- a/ExamTemplate/Services/Configurations/ServiceUserMappings.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Configurations/ServiceUserMappings.cs
diff --git a/ExamTemplate/Services/Services.csproj b/ExamTemplate/Services/ExamTemplate.Services/ExamTemplate.Services.csproj
index eb60f3d..b84928f 100644
--- a/ExamTemplate/Services/Services.csproj
+++ b/ExamTemplate/Services/ExamTemplate.Services/ExamTemplate.Services.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\Data\Data.csproj" />
-    <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\ExamTemplate.Services.Models\ExamTemplate.Services.Models.csproj" />
+    <ProjectReference Include="..\..\Data\ExamTemplate.Data\ExamTemplate.Data.csproj" />
+    <ProjectReference Include="..\..\Data\ExamTemplate.Data.Models\ExamTemplate.Data.Models.csproj" />
+    <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ExamTemplate/Services/Interfaces/IBaseService.cs b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IBaseService.cs
index 66de7b8..66de7b8 100644
--- a/ExamTemplate/Services/Interfaces/IBaseService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IBaseService.cs
diff --git a/ExamTemplate/Services/Interfaces/ICloudinaryService.cs b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/ICloudinaryService.cs
index 9c4d884..9c4d884 100644
--- a/ExamTemplate/Services/Interfaces/ICloudinaryService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/ICloudinaryService.cs
diff --git a/ExamTemplate/Services/Interfaces/IUserService.cs b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IUserService.cs
index 35f14e3..35f14e3 100644
--- a/ExamTemplate/Services/Interfaces/IUserService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Interfaces/IUserService.cs
diff --git a/ExamTemplate/Services/Services/BaseService.cs b/ExamTemplate/Services/ExamTemplate.Services/Services/BaseService.cs
index b1b823e..b1b823e 100644
--- a/ExamTemplate/Services/Services/BaseService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Services/BaseService.cs
diff --git a/ExamTemplate/Services/Services/CloudinaryService.cs b/ExamTemplate/Services/ExamTemplate.Services/Services/CloudinaryService.cs
index 40772d9..40772d9 100644
--- a/ExamTemplate/Services/Services/CloudinaryService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Services/CloudinaryService.cs
diff --git a/ExamTemplate/Services/Services/UserService.cs b/ExamTemplate/Services/ExamTemplate.Services/Services/UserService.cs
index 4e85688..4e85688 100644
--- a/ExamTemplate/Services/Services/UserService.cs
+++ b/ExamTemplate/Services/ExamTemplate.Services/Services/UserService.cs
diff --git a/ExamTemplate/Web/Models/BaseWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/BaseWebModel.cs
index 1b662af..1b662af 100644
--- a/ExamTemplate/Web/Models/BaseWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/BaseWebModel.cs
diff --git a/ExamTemplate/Web/Models/ErrorViewModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/ErrorViewModel.cs
index af40d4c..af40d4c 100644
--- a/ExamTemplate/Web/Models/ErrorViewModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/ErrorViewModel.cs
diff --git a/ExamTemplate/Web/ExamTemplate.Web.Models/ExamTemplate.Web.Models.csproj b/ExamTemplate/Web/ExamTemplate.Web.Models/ExamTemplate.Web.Models.csproj
new file mode 100644
index 0000000..563e6f9
--- /dev/null
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/ExamTemplate.Web.Models.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/ExamTemplate/Web/Models/User/EditUserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/EditUserWebModel.cs
index 119a585..119a585 100644
--- a/ExamTemplate/Web/Models/User/EditUserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/EditUserWebModel.cs
diff --git a/ExamTemplate/Web/Models/User/LoginUserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/LoginUserWebModel.cs
index 0f4ef73..0f4ef73 100644
--- a/ExamTemplate/Web/Models/User/LoginUserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/LoginUserWebModel.cs
diff --git a/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/RegisterUserWebModel.cs
index c443dd2..c443dd2 100644
--- a/ExamTemplate/Web/Models/User/RegisterUserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/RegisterUserWebModel.cs
diff --git a/ExamTemplate/Web/Models/User/UserWebModel.cs b/ExamTemplate/Web/ExamTemplate.Web.Models/User/UserWebModel.cs
index af8d6c7..af8d6c7 100644
--- a/ExamTemplate/Web/Models/User/UserWebModel.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web.Models/User/UserWebModel.cs
diff --git a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs b/ExamTemplate/Web/ExamTemplate.Web/Configurations/ControllerUserMappings.cs
index 05c57e2..05c57e2 100644
--- a/ExamTemplate/Web/Configurations/ControllerUserMappings.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Configurations/ControllerUserMappings.cs
diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/ExamTemplate.Web/Controllers/AccountController.cs
index 2c2eb32..2c2eb32 100644
--- a/ExamTemplate/Web/Controllers/AccountController.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Controllers/AccountController.cs
diff --git a/ExamTemplate/Web/Controllers/HomeController.cs b/ExamTemplate/Web/ExamTemplate.Web/Controllers/HomeController.cs
index d9cfc45..d9cfc45 100644
--- a/ExamTemplate/Web/Controllers/HomeController.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Controllers/HomeController.cs
diff --git a/ExamTemplate/Web/Web.csproj b/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj
index 44c6a7a..b3e1542 100644
--- a/ExamTemplate/Web/Web.csproj
+++ b/ExamTemplate/Web/ExamTemplate.Web/ExamTemplate.Web.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <ProjectReference Include="..\Services\Services.csproj" />
-    <ProjectReference Include="..\Common\Common.csproj" />
+    <ProjectReference Include="..\ExamTemplate.Web.Models\ExamTemplate.Web.Models.csproj" />
+    <ProjectReference Include="..\..\Services\ExamTemplate.Services\ExamTemplate.Services.csproj" />
+    <ProjectReference Include="..\..\Services\ExamTemplate.Services.Models\ExamTemplate.Services.Models.csproj" />
+    <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ExamTemplate/Web/Program.cs b/ExamTemplate/Web/ExamTemplate.Web/Program.cs
index be33374..be33374 100644
--- a/ExamTemplate/Web/Program.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Program.cs
diff --git a/ExamTemplate/Web/Properties/launchSettings.json b/ExamTemplate/Web/ExamTemplate.Web/Properties/launchSettings.json
index 080115b..080115b 100644
--- a/ExamTemplate/Web/Properties/launchSettings.json
+++ b/ExamTemplate/Web/ExamTemplate.Web/Properties/launchSettings.json
diff --git a/ExamTemplate/Web/Startup.cs b/ExamTemplate/Web/ExamTemplate.Web/Startup.cs
index c18bca6..c18bca6 100644
--- a/ExamTemplate/Web/Startup.cs
+++ b/ExamTemplate/Web/ExamTemplate.Web/Startup.cs
diff --git a/ExamTemplate/Web/Views/Account/Edit.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Edit.cshtml
index a088742..a088742 100644
--- a/ExamTemplate/Web/Views/Account/Edit.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Edit.cshtml
diff --git a/ExamTemplate/Web/Views/Account/Login.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Login.cshtml
index daa3f3e..daa3f3e 100644
--- a/ExamTemplate/Web/Views/Account/Login.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Login.cshtml
diff --git a/ExamTemplate/Web/Views/Account/Profile.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Profile.cshtml
index 33fc882..33fc882 100644
--- a/ExamTemplate/Web/Views/Account/Profile.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Profile.cshtml
diff --git a/ExamTemplate/Web/Views/Account/Register.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Register.cshtml
index e436d72..e436d72 100644
--- a/ExamTemplate/Web/Views/Account/Register.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Account/Register.cshtml
diff --git a/ExamTemplate/Web/Views/Home/Index.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Home/Index.cshtml
index 56ea950..56ea950 100644
--- a/ExamTemplate/Web/Views/Home/Index.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Home/Index.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/Error.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/Error.cshtml
index 5a7ce95..5a7ce95 100644
--- a/ExamTemplate/Web/Views/Shared/Error.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/Error.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/ErrorNotFound.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/ErrorNotFound.cshtml
index 39fc5ca..39fc5ca 100644
--- a/ExamTemplate/Web/Views/Shared/ErrorNotFound.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/ErrorNotFound.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/_FooterContent.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_FooterContent.cshtml
index 60a21aa..60a21aa 100644
--- a/ExamTemplate/Web/Views/Shared/_FooterContent.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_FooterContent.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/_Layout.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Layout.cshtml
index dd7bf82..dd7bf82 100644
--- a/ExamTemplate/Web/Views/Shared/_Layout.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Layout.cshtml
diff --git a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Navbar.cshtml
index 0ec5c4d..0ec5c4d 100644
--- a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/Shared/_Navbar.cshtml
diff --git a/ExamTemplate/Web/Views/_ViewImports.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewImports.cshtml
index 18502e4..18502e4 100644
--- a/ExamTemplate/Web/Views/_ViewImports.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewImports.cshtml
diff --git a/ExamTemplate/Web/Views/_ViewStart.cshtml b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewStart.cshtml
index 3a04d05..3a04d05 100644
--- a/ExamTemplate/Web/Views/_ViewStart.cshtml
+++ b/ExamTemplate/Web/ExamTemplate.Web/Views/_ViewStart.cshtml
diff --git a/ExamTemplate/Web/appsettings.json b/ExamTemplate/Web/ExamTemplate.Web/appsettings.json
index f1b58be..f1b58be 100644
--- a/ExamTemplate/Web/appsettings.json
+++ b/ExamTemplate/Web/ExamTemplate.Web/appsettings.json
diff --git a/ExamTemplate/Web/wwwroot/css/site.css b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/site.css
index 5923427..5923427 100644
--- a/ExamTemplate/Web/wwwroot/css/site.css
+++ b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/site.css
diff --git a/ExamTemplate/Web/wwwroot/css/styles.css b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/styles.css
index e7fc7b3..e7fc7b3 100644
--- a/ExamTemplate/Web/wwwroot/css/styles.css
+++ b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/css/styles.css
diff --git a/ExamTemplate/Web/wwwroot/favicon.ico b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/favicon.ico
index a3a7999..a3a7999 100644
--- a/ExamTemplate/Web/wwwroot/favicon.ico
+++ b/ExamTemplate/Web/ExamTemplate.Web/wwwroot/favicon.ico
diff --git a/tools/add-feature-template.sh b/tools/add-feature-template.sh
index 3b11a44..9637384 100755
--- a/tools/add-feature-template.sh
+++ b/tools/add-feature-template.sh
@@ -32,7 +32,7 @@ dir="../$project_name/Data"
 # {{{ --------------------------->
 # Create the DB model class
 
-cat > $dir/Models/$feature_name.cs<< EOF
+cat > $dir/${project_name}.Data.Models/$feature_name.cs<< EOF
 using System;
 
 namespace $project_name.Data.Models
@@ -55,7 +55,7 @@ EOF
 
 
 dbset="public DbSet<$feature_name> ${feature_name}s { get; set; }"
-dbcontext_path="$dir/${project_name}Context.cs"
+dbcontext_path="$dir/${project_name}.Data/${project_name}Context.cs"
 
 if ! grep -q "$dbset" "$dbcontext_path"; then
 	if grep -Fq "DbSet" $dbcontext_path; then
@@ -77,7 +77,7 @@ dir="../$project_name/Services"
 # {{{ --------------------------->
 # Create Service and Interface
 
-cat > $dir/Interfaces/I${feature_name}Service.cs<< EOF
+cat > $dir/${project_name}.Services/Interfaces/I${feature_name}Service.cs<< EOF
 using $project_name.Data.Models;
 using $project_name.Services.Models.$feature_name;
 
@@ -88,7 +88,7 @@ namespace $project_name.Services.Interfaces
 }
 EOF
 
-cat > $dir/Services/${feature_name}Service.cs<< EOF
+cat > $dir/${project_name}.Services/Services/${feature_name}Service.cs<< EOF
 using $project_name.Services.Interfaces;
 using System;
 using AutoMapper;
@@ -112,7 +112,7 @@ EOF
 # {{{ --------------------------->
 # Create Service Model
 
-subdir="$dir/Models/$feature_name"
+subdir="$dir/${project_name}.Services.Models/$feature_name"
 mkdir -p $subdir
 
 cat > $subdir/$model${feature_name}ServiceModel.cs<< EOF
@@ -137,7 +137,7 @@ EOF
 # {{{ --------------------------->
 # Create Service Mappings
 
-subdir="${dir}/Configurations"
+subdir="$dir/${project_name}.Services/Configurations"
 
 mappings=("${feature_name}ServiceModel, $feature_name" "${feature_name}, ${feature_name}ServiceModel")
 cat > $subdir/Service${feature_name}Mappings.cs<< EOF
@@ -173,7 +173,7 @@ dir="../$project_name/Web"
 # {{{ --------------------------->
 # Add the dependency injection of the Service class
 
-startup_path="$dir/Startup.cs"
+startup_path="$dir/${project_name}.Web/Startup.cs"
 service_name="${feature_name}Service"
 if ! grep -q "$service_name" "$startup_path"; then
 	sed -z -i "s/.*AddTransient[^\n]*\n/&\t\t\tservices.AddTransient<I$service_name, $service_name>();\n/" $startup_path
@@ -184,7 +184,7 @@ fi
 # {{{ --------------------------->
 # Create View Models
 
-subdir="$dir/Models/$feature_name"
+subdir="$dir/${project_name}.Web.Models/$feature_name"
 mkdir -p $subdir
 
 models=("" "Create" "Edit")
@@ -220,7 +220,7 @@ done
 # {{{ --------------------------->
 # Update View Imports
 
-viewimports_path="$dir/Views/_ViewImports.cshtml"
+viewimports_path="$dir/${project_name}.Web/Views/_ViewImports.cshtml"
 import_name="$project_name.Web.Models.$feature_name"
 if ! grep -q "$import_name" "$viewimports_path"; then
 	sed -z -i "s/.*@using[^\n]*\n/&@using $import_name\n/" $viewimports_path
@@ -231,7 +231,7 @@ fi
 # {{{ --------------------------->
 # Create Views
 
-subdir="$dir/Views/$feature_name"
+subdir="$dir/${project_name}.Web/Views/$feature_name"
 mkdir -p $subdir
 
 cat > $subdir/Index.cshtml<< EOF
@@ -342,7 +342,7 @@ EOF
 # {{{ --------------------------->
 # Create Controller
 
-subdir="$dir/Controllers"
+subdir="$dir/${project_name}.Web/Controllers"
 
 cat > $subdir/${feature_name}Controller.cs<< EOF
 using System;
@@ -461,7 +461,7 @@ EOF
 # {{{ --------------------------->
 # Create Controller Mappings
 
-subdir="${dir}/Configurations"
+subdir="${dir}/${project_name}.Web/Configurations"
 
 mappings=("${feature_name}ServiceModel, ${feature_name}WebModel" "Create${feature_name}WebModel, ${feature_name}ServiceModel" "${feature_name}ServiceModel, Edit${feature_name}WebModel" "Edit${feature_name}WebModel, ${feature_name}ServiceModel")
 cat > $subdir/Controller${feature_name}Mappings.cs<< EOF
diff --git a/tools/delete-feature-template.sh b/tools/delete-feature-template.sh
index 29484dd..5290c6c 100755
--- a/tools/delete-feature-template.sh
+++ b/tools/delete-feature-template.sh
@@ -24,8 +24,8 @@ feature_name="$2"
 
 dir="../$project_name/Data"
 
-rm -f $dir/Models/$feature_name.cs
-sed -i "/$feature_name/d" $dir/${project_name}Context.cs
+rm -f $dir/${project_name}.Data.Models/$feature_name.cs
+sed -i "/$feature_name/d" $dir/${project_name}.Data/${project_name}Context.cs
 
 # }}} =============================<
 
@@ -34,9 +34,9 @@ sed -i "/$feature_name/d" $dir/${project_name}Context.cs
 
 dir="../$project_name/Services"
 
-rm -f $dir/Configurations/Service${feature_name}Mappings.cs
-rm -rf $dir/Models/$feature_name
-rm -f $dir/${feature_name}Service.cs
+rm -f $dir/${project_name}.Services/Configurations/Service${feature_name}Mappings.cs
+rm -rf $dir/${project_name}.Services.Models/$feature_name
+rm -f $dir/${project_name}.Services/${feature_name}Service.cs
 
 # }}} =============================<
 
@@ -45,11 +45,11 @@ rm -f $dir/${feature_name}Service.cs
 
 dir="../$project_name/Web"
 
-rm -f $dir/Configurations/Controller${feature_name}Mappings.cs
-rm -f $dir/Controllers/${feature_name}Controller.cs
-rm -rf $dir/Models/$feature_name
-rm -rf $dir/Views/$feature_name
-sed -i "/$feature_name/d" $dir/Views/_ViewImports.cshtml
-sed -i "/$feature_name/d" $dir/Startup.cs
+rm -f $dir/${project_name}.Web/Configurations/Controller${feature_name}Mappings.cs
+rm -f $dir/${project_name}.Web/Controllers/${feature_name}Controller.cs
+rm -rf $dir/${project_name}.Web.Models/$feature_name
+rm -rf $dir/${project_name}.Web/Views/$feature_name
+sed -i "/$feature_name/d" $dir/${project_name}.Web/Views/_ViewImports.cshtml
+sed -i "/$feature_name/d" $dir/${project_name}.Web/Startup.cs
 
 # }}} =============================<
diff --git a/tools/rename-project.sh b/tools/rename-project.sh
index b0d6d0b..722650a 100755
--- a/tools/rename-project.sh
+++ b/tools/rename-project.sh
@@ -34,12 +34,14 @@ rename () {
 	done
 }
 
+mv ../$original_name ../$new_name
+
 # Rename all directories and then files
-rename $(find ../ -type d -name "*$original_name*")
-rename $(find ../ -type f -name "*$original_name*")
+rename $(find ../$new_name -type d -name "*$original_name*")
+rename $(find ../$new_name -type f -name "*$original_name*")
 
 # Rename all occurences inside files
-find ../ -type f -not -path "../tools/*" -not -path "../.git/*" -print0 | xargs -0 sed -i "s/$original_name/$new_name/g"
+find ../$new_name -type f -not -path "../tools/*" -not -path "../.git/*" -print0 | xargs -0 sed -i "s/$original_name/$new_name/g"
 
 # The database context is named TemplateContext by default
 # A third paramter should never be given, the second check is to prevent stack overflow