diff --git a/src/Pandatech.CleanArchitecture.Api/Endpoints/SharedEndpoints/OptionalEndpoints.cs b/src/Pandatech.CleanArchitecture.Api/Endpoints/SharedEndpoints/OptionalEndpoints.cs
index 4d3da3d..072b3a9 100644
--- a/src/Pandatech.CleanArchitecture.Api/Endpoints/SharedEndpoints/OptionalEndpoints.cs
+++ b/src/Pandatech.CleanArchitecture.Api/Endpoints/SharedEndpoints/OptionalEndpoints.cs
@@ -2,6 +2,7 @@
 using Pandatech.CleanArchitecture.Api.Helpers;
 using Pandatech.CleanArchitecture.Core.Extensions;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 using PandaVaultClient;
 
 namespace Pandatech.CleanArchitecture.Api.Endpoints.SharedEndpoints;
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Context/EntityConfigurations/UserEntityConfiguration.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Contexts/EntityConfigurations/UserEntityConfiguration.cs
similarity index 100%
rename from src/Pandatech.CleanArchitecture.Infrastructure/Context/EntityConfigurations/UserEntityConfiguration.cs
rename to src/Pandatech.CleanArchitecture.Infrastructure/Contexts/EntityConfigurations/UserEntityConfiguration.cs
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Context/EntityConfigurations/UserTokenEntityConfiguration.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Contexts/EntityConfigurations/UserTokenEntityConfiguration.cs
similarity index 100%
rename from src/Pandatech.CleanArchitecture.Infrastructure/Context/EntityConfigurations/UserTokenEntityConfiguration.cs
rename to src/Pandatech.CleanArchitecture.Infrastructure/Contexts/EntityConfigurations/UserTokenEntityConfiguration.cs
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Context/PostgresContext.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Contexts/PostgresContext.cs
similarity index 84%
rename from src/Pandatech.CleanArchitecture.Infrastructure/Context/PostgresContext.cs
rename to src/Pandatech.CleanArchitecture.Infrastructure/Contexts/PostgresContext.cs
index b022bff..899b0d2 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Context/PostgresContext.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Contexts/PostgresContext.cs
@@ -3,9 +3,9 @@
 using Pandatech.CleanArchitecture.Core.Entities;
 using PandaTech.IEnumerableFilters.PostgresContext;
 
-namespace Pandatech.CleanArchitecture.Infrastructure.Context;
+namespace Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
-//hint for migration: dotnet ef migrations add --project src\Pandatech.CleanArchitecture.Infrastructure\Pandatech.CleanArchitecture.Infrastructure.csproj --context Pandatech.CleanArchitecture.Infrastructure.Context.PostgresContext --configuration Debug --output-dir ./Migrations
+//hint for migration: dotnet ef migrations add --project src\Pandatech.CleanArchitecture.Infrastructure\Pandatech.CleanArchitecture.Infrastructure.csproj --context Pandatech.CleanArchitecture.Infrastructure.Contexts.PostgresContext --configuration Debug --output-dir ./Migrations
 public class PostgresContext(DbContextOptions<PostgresContext> options) : PostgresDbContext(options)
 {
    public DbSet<UserTokenEntity> UserTokens { get; set; } = null!;
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Context/PostgresContextFactory.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Contexts/PostgresContextFactory.cs
similarity index 89%
rename from src/Pandatech.CleanArchitecture.Infrastructure/Context/PostgresContextFactory.cs
rename to src/Pandatech.CleanArchitecture.Infrastructure/Contexts/PostgresContextFactory.cs
index a684e6d..75490e3 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Context/PostgresContextFactory.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Contexts/PostgresContextFactory.cs
@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Context;
 
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/DatabaseExtensions.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/DatabaseExtensions.cs
index 243ac14..a1cf8ec 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/DatabaseExtensions.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/DatabaseExtensions.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Extensions;
 
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320132329_Init.Designer.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320190043_Init.Designer.cs
similarity index 99%
rename from src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320132329_Init.Designer.cs
rename to src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320190043_Init.Designer.cs
index 7375872..0b191ea 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320132329_Init.Designer.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320190043_Init.Designer.cs
@@ -5,14 +5,14 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 #nullable disable
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Migrations
 {
     [DbContext(typeof(PostgresContext))]
-    [Migration("20240320132329_Init")]
+    [Migration("20240320190043_Init")]
     partial class Init
     {
         /// <inheritdoc />
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320132329_Init.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320190043_Init.cs
similarity index 100%
rename from src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320132329_Init.cs
rename to src/Pandatech.CleanArchitecture.Infrastructure/Migrations/20240320190043_Init.cs
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/PostgresContextModelSnapshot.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/PostgresContextModelSnapshot.cs
index c076564..b85f55b 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/PostgresContextModelSnapshot.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Migrations/PostgresContextModelSnapshot.cs
@@ -4,7 +4,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 #nullable disable
 
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/BaseRepository.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/BaseRepository.cs
index 49a9f49..c26f1ae 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/BaseRepository.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/BaseRepository.cs
@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using Pandatech.CleanArchitecture.Core.Interfaces.Repositories;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 using PandaTech.IEnumerableFilters;
 using PandaTech.IEnumerableFilters.Dto;
 using PandaTech.IEnumerableFilters.Extensions;
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserRepository.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserRepository.cs
index ea44471..1fbce76 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserRepository.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserRepository.cs
@@ -2,6 +2,7 @@
 using Pandatech.CleanArchitecture.Core.Entities;
 using Pandatech.CleanArchitecture.Core.Interfaces.Repositories.EntityRepositories;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Repositories.EntityRepositories;
 
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserTokenRepository.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserTokenRepository.cs
index 4599e2f..dd7a9f0 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserTokenRepository.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/EntityRepositories/UserTokenRepository.cs
@@ -2,6 +2,7 @@
 using Pandatech.CleanArchitecture.Core.Entities;
 using Pandatech.CleanArchitecture.Core.Interfaces.Repositories.EntityRepositories;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Repositories.EntityRepositories;
 
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/UnitOfWork.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/UnitOfWork.cs
index c687c74..0603289 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/UnitOfWork.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Repositories/UnitOfWork.cs
@@ -2,6 +2,7 @@
 using Pandatech.CleanArchitecture.Core.Interfaces.Repositories;
 using Pandatech.CleanArchitecture.Core.Interfaces.Repositories.EntityRepositories;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Repositories;
 
diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Seed/User/SystemUser.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Seed/User/SystemUser.cs
index f90f756..32b229f 100644
--- a/src/Pandatech.CleanArchitecture.Infrastructure/Seed/User/SystemUser.cs
+++ b/src/Pandatech.CleanArchitecture.Infrastructure/Seed/User/SystemUser.cs
@@ -5,6 +5,7 @@
 using Pandatech.CleanArchitecture.Core.Entities;
 using Pandatech.CleanArchitecture.Core.Enums;
 using Pandatech.CleanArchitecture.Infrastructure.Context;
+using Pandatech.CleanArchitecture.Infrastructure.Contexts;
 using Pandatech.Crypto;
 
 namespace Pandatech.CleanArchitecture.Infrastructure.Seed.User;