diff --git a/CleanAspCore.Api.Tests/Fakers/CreateDepartmentRequestFaker.cs b/CleanAspCore.Api.Tests/Fakers/CreateDepartmentRequestFaker.cs
index dfc37ab..cecdbbd 100644
--- a/CleanAspCore.Api.Tests/Fakers/CreateDepartmentRequestFaker.cs
+++ b/CleanAspCore.Api.Tests/Fakers/CreateDepartmentRequestFaker.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using CleanAspCore.Features.Departments.Endpoints;
+using CleanAspCore.Endpoints.Departments;
 
 namespace CleanAspCore.Api.Tests.Fakers;
 
diff --git a/CleanAspCore.Api.Tests/Fakers/CreateEmployeeRequestFaker.cs b/CleanAspCore.Api.Tests/Fakers/CreateEmployeeRequestFaker.cs
index 111aa6a..fe8fc57 100644
--- a/CleanAspCore.Api.Tests/Fakers/CreateEmployeeRequestFaker.cs
+++ b/CleanAspCore.Api.Tests/Fakers/CreateEmployeeRequestFaker.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using CleanAspCore.Features.Employees.Endpoints;
+using CleanAspCore.Endpoints.Employees;
 
 namespace CleanAspCore.Api.Tests.Fakers;
 
diff --git a/CleanAspCore.Api.Tests/Fakers/CreateJobRequestFaker.cs b/CleanAspCore.Api.Tests/Fakers/CreateJobRequestFaker.cs
index c72708c..df3cd12 100644
--- a/CleanAspCore.Api.Tests/Fakers/CreateJobRequestFaker.cs
+++ b/CleanAspCore.Api.Tests/Fakers/CreateJobRequestFaker.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using CleanAspCore.Features.Jobs.Endpoints;
+using CleanAspCore.Endpoints.Jobs;
 
 namespace CleanAspCore.Api.Tests.Fakers;
 
diff --git a/CleanAspCore.Api.Tests/Fakers/DepartmentFaker.cs b/CleanAspCore.Api.Tests/Fakers/DepartmentFaker.cs
index 5fa2239..79322da 100644
--- a/CleanAspCore.Api.Tests/Fakers/DepartmentFaker.cs
+++ b/CleanAspCore.Api.Tests/Fakers/DepartmentFaker.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using CleanAspCore.Data.Features.Departments;
+using CleanAspCore.Data.Models.Departments;
 
 namespace CleanAspCore.Api.Tests.Fakers;
 
diff --git a/CleanAspCore.Api.Tests/Fakers/EmployeeFaker.cs b/CleanAspCore.Api.Tests/Fakers/EmployeeFaker.cs
index 23c81a5..f47674a 100644
--- a/CleanAspCore.Api.Tests/Fakers/EmployeeFaker.cs
+++ b/CleanAspCore.Api.Tests/Fakers/EmployeeFaker.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using CleanAspCore.Data.Features.Employees;
+using CleanAspCore.Data.Models.Employees;
 using CleanAspCore.Domain;
 
 namespace CleanAspCore.Api.Tests.Fakers;
diff --git a/CleanAspCore.Api.Tests/Fakers/JobFaker.cs b/CleanAspCore.Api.Tests/Fakers/JobFaker.cs
index 474e8ba..e0daf54 100644
--- a/CleanAspCore.Api.Tests/Fakers/JobFaker.cs
+++ b/CleanAspCore.Api.Tests/Fakers/JobFaker.cs
@@ -1,5 +1,5 @@
 using Bogus;
-using CleanAspCore.Data.Features.Jobs;
+using CleanAspCore.Data.Models.Jobs;
 
 namespace CleanAspCore.Api.Tests.Fakers;
 
diff --git a/CleanAspCore.Api.Tests/Features/Departments/IDepartmentApiClient.cs b/CleanAspCore.Api.Tests/Features/Departments/IDepartmentApiClient.cs
index 12cb990..90a86de 100644
--- a/CleanAspCore.Api.Tests/Features/Departments/IDepartmentApiClient.cs
+++ b/CleanAspCore.Api.Tests/Features/Departments/IDepartmentApiClient.cs
@@ -1,4 +1,4 @@
-using CleanAspCore.Features.Departments.Endpoints;
+using CleanAspCore.Endpoints.Departments;
 using Refit;
 
 namespace CleanAspCore.Api.Tests.Features.Departments;
diff --git a/CleanAspCore.Api.Tests/Features/Employees/CreateEmployeeTests.cs b/CleanAspCore.Api.Tests/Features/Employees/CreateEmployeeTests.cs
index 6997f15..06a3593 100644
--- a/CleanAspCore.Api.Tests/Features/Employees/CreateEmployeeTests.cs
+++ b/CleanAspCore.Api.Tests/Features/Employees/CreateEmployeeTests.cs
@@ -1,5 +1,5 @@
 using CleanAspCore.Api.Tests.Fakers;
-using CleanAspCore.Features.Employees.Endpoints;
+using CleanAspCore.Endpoints.Employees;
 
 namespace CleanAspCore.Api.Tests.Features.Employees;
 
diff --git a/CleanAspCore.Api.Tests/Features/Employees/IEmployeeApiClient.cs b/CleanAspCore.Api.Tests/Features/Employees/IEmployeeApiClient.cs
index f0694a3..be3c6ad 100644
--- a/CleanAspCore.Api.Tests/Features/Employees/IEmployeeApiClient.cs
+++ b/CleanAspCore.Api.Tests/Features/Employees/IEmployeeApiClient.cs
@@ -1,4 +1,4 @@
-using CleanAspCore.Features.Employees.Endpoints;
+using CleanAspCore.Endpoints.Employees;
 using Refit;
 
 namespace CleanAspCore.Api.Tests.Features.Employees;
diff --git a/CleanAspCore.Api.Tests/Features/Employees/UpdateEmployeeByIdTests.cs b/CleanAspCore.Api.Tests/Features/Employees/UpdateEmployeeByIdTests.cs
index 540b00d..f8e082b 100644
--- a/CleanAspCore.Api.Tests/Features/Employees/UpdateEmployeeByIdTests.cs
+++ b/CleanAspCore.Api.Tests/Features/Employees/UpdateEmployeeByIdTests.cs
@@ -1,5 +1,5 @@
 using CleanAspCore.Api.Tests.Fakers;
-using CleanAspCore.Features.Employees.Endpoints;
+using CleanAspCore.Endpoints.Employees;
 
 namespace CleanAspCore.Api.Tests.Features.Employees;
 
diff --git a/CleanAspCore.Api.Tests/Features/Jobs/IJobApiClient.cs b/CleanAspCore.Api.Tests/Features/Jobs/IJobApiClient.cs
index e53f88a..df37e67 100644
--- a/CleanAspCore.Api.Tests/Features/Jobs/IJobApiClient.cs
+++ b/CleanAspCore.Api.Tests/Features/Jobs/IJobApiClient.cs
@@ -1,4 +1,4 @@
-using CleanAspCore.Features.Jobs.Endpoints;
+using CleanAspCore.Endpoints.Jobs;
 using Refit;
 
 namespace CleanAspCore.Api.Tests.Features.Jobs;
diff --git a/CleanAspCore/CleanAspCore.csproj b/CleanAspCore/CleanAspCore.csproj
index d414863..e3e07e3 100644
--- a/CleanAspCore/CleanAspCore.csproj
+++ b/CleanAspCore/CleanAspCore.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Data\Features\" />
+    <Folder Include="Data\Models\" />
   </ItemGroup>
 
 </Project>
diff --git a/CleanAspCore/Data/HrContext.cs b/CleanAspCore/Data/HrContext.cs
index f799195..4216c18 100644
--- a/CleanAspCore/Data/HrContext.cs
+++ b/CleanAspCore/Data/HrContext.cs
@@ -1,6 +1,6 @@
-using CleanAspCore.Data.Features.Departments;
-using CleanAspCore.Data.Features.Employees;
-using CleanAspCore.Data.Features.Jobs;
+using CleanAspCore.Data.Models.Departments;
+using CleanAspCore.Data.Models.Employees;
+using CleanAspCore.Data.Models.Jobs;
 using Microsoft.EntityFrameworkCore;
 
 namespace CleanAspCore.Data;
diff --git a/CleanAspCore/Data/Features/Departments/Department.cs b/CleanAspCore/Data/Models/Departments/Department.cs
similarity index 76%
rename from CleanAspCore/Data/Features/Departments/Department.cs
rename to CleanAspCore/Data/Models/Departments/Department.cs
index 0d2aa9c..766946e 100644
--- a/CleanAspCore/Data/Features/Departments/Department.cs
+++ b/CleanAspCore/Data/Models/Departments/Department.cs
@@ -1,4 +1,4 @@
-namespace CleanAspCore.Data.Features.Departments;
+namespace CleanAspCore.Data.Models.Departments;
 
 public class Department : IEntity
 {
diff --git a/CleanAspCore/Data/Features/Employees/Employee.cs b/CleanAspCore/Data/Models/Employees/Employee.cs
similarity index 77%
rename from CleanAspCore/Data/Features/Employees/Employee.cs
rename to CleanAspCore/Data/Models/Employees/Employee.cs
index 2af1d40..19924a0 100644
--- a/CleanAspCore/Data/Features/Employees/Employee.cs
+++ b/CleanAspCore/Data/Models/Employees/Employee.cs
@@ -1,7 +1,7 @@
-using CleanAspCore.Data.Features.Departments;
-using CleanAspCore.Data.Features.Jobs;
+using CleanAspCore.Data.Models.Departments;
+using CleanAspCore.Data.Models.Jobs;
 
-namespace CleanAspCore.Data.Features.Employees;
+namespace CleanAspCore.Data.Models.Employees;
 
 public class Employee : IEntity
 {
diff --git a/CleanAspCore/Data/Features/Employees/EmployeeConfiguration.cs b/CleanAspCore/Data/Models/Employees/EmployeeConfiguration.cs
similarity index 69%
rename from CleanAspCore/Data/Features/Employees/EmployeeConfiguration.cs
rename to CleanAspCore/Data/Models/Employees/EmployeeConfiguration.cs
index 5f0dafa..4702f5e 100644
--- a/CleanAspCore/Data/Features/Employees/EmployeeConfiguration.cs
+++ b/CleanAspCore/Data/Models/Employees/EmployeeConfiguration.cs
@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace CleanAspCore.Data.Features.Employees;
+namespace CleanAspCore.Data.Models.Employees;
 
-public class EmployeeConfiguration : IEntityTypeConfiguration<Employee>
+internal sealed class EmployeeConfiguration : IEntityTypeConfiguration<Employee>
 {
     public void Configure(EntityTypeBuilder<Employee> builder)
     {
diff --git a/CleanAspCore/Data/Features/Jobs/Job.cs b/CleanAspCore/Data/Models/Jobs/Job.cs
similarity index 72%
rename from CleanAspCore/Data/Features/Jobs/Job.cs
rename to CleanAspCore/Data/Models/Jobs/Job.cs
index aeb36dc..e0ea38f 100644
--- a/CleanAspCore/Data/Features/Jobs/Job.cs
+++ b/CleanAspCore/Data/Models/Jobs/Job.cs
@@ -1,4 +1,4 @@
-namespace CleanAspCore.Data.Features.Jobs;
+namespace CleanAspCore.Data.Models.Jobs;
 
 public class Job : IEntity
 {
diff --git a/CleanAspCore/Features/Departments/Endpoints/AddDepartments.cs b/CleanAspCore/Endpoints/Departments/AddDepartments.cs
similarity index 93%
rename from CleanAspCore/Features/Departments/Endpoints/AddDepartments.cs
rename to CleanAspCore/Endpoints/Departments/AddDepartments.cs
index 1498000..eabf75b 100644
--- a/CleanAspCore/Features/Departments/Endpoints/AddDepartments.cs
+++ b/CleanAspCore/Endpoints/Departments/AddDepartments.cs
@@ -1,9 +1,9 @@
 using CleanAspCore.Data;
-using CleanAspCore.Data.Features.Departments;
+using CleanAspCore.Data.Models.Departments;
 using CleanAspCore.Extensions.FluentValidation;
 using Microsoft.AspNetCore.Http.HttpResults;
 
-namespace CleanAspCore.Features.Departments.Endpoints;
+namespace CleanAspCore.Endpoints.Departments;
 
 /// <summary>
 /// A request to create a new department.
diff --git a/CleanAspCore/Features/Departments/Endpoints/GetDepartmentById.cs b/CleanAspCore/Endpoints/Departments/GetDepartmentById.cs
similarity index 92%
rename from CleanAspCore/Features/Departments/Endpoints/GetDepartmentById.cs
rename to CleanAspCore/Endpoints/Departments/GetDepartmentById.cs
index 16ae33f..43d5e54 100644
--- a/CleanAspCore/Features/Departments/Endpoints/GetDepartmentById.cs
+++ b/CleanAspCore/Endpoints/Departments/GetDepartmentById.cs
@@ -1,9 +1,9 @@
 using CleanAspCore.Data;
-using CleanAspCore.Data.Features.Departments;
+using CleanAspCore.Data.Models.Departments;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.EntityFrameworkCore;
 
-namespace CleanAspCore.Features.Departments.Endpoints;
+namespace CleanAspCore.Endpoints.Departments;
 
 /// <summary>
 /// The get department response.
diff --git a/CleanAspCore/Features/Departments/Routes.cs b/CleanAspCore/Endpoints/Departments/Routes.cs
similarity index 79%
rename from CleanAspCore/Features/Departments/Routes.cs
rename to CleanAspCore/Endpoints/Departments/Routes.cs
index 67d2429..0290193 100644
--- a/CleanAspCore/Features/Departments/Routes.cs
+++ b/CleanAspCore/Endpoints/Departments/Routes.cs
@@ -1,7 +1,6 @@
-using CleanAspCore.Features.Departments.Endpoints;
-using CleanAspCore.Utils;
+using CleanAspCore.Utils;
 
-namespace CleanAspCore.Features.Departments;
+namespace CleanAspCore.Endpoints.Departments;
 
 internal static class Routes
 {
diff --git a/CleanAspCore/Features/Employees/Endpoints/AddEmployee.cs b/CleanAspCore/Endpoints/Employees/AddEmployee.cs
similarity index 96%
rename from CleanAspCore/Features/Employees/Endpoints/AddEmployee.cs
rename to CleanAspCore/Endpoints/Employees/AddEmployee.cs
index 710ec8a..a13c778 100644
--- a/CleanAspCore/Features/Employees/Endpoints/AddEmployee.cs
+++ b/CleanAspCore/Endpoints/Employees/AddEmployee.cs
@@ -1,9 +1,9 @@
 using CleanAspCore.Data;
-using CleanAspCore.Data.Features.Employees;
+using CleanAspCore.Data.Models.Employees;
 using CleanAspCore.Extensions.FluentValidation;
 using Microsoft.AspNetCore.Http.HttpResults;
 
-namespace CleanAspCore.Features.Employees.Endpoints;
+namespace CleanAspCore.Endpoints.Employees;
 
 /// <summary>
 /// A request to create a new employee.
diff --git a/CleanAspCore/Features/Employees/Endpoints/DeleteEmployeeById.cs b/CleanAspCore/Endpoints/Employees/DeleteEmployeeById.cs
similarity index 91%
rename from CleanAspCore/Features/Employees/Endpoints/DeleteEmployeeById.cs
rename to CleanAspCore/Endpoints/Employees/DeleteEmployeeById.cs
index a1f127c..2b3ef43 100644
--- a/CleanAspCore/Features/Employees/Endpoints/DeleteEmployeeById.cs
+++ b/CleanAspCore/Endpoints/Employees/DeleteEmployeeById.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.EntityFrameworkCore;
 
-namespace CleanAspCore.Features.Employees.Endpoints;
+namespace CleanAspCore.Endpoints.Employees;
 
 internal static class DeleteEmployeeById
 {
diff --git a/CleanAspCore/Features/Employees/Endpoints/GetEmployeeById.cs b/CleanAspCore/Endpoints/Employees/GetEmployeeById.cs
similarity index 95%
rename from CleanAspCore/Features/Employees/Endpoints/GetEmployeeById.cs
rename to CleanAspCore/Endpoints/Employees/GetEmployeeById.cs
index 674b2c8..0ecef22 100644
--- a/CleanAspCore/Features/Employees/Endpoints/GetEmployeeById.cs
+++ b/CleanAspCore/Endpoints/Employees/GetEmployeeById.cs
@@ -1,9 +1,9 @@
 using CleanAspCore.Data;
-using CleanAspCore.Data.Features.Employees;
+using CleanAspCore.Data.Models.Employees;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.EntityFrameworkCore;
 
-namespace CleanAspCore.Features.Employees.Endpoints;
+namespace CleanAspCore.Endpoints.Employees;
 
 /// <summary>
 /// The get employee response.
diff --git a/CleanAspCore/Features/Employees/Routes.cs b/CleanAspCore/Endpoints/Employees/Routes.cs
similarity index 84%
rename from CleanAspCore/Features/Employees/Routes.cs
rename to CleanAspCore/Endpoints/Employees/Routes.cs
index a43537e..a1725e6 100644
--- a/CleanAspCore/Features/Employees/Routes.cs
+++ b/CleanAspCore/Endpoints/Employees/Routes.cs
@@ -1,7 +1,6 @@
-using CleanAspCore.Features.Employees.Endpoints;
-using CleanAspCore.Utils;
+using CleanAspCore.Utils;
 
-namespace CleanAspCore.Features.Employees;
+namespace CleanAspCore.Endpoints.Employees;
 
 internal static class Routes
 {
diff --git a/CleanAspCore/Features/Employees/Endpoints/UpdateEmployeeById.cs b/CleanAspCore/Endpoints/Employees/UpdateEmployeeById.cs
similarity index 96%
rename from CleanAspCore/Features/Employees/Endpoints/UpdateEmployeeById.cs
rename to CleanAspCore/Endpoints/Employees/UpdateEmployeeById.cs
index c94947f..67497d1 100644
--- a/CleanAspCore/Features/Employees/Endpoints/UpdateEmployeeById.cs
+++ b/CleanAspCore/Endpoints/Employees/UpdateEmployeeById.cs
@@ -1,12 +1,12 @@
 using CleanAspCore.Data;
 using CleanAspCore.Data.Extensions;
-using CleanAspCore.Data.Features.Employees;
+using CleanAspCore.Data.Models.Employees;
 using CleanAspCore.Extensions.FluentValidation;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.EntityFrameworkCore;
 using NotFound = Microsoft.AspNetCore.Http.HttpResults.NotFound;
 
-namespace CleanAspCore.Features.Employees.Endpoints;
+namespace CleanAspCore.Endpoints.Employees;
 
 /// <summary>
 /// A request to update a employee.
diff --git a/CleanAspCore/Features/Jobs/Endpoints/AddJobs.cs b/CleanAspCore/Endpoints/Jobs/AddJobs.cs
similarity index 92%
rename from CleanAspCore/Features/Jobs/Endpoints/AddJobs.cs
rename to CleanAspCore/Endpoints/Jobs/AddJobs.cs
index 1ab5d6f..cd2992f 100644
--- a/CleanAspCore/Features/Jobs/Endpoints/AddJobs.cs
+++ b/CleanAspCore/Endpoints/Jobs/AddJobs.cs
@@ -1,9 +1,9 @@
 using CleanAspCore.Data;
-using CleanAspCore.Data.Features.Jobs;
+using CleanAspCore.Data.Models.Jobs;
 using CleanAspCore.Extensions.FluentValidation;
 using Microsoft.AspNetCore.Http.HttpResults;
 
-namespace CleanAspCore.Features.Jobs.Endpoints;
+namespace CleanAspCore.Endpoints.Jobs;
 
 /// <summary>
 /// A request to create a new job.
diff --git a/CleanAspCore/Features/Jobs/Endpoints/GetJobById.cs b/CleanAspCore/Endpoints/Jobs/GetJobById.cs
similarity index 92%
rename from CleanAspCore/Features/Jobs/Endpoints/GetJobById.cs
rename to CleanAspCore/Endpoints/Jobs/GetJobById.cs
index 44d1ac4..aade697 100644
--- a/CleanAspCore/Features/Jobs/Endpoints/GetJobById.cs
+++ b/CleanAspCore/Endpoints/Jobs/GetJobById.cs
@@ -1,9 +1,9 @@
 using CleanAspCore.Data;
-using CleanAspCore.Data.Features.Jobs;
+using CleanAspCore.Data.Models.Jobs;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.EntityFrameworkCore;
 
-namespace CleanAspCore.Features.Jobs.Endpoints;
+namespace CleanAspCore.Endpoints.Jobs;
 
 /// <summary>
 /// The get job response.
diff --git a/CleanAspCore/Features/Jobs/Routes.cs b/CleanAspCore/Endpoints/Jobs/Routes.cs
similarity index 78%
rename from CleanAspCore/Features/Jobs/Routes.cs
rename to CleanAspCore/Endpoints/Jobs/Routes.cs
index bcbcaec..b3a12d5 100644
--- a/CleanAspCore/Features/Jobs/Routes.cs
+++ b/CleanAspCore/Endpoints/Jobs/Routes.cs
@@ -1,7 +1,6 @@
-using CleanAspCore.Features.Jobs.Endpoints;
-using CleanAspCore.Utils;
+using CleanAspCore.Utils;
 
-namespace CleanAspCore.Features.Jobs;
+namespace CleanAspCore.Endpoints.Jobs;
 
 internal static class Routes
 {
diff --git a/CleanAspCore/Routes.cs b/CleanAspCore/Routes.cs
index 2cae629..08cd4f9 100644
--- a/CleanAspCore/Routes.cs
+++ b/CleanAspCore/Routes.cs
@@ -1,10 +1,10 @@
-using CleanAspCore.Features.Departments;
-using CleanAspCore.Features.Employees;
-using CleanAspCore.Features.Jobs;
+using CleanAspCore.Endpoints.Departments;
+using CleanAspCore.Endpoints.Employees;
+using CleanAspCore.Endpoints.Jobs;
 
 namespace CleanAspCore;
 
-public static class Routes
+internal static class Routes
 {
     internal static void AddAppRoutes(this IEndpointRouteBuilder host)
     {