diff --git a/WD7UVN_HFT_2023241.Endpoint/Startup.cs b/WD7UVN_HFT_2023241.Endpoint/Startup.cs
index 4506f68..51e5232 100644
--- a/WD7UVN_HFT_2023241.Endpoint/Startup.cs
+++ b/WD7UVN_HFT_2023241.Endpoint/Startup.cs
@@ -16,7 +16,7 @@ namespace WD7UVN_HFT_2023241.Endpoint
         {
             services.AddTransient<ILogicServices, LogicServices>();
             services.AddTransient<CompanyDbContext>();
-			services.AddTransient<ICRUD>();
+            services.AddTransient<ICRUD, CRUD>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/WD7UVN_HFT_2023241.Repository/CRUD.cs b/WD7UVN_HFT_2023241.Repository/CRUD.cs
index ac44601..2dcccb7 100644
--- a/WD7UVN_HFT_2023241.Repository/CRUD.cs
+++ b/WD7UVN_HFT_2023241.Repository/CRUD.cs
@@ -6,8 +6,6 @@ using WD7UVN_HFT_2023241.Repository;
 
 namespace WD7UVN_HFT_2023241.Repository
 {
-    public interface ICRUD : ICustomerRepository, IEmployeeRepository, IMaintainerTeamRepository, IServiceRepository { }
-
     public interface ICustomerRepository
     {
         public void CreateCustomer(Customer customer);
@@ -17,45 +15,6 @@ namespace WD7UVN_HFT_2023241.Repository
         public void DeleteCustomer(int customerId);
     }
 
-    public class CustomerRepository : ICustomerRepository
-    {
-        public void CreateCustomer(Customer customer)
-        {
-            Database.Context.Customers.Add(customer);
-            Database.Context.SaveChanges();
-        }
-
-        public Customer ReadCustomer(int customerId)
-        {
-            return Database.Context.Customers.Find(customerId);
-        }
-
-        public IQueryable<Customer> ReadAllCustomers()
-        {
-            return Database.Context.Customers.AsQueryable();
-        }
-
-        public void UpdateCustomer(Customer updatedCustomer)
-        {
-            Customer existingCustomer = Database.Context.Customers.Find(updatedCustomer.ID);
-            if (existingCustomer != null)
-            {
-                Database.Context.Entry(existingCustomer).CurrentValues.SetValues(updatedCustomer);
-                Database.Context.SaveChanges();
-            }
-        }
-
-        public void DeleteCustomer(int customerId)
-        {
-            Customer customerToDelete = Database.Context.Customers.Find(customerId);
-            if (customerToDelete != null)
-            {
-                Database.Context.Customers.Remove(customerToDelete);
-                Database.Context.SaveChanges();
-            }
-        }
-    }    
-
     public interface IMaintainerTeamRepository
     {
         public void CreateMaintainerTeam(MaintainerTeam maintainerTeam);
@@ -65,45 +24,6 @@ namespace WD7UVN_HFT_2023241.Repository
         public void DeleteMaintainerTeam(int maintainerTeamId);
     }
 
-    public class MaintainerTeamRepository : IMaintainerTeamRepository
-    {
-        public void CreateMaintainerTeam(MaintainerTeam maintainerTeam)
-        {
-            Database.Context.Maintainers.Add(maintainerTeam);
-            Database.Context.SaveChanges();
-        }
-
-        public MaintainerTeam ReadMaintainerTeam(int maintainerTeamId)
-        {
-            return Database.Context.Maintainers.Find(maintainerTeamId);
-        }
-
-        public IQueryable<MaintainerTeam> ReadAllMaintainerTeams()
-        {
-            return Database.Context.Maintainers.AsQueryable();
-        }
-
-        public void UpdateMaintainerTeam(MaintainerTeam updatedMaintainerTeam)
-        {
-            MaintainerTeam existingMaintainerTeam = Database.Context.Maintainers.Find(updatedMaintainerTeam.ID);
-            if (existingMaintainerTeam != null)
-            {
-                Database.Context.Entry(existingMaintainerTeam).CurrentValues.SetValues(updatedMaintainerTeam);
-                Database.Context.SaveChanges();
-            }
-        }
-
-        public void DeleteMaintainerTeam(int maintainerTeamId)
-        {
-            MaintainerTeam maintainerTeamToDelete = Database.Context.Maintainers.Find(maintainerTeamId);
-            if (maintainerTeamToDelete != null)
-            {
-                Database.Context.Maintainers.Remove(maintainerTeamToDelete);
-                Database.Context.SaveChanges();
-            }
-        }
-    }
-
     public interface IServiceRepository
     {
         public void CreateService(Service service);
@@ -113,45 +33,6 @@ namespace WD7UVN_HFT_2023241.Repository
         public void DeleteService(int serviceId);
     }
 
-    public class ServiceRepository : IServiceRepository
-    {
-        public void CreateService(Service service)
-        {
-            Database.Context.Services.Add(service);
-            Database.Context.SaveChanges();
-        }
-
-        public Service ReadService(int serviceId)
-        {
-            return Database.Context.Services.Find(serviceId);
-        }
-
-        public IQueryable<Service> ReadAllServices()
-        {
-            return Database.Context.Services.AsQueryable();
-        }
-
-        public void UpdateService(Service updatedService)
-        {
-            Service existingService = Database.Context.Services.Find(updatedService.ID);
-            if (existingService != null)
-            {
-                Database.Context.Entry(existingService).CurrentValues.SetValues(updatedService);
-                Database.Context.SaveChanges();
-            }
-        }
-
-        public void DeleteService(int serviceId)
-        {
-            Service serviceToDelete = Database.Context.Services.Find(serviceId);
-            if (serviceToDelete != null)
-            {
-                Database.Context.Services.Remove(serviceToDelete);
-                Database.Context.SaveChanges();
-            }
-        }
-    }
-
     public interface IEmployeeRepository
     {
         public void CreateEmployee(Employee employee);
@@ -161,8 +42,10 @@ namespace WD7UVN_HFT_2023241.Repository
         public void DeleteEmployee(int employeeId);
     }
 
-    public class EmployeeRepository : IEmployeeRepository
-    {
+    public interface ICRUD : ICustomerRepository, IEmployeeRepository, IMaintainerTeamRepository, IServiceRepository { }
+
+	public class CRUD : ICRUD
+	{
         public void CreateEmployee(Employee employee)
         {
             Database.Context.Employees.Add(employee);
@@ -198,5 +81,114 @@ namespace WD7UVN_HFT_2023241.Repository
                 Database.Context.SaveChanges();
             }
         }
-    }
-}
\ No newline at end of file
+
+        public void CreateService(Service service)
+        {
+            Database.Context.Services.Add(service);
+            Database.Context.SaveChanges();
+        }
+
+        public Service ReadService(int serviceId)
+        {
+            return Database.Context.Services.Find(serviceId);
+        }
+
+        public IQueryable<Service> ReadAllServices()
+        {
+            return Database.Context.Services.AsQueryable();
+        }
+
+        public void UpdateService(Service updatedService)
+        {
+            Service existingService = Database.Context.Services.Find(updatedService.ID);
+            if (existingService != null)
+            {
+                Database.Context.Entry(existingService).CurrentValues.SetValues(updatedService);
+                Database.Context.SaveChanges();
+            }
+        }
+
+        public void DeleteService(int serviceId)
+        {
+            Service serviceToDelete = Database.Context.Services.Find(serviceId);
+            if (serviceToDelete != null)
+            {
+                Database.Context.Services.Remove(serviceToDelete);
+                Database.Context.SaveChanges();
+            }
+        }
+
+        public void CreateMaintainerTeam(MaintainerTeam maintainerTeam)
+        {
+            Database.Context.Maintainers.Add(maintainerTeam);
+            Database.Context.SaveChanges();
+        }
+
+        public MaintainerTeam ReadMaintainerTeam(int maintainerTeamId)
+        {
+            return Database.Context.Maintainers.Find(maintainerTeamId);
+        }
+
+        public IQueryable<MaintainerTeam> ReadAllMaintainerTeams()
+        {
+            return Database.Context.Maintainers.AsQueryable();
+        }
+
+        public void UpdateMaintainerTeam(MaintainerTeam updatedMaintainerTeam)
+        {
+            MaintainerTeam existingMaintainerTeam = Database.Context.Maintainers.Find(updatedMaintainerTeam.ID);
+            if (existingMaintainerTeam != null)
+            {
+                Database.Context.Entry(existingMaintainerTeam).CurrentValues.SetValues(updatedMaintainerTeam);
+                Database.Context.SaveChanges();
+            }
+        }
+
+        public void DeleteMaintainerTeam(int maintainerTeamId)
+        {
+            MaintainerTeam maintainerTeamToDelete = Database.Context.Maintainers.Find(maintainerTeamId);
+            if (maintainerTeamToDelete != null)
+            {
+                Database.Context.Maintainers.Remove(maintainerTeamToDelete);
+                Database.Context.SaveChanges();
+            }
+        }
+
+        public void CreateCustomer(Customer customer)
+        {
+            Database.Context.Customers.Add(customer);
+            Database.Context.SaveChanges();
+        }
+
+        public Customer ReadCustomer(int customerId)
+        {
+            return Database.Context.Customers.Find(customerId);
+        }
+
+        public IQueryable<Customer> ReadAllCustomers()
+        {
+            return Database.Context.Customers.AsQueryable();
+        }
+
+        public void UpdateCustomer(Customer updatedCustomer)
+        {
+            Customer existingCustomer = Database.Context.Customers.Find(updatedCustomer.ID);
+            if (existingCustomer != null)
+            {
+                Database.Context.Entry(existingCustomer).CurrentValues.SetValues(updatedCustomer);
+                Database.Context.SaveChanges();
+            }
+        }
+
+        public void DeleteCustomer(int customerId)
+        {
+            Customer customerToDelete = Database.Context.Customers.Find(customerId);
+            if (customerToDelete != null)
+            {
+                Database.Context.Customers.Remove(customerToDelete);
+                Database.Context.SaveChanges();
+            }
+        }
+	}
+	
+}