diff --git a/BuildingBlocks.sln b/BuildingBlocks.sln
index 90209b5..2c93c54 100644
--- a/BuildingBlocks.sln
+++ b/BuildingBlocks.sln
@@ -1,30 +1,30 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Presentation.API", "Presentation\BuildingBlock.Presentation.API\BuildingBlock.Presentation.API.csproj", "{0C2BE5AF-98DD-4E1D-A385-98E6B2D8A3A2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Presentation.API", "Presentations\BuildingBlock.Presentation.API\BuildingBlock.Presentation.API.csproj", "{0C2BE5AF-98DD-4E1D-A385-98E6B2D8A3A2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Core.Domain", "Core\BuildingBlock.Core.Domain\BuildingBlock.Core.Domain.csproj", "{7866A094-0503-49C6-A753-B2F2A9653B7F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Core.Application", "Core\BuildingBlock.Core.Application\BuildingBlock.Core.Application.csproj", "{05BF9C88-F881-464B-86B8-AA32A3011F4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.EntityFrameworkCore", "Infrastructure\BuildingBlock.Infrastructure.EntityFrameworkCore\BuildingBlock.Infrastructure.EntityFrameworkCore.csproj", "{5D33F792-F3DF-4426-8943-9B06D221F868}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.EntityFrameworkCore", "Infrastructures\BuildingBlock.Infrastructure.EntityFrameworkCore\BuildingBlock.Infrastructure.EntityFrameworkCore.csproj", "{5D33F792-F3DF-4426-8943-9B06D221F868}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Identity", "Infrastructure\BuildingBlock.Infrastructure.Identity\BuildingBlock.Infrastructure.Identity.csproj", "{6CCB9A29-182C-4709-BEB3-4A45971452FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Identity", "Infrastructures\BuildingBlock.Infrastructure.Identity\BuildingBlock.Infrastructure.Identity.csproj", "{6CCB9A29-182C-4709-BEB3-4A45971452FA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Mailkit", "Infrastructure\BuildingBlock.Infrastructure.Mailkit\BuildingBlock.Infrastructure.Mailkit.csproj", "{963AD3F0-304F-4336-9B54-7B8725B80077}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Mailkit", "Infrastructures\BuildingBlock.Infrastructure.Mailkit\BuildingBlock.Infrastructure.Mailkit.csproj", "{963AD3F0-304F-4336-9B54-7B8725B80077}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.RabbitMQ", "Infrastructure\BuildingBlock.Infrastructure.RabbitMQ\BuildingBlock.Infrastructure.RabbitMQ.csproj", "{4E1A0628-01F4-4876-B943-AC9FAFB19238}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.RabbitMQ", "Infrastructures\BuildingBlock.Infrastructure.RabbitMQ\BuildingBlock.Infrastructure.RabbitMQ.csproj", "{4E1A0628-01F4-4876-B943-AC9FAFB19238}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Redis", "Infrastructure\BuildingBlock.Infrastructure.Redis\BuildingBlock.Infrastructure.Redis.csproj", "{2667E7B6-8451-4842-9CC5-0663C8CAE5F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Redis", "Infrastructures\BuildingBlock.Infrastructure.Redis\BuildingBlock.Infrastructure.Redis.csproj", "{2667E7B6-8451-4842-9CC5-0663C8CAE5F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Serilog", "Infrastructure\BuildingBlock.Infrastructure.Serilog\BuildingBlock.Infrastructure.Serilog.csproj", "{C9891FE2-E5C6-4773-BCA0-919FDCC132D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Infrastructure.Serilog", "Infrastructures\BuildingBlock.Infrastructure.Serilog\BuildingBlock.Infrastructure.Serilog.csproj", "{C9891FE2-E5C6-4773-BCA0-919FDCC132D2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentation", "Presentation", "{37ABC0F6-39B9-4057-955A-BA2CFDB64811}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentations", "Presentations", "{37ABC0F6-39B9-4057-955A-BA2CFDB64811}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{CFE5A713-D9C3-4215-A706-331C955F8E79}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{9BFF2EA3-E081-4A2B-8297-A028DDD73E4A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructures", "Infrastructures", "{9BFF2EA3-E081-4A2B-8297-A028DDD73E4A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{DC3F11D0-5517-44CC-B4D8-D2FB6282B874}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlock.Test.UnitTest", "Tests\BuildingBlock.Test.UnitTest\BuildingBlock.Test.UnitTest.csproj", "{DC3F11D0-5517-44CC-B4D8-D2FB6282B874}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{06A00771-DEB6-4D06-A233-2B10B091295D}"
 EndProject
diff --git a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/BaseDbContext.cs b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/BaseDbContext.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/BaseDbContext.cs
rename to Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/BaseDbContext.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/BuildingBlock.Infrastructure.EntityFrameworkCore.csproj b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/BuildingBlock.Infrastructure.EntityFrameworkCore.csproj
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/BuildingBlock.Infrastructure.EntityFrameworkCore.csproj
rename to Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/BuildingBlock.Infrastructure.EntityFrameworkCore.csproj
diff --git a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/Extensions/DomainEventExtension.cs b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/Extensions/DomainEventExtension.cs
similarity index 90%
rename from Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/Extensions/DomainEventExtension.cs
rename to Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/Extensions/DomainEventExtension.cs
index 51ee0e1..54b7482 100644
--- a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/Extensions/DomainEventExtension.cs
+++ b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/Extensions/DomainEventExtension.cs
@@ -8,7 +8,8 @@ public static class DomainEventExtension
 {
     public static async Task DispatchDomainEventsAsync(this IMediator mediator, DbContext dbContext)
     {
-        var domainEntities = dbContext.ChangeTracker.Entries<AggregateRoot>().Where(x => x.Entity.DomainEvents.Count != 0)
+        var domainEntities = dbContext.ChangeTracker.Entries<AggregateRoot>()
+            .Where(x => x.Entity.DomainEvents.Count != 0)
             .ToList();
 
         var domainEvents = domainEntities.SelectMany(x => x.Entity.DomainEvents).ToList();
diff --git a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/OperationRepository.cs b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/OperationRepository.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/OperationRepository.cs
rename to Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/OperationRepository.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/ReadOnlyRepository.cs b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/ReadOnlyRepository.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/ReadOnlyRepository.cs
rename to Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/ReadOnlyRepository.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/UnitOfWork.cs b/Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/UnitOfWork.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.EntityFrameworkCore/UnitOfWork.cs
rename to Infrastructures/BuildingBlock.Infrastructure.EntityFrameworkCore/UnitOfWork.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Identity/BuildingBlock.Infrastructure.Identity.csproj b/Infrastructures/BuildingBlock.Infrastructure.Identity/BuildingBlock.Infrastructure.Identity.csproj
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Identity/BuildingBlock.Infrastructure.Identity.csproj
rename to Infrastructures/BuildingBlock.Infrastructure.Identity/BuildingBlock.Infrastructure.Identity.csproj
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Identity/Exceptions/IdentityException.cs b/Infrastructures/BuildingBlock.Infrastructure.Identity/Exceptions/IdentityException.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Identity/Exceptions/IdentityException.cs
rename to Infrastructures/BuildingBlock.Infrastructure.Identity/Exceptions/IdentityException.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Mailkit/BuildingBlock.Infrastructure.Mailkit.csproj b/Infrastructures/BuildingBlock.Infrastructure.Mailkit/BuildingBlock.Infrastructure.Mailkit.csproj
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Mailkit/BuildingBlock.Infrastructure.Mailkit.csproj
rename to Infrastructures/BuildingBlock.Infrastructure.Mailkit/BuildingBlock.Infrastructure.Mailkit.csproj
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Mailkit/MailkitEmailService.cs b/Infrastructures/BuildingBlock.Infrastructure.Mailkit/MailkitEmailService.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Mailkit/MailkitEmailService.cs
rename to Infrastructures/BuildingBlock.Infrastructure.Mailkit/MailkitEmailService.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/BuildingBlock.Infrastructure.RabbitMQ.csproj b/Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/BuildingBlock.Infrastructure.RabbitMQ.csproj
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/BuildingBlock.Infrastructure.RabbitMQ.csproj
rename to Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/BuildingBlock.Infrastructure.RabbitMQ.csproj
diff --git a/Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/EventBusRabbitMQ.cs b/Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/EventBusRabbitMQ.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/EventBusRabbitMQ.cs
rename to Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/EventBusRabbitMQ.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/IRabbitMQPersistentConnection.cs b/Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/IRabbitMQPersistentConnection.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/IRabbitMQPersistentConnection.cs
rename to Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/IRabbitMQPersistentConnection.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/RabbitMQPersistentConnection.cs b/Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/RabbitMQPersistentConnection.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.RabbitMQ/RabbitMQPersistentConnection.cs
rename to Infrastructures/BuildingBlock.Infrastructure.RabbitMQ/RabbitMQPersistentConnection.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Redis/BuildingBlock.Infrastructure.Redis.csproj b/Infrastructures/BuildingBlock.Infrastructure.Redis/BuildingBlock.Infrastructure.Redis.csproj
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Redis/BuildingBlock.Infrastructure.Redis.csproj
rename to Infrastructures/BuildingBlock.Infrastructure.Redis/BuildingBlock.Infrastructure.Redis.csproj
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Redis/RedisCacheService.cs b/Infrastructures/BuildingBlock.Infrastructure.Redis/RedisCacheService.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Redis/RedisCacheService.cs
rename to Infrastructures/BuildingBlock.Infrastructure.Redis/RedisCacheService.cs
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Serilog/BuildingBlock.Infrastructure.Serilog.csproj b/Infrastructures/BuildingBlock.Infrastructure.Serilog/BuildingBlock.Infrastructure.Serilog.csproj
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Serilog/BuildingBlock.Infrastructure.Serilog.csproj
rename to Infrastructures/BuildingBlock.Infrastructure.Serilog/BuildingBlock.Infrastructure.Serilog.csproj
diff --git a/Infrastructure/BuildingBlock.Infrastructure.Serilog/SerilogConfiguration.cs b/Infrastructures/BuildingBlock.Infrastructure.Serilog/SerilogConfiguration.cs
similarity index 100%
rename from Infrastructure/BuildingBlock.Infrastructure.Serilog/SerilogConfiguration.cs
rename to Infrastructures/BuildingBlock.Infrastructure.Serilog/SerilogConfiguration.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Authentication/CurrentUser.cs b/Presentations/BuildingBlock.Presentation.API/Authentication/CurrentUser.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Authentication/CurrentUser.cs
rename to Presentations/BuildingBlock.Presentation.API/Authentication/CurrentUser.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Authorization/PermissionPolicyProvider.cs b/Presentations/BuildingBlock.Presentation.API/Authorization/PermissionPolicyProvider.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Authorization/PermissionPolicyProvider.cs
rename to Presentations/BuildingBlock.Presentation.API/Authorization/PermissionPolicyProvider.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Authorization/PermissionRequirement.cs b/Presentations/BuildingBlock.Presentation.API/Authorization/PermissionRequirement.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Authorization/PermissionRequirement.cs
rename to Presentations/BuildingBlock.Presentation.API/Authorization/PermissionRequirement.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/BuildingBlock.Presentation.API.csproj b/Presentations/BuildingBlock.Presentation.API/BuildingBlock.Presentation.API.csproj
similarity index 53%
rename from Presentation/BuildingBlock.Presentation.API/BuildingBlock.Presentation.API.csproj
rename to Presentations/BuildingBlock.Presentation.API/BuildingBlock.Presentation.API.csproj
index 817e022..5305eec 100644
--- a/Presentation/BuildingBlock.Presentation.API/BuildingBlock.Presentation.API.csproj
+++ b/Presentations/BuildingBlock.Presentation.API/BuildingBlock.Presentation.API.csproj
@@ -19,12 +19,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Infrastructure\BuildingBlock.Infrastructure.Mailkit\BuildingBlock.Infrastructure.Mailkit.csproj"/>
-        <ProjectReference Include="..\..\Infrastructure\BuildingBlock.Infrastructure.Serilog\BuildingBlock.Infrastructure.Serilog.csproj"/>
-        <ProjectReference Include="..\..\Infrastructure\BuildingBlock.Infrastructure.EntityFrameworkCore\BuildingBlock.Infrastructure.EntityFrameworkCore.csproj"/>
-        <ProjectReference Include="..\..\Infrastructure\BuildingBlock.Infrastructure.RabbitMQ\BuildingBlock.Infrastructure.RabbitMQ.csproj"/>
-        <ProjectReference Include="..\..\Infrastructure\BuildingBlock.Infrastructure.Redis\BuildingBlock.Infrastructure.Redis.csproj"/>
-        <ProjectReference Include="..\..\Infrastructure\BuildingBlock.Infrastructure.Identity\BuildingBlock.Infrastructure.Identity.csproj"/>
+        <ProjectReference Include="..\..\Infrastructures\BuildingBlock.Infrastructure.EntityFrameworkCore\BuildingBlock.Infrastructure.EntityFrameworkCore.csproj"/>
+        <ProjectReference Include="..\..\Infrastructures\BuildingBlock.Infrastructure.Identity\BuildingBlock.Infrastructure.Identity.csproj"/>
+        <ProjectReference Include="..\..\Infrastructures\BuildingBlock.Infrastructure.Mailkit\BuildingBlock.Infrastructure.Mailkit.csproj"/>
+        <ProjectReference Include="..\..\Infrastructures\BuildingBlock.Infrastructure.RabbitMQ\BuildingBlock.Infrastructure.RabbitMQ.csproj"/>
+        <ProjectReference Include="..\..\Infrastructures\BuildingBlock.Infrastructure.Redis\BuildingBlock.Infrastructure.Redis.csproj"/>
+        <ProjectReference Include="..\..\Infrastructures\BuildingBlock.Infrastructure.Serilog\BuildingBlock.Infrastructure.Serilog.csproj"/>
     </ItemGroup>
 
 
diff --git a/Presentation/BuildingBlock.Presentation.API/Configurations/DatabaseConfiguration.cs b/Presentations/BuildingBlock.Presentation.API/Configurations/DatabaseConfiguration.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Configurations/DatabaseConfiguration.cs
rename to Presentations/BuildingBlock.Presentation.API/Configurations/DatabaseConfiguration.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Configurations/EventBusConfiguration.cs b/Presentations/BuildingBlock.Presentation.API/Configurations/EventBusConfiguration.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Configurations/EventBusConfiguration.cs
rename to Presentations/BuildingBlock.Presentation.API/Configurations/EventBusConfiguration.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/AuthExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/AuthExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/AuthExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/AuthExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/CacheExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/CacheExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/CacheExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/CacheExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/CorsExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/CorsExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/CorsExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/CorsExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/CqrsExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/CqrsExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/CqrsExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/CqrsExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/DatabaseExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/DatabaseExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/DatabaseExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/DatabaseExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/DefaultExtensions.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/DefaultExtensions.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/DefaultExtensions.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/DefaultExtensions.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/DefaultOpenApiExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/DefaultOpenApiExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/DefaultOpenApiExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/DefaultOpenApiExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/DependencyInjection.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/DependencyInjection.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/DependencyInjection.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/DependencyInjection.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/EmailExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/EmailExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/EmailExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/EmailExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/EventBusExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/EventBusExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/EventBusExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/EventBusExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/MapperExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/MapperExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/MapperExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/MapperExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Extensions/ModuleExtension.cs b/Presentations/BuildingBlock.Presentation.API/Extensions/ModuleExtension.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Extensions/ModuleExtension.cs
rename to Presentations/BuildingBlock.Presentation.API/Extensions/ModuleExtension.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Hosts/DefaultHosts.cs b/Presentations/BuildingBlock.Presentation.API/Hosts/DefaultHosts.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Hosts/DefaultHosts.cs
rename to Presentations/BuildingBlock.Presentation.API/Hosts/DefaultHosts.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Hosts/LoggerHost.cs b/Presentations/BuildingBlock.Presentation.API/Hosts/LoggerHost.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Hosts/LoggerHost.cs
rename to Presentations/BuildingBlock.Presentation.API/Hosts/LoggerHost.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Middlewares/DefaultMiddlewares.cs b/Presentations/BuildingBlock.Presentation.API/Middlewares/DefaultMiddlewares.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Middlewares/DefaultMiddlewares.cs
rename to Presentations/BuildingBlock.Presentation.API/Middlewares/DefaultMiddlewares.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Middlewares/EventBusMiddleware.cs b/Presentations/BuildingBlock.Presentation.API/Middlewares/EventBusMiddleware.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Middlewares/EventBusMiddleware.cs
rename to Presentations/BuildingBlock.Presentation.API/Middlewares/EventBusMiddleware.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Middlewares/ExceptionHandler.cs b/Presentations/BuildingBlock.Presentation.API/Middlewares/ExceptionHandler.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Middlewares/ExceptionHandler.cs
rename to Presentations/BuildingBlock.Presentation.API/Middlewares/ExceptionHandler.cs
diff --git a/Presentation/BuildingBlock.Presentation.API/Middlewares/SeedDataMiddleware.cs b/Presentations/BuildingBlock.Presentation.API/Middlewares/SeedDataMiddleware.cs
similarity index 100%
rename from Presentation/BuildingBlock.Presentation.API/Middlewares/SeedDataMiddleware.cs
rename to Presentations/BuildingBlock.Presentation.API/Middlewares/SeedDataMiddleware.cs
diff --git a/Tests/Tests.csproj b/Tests/BuildingBlock.Test.UnitTest/BuildingBlock.Test.UnitTest.csproj
similarity index 74%
rename from Tests/Tests.csproj
rename to Tests/BuildingBlock.Test.UnitTest/BuildingBlock.Test.UnitTest.csproj
index 3a84762..ddb6501 100644
--- a/Tests/Tests.csproj
+++ b/Tests/BuildingBlock.Test.UnitTest/BuildingBlock.Test.UnitTest.csproj
@@ -7,13 +7,14 @@
 
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <RootNamespace>Tests</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="6.0.0"/>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="Moq" Version="4.20.70" />
+        <PackageReference Include="Moq" Version="4.20.70"/>
         <PackageReference Include="xunit" Version="2.5.3"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
     </ItemGroup>
@@ -23,11 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="Presentation\" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Presentation\BuildingBlock.Presentation.API\BuildingBlock.Presentation.API.csproj" />
+        <ProjectReference Include="..\..\Presentations\BuildingBlock.Presentation.API\BuildingBlock.Presentation.API.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/Tests/Core/Domain/BaseEntityTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/BaseEntityTest.cs
similarity index 100%
rename from Tests/Core/Domain/BaseEntityTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/BaseEntityTest.cs
diff --git a/Tests/Core/Domain/Constants/CacheKeyRegistryTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Constants/CacheKeyRegistryTest.cs
similarity index 100%
rename from Tests/Core/Domain/Constants/CacheKeyRegistryTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Constants/CacheKeyRegistryTest.cs
diff --git a/Tests/Core/Domain/Rules/EmailAddressMustFollowPatternTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Rules/EmailAddressMustFollowPatternTest.cs
similarity index 100%
rename from Tests/Core/Domain/Rules/EmailAddressMustFollowPatternTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Rules/EmailAddressMustFollowPatternTest.cs
diff --git a/Tests/Core/Domain/Rules/StringCanNotBeEmptyOrWhiteSpaceRuleTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Rules/StringCanNotBeEmptyOrWhiteSpaceRuleTest.cs
similarity index 100%
rename from Tests/Core/Domain/Rules/StringCanNotBeEmptyOrWhiteSpaceRuleTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Rules/StringCanNotBeEmptyOrWhiteSpaceRuleTest.cs
diff --git a/Tests/Core/Domain/Shared/Utils/ConfigurationUtilitiesTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Shared/Utils/ConfigurationUtilitiesTest.cs
similarity index 100%
rename from Tests/Core/Domain/Shared/Utils/ConfigurationUtilitiesTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Shared/Utils/ConfigurationUtilitiesTest.cs
diff --git a/Tests/Core/Domain/Shared/Utils/EntityHelperTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Shared/Utils/EntityHelperTest.cs
similarity index 100%
rename from Tests/Core/Domain/Shared/Utils/EntityHelperTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Shared/Utils/EntityHelperTest.cs
diff --git a/Tests/Core/Domain/Shared/Utils/OptionalTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Shared/Utils/OptionalTest.cs
similarity index 100%
rename from Tests/Core/Domain/Shared/Utils/OptionalTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Shared/Utils/OptionalTest.cs
diff --git a/Tests/Core/Domain/Specifications/Abstractions/AndSpecificationTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Abstractions/AndSpecificationTest.cs
similarity index 100%
rename from Tests/Core/Domain/Specifications/Abstractions/AndSpecificationTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Abstractions/AndSpecificationTest.cs
diff --git a/Tests/Core/Domain/Specifications/Abstractions/OrSpecificationTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Abstractions/OrSpecificationTest.cs
similarity index 100%
rename from Tests/Core/Domain/Specifications/Abstractions/OrSpecificationTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Abstractions/OrSpecificationTest.cs
diff --git a/Tests/Core/Domain/Specifications/Implementations/EntityIdNotEqualSpecificationTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Implementations/EntityIdNotEqualSpecificationTest.cs
similarity index 100%
rename from Tests/Core/Domain/Specifications/Implementations/EntityIdNotEqualSpecificationTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Implementations/EntityIdNotEqualSpecificationTest.cs
diff --git a/Tests/Core/Domain/Specifications/Implementations/EntityIdSpecificationTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Implementations/EntityIdSpecificationTest.cs
similarity index 100%
rename from Tests/Core/Domain/Specifications/Implementations/EntityIdSpecificationTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/Implementations/EntityIdSpecificationTest.cs
diff --git a/Tests/Core/Domain/Specifications/TestSpecification.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/TestSpecification.cs
similarity index 100%
rename from Tests/Core/Domain/Specifications/TestSpecification.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/Specifications/TestSpecification.cs
diff --git a/Tests/Core/Domain/TestDomainEvent.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/TestDomainEvent.cs
similarity index 100%
rename from Tests/Core/Domain/TestDomainEvent.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/TestDomainEvent.cs
diff --git a/Tests/Core/Domain/TestEntity.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/TestEntity.cs
similarity index 100%
rename from Tests/Core/Domain/TestEntity.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/TestEntity.cs
diff --git a/Tests/Core/Domain/ValueObjects/Abstractions/ValueObjectTest.cs b/Tests/BuildingBlock.Test.UnitTest/Core/Domain/ValueObjects/Abstractions/ValueObjectTest.cs
similarity index 100%
rename from Tests/Core/Domain/ValueObjects/Abstractions/ValueObjectTest.cs
rename to Tests/BuildingBlock.Test.UnitTest/Core/Domain/ValueObjects/Abstractions/ValueObjectTest.cs