diff --git a/PyroFetes/Endpoints/Setting/CreateSettingEndpoint.cs b/PyroFetes/Endpoints/SettingEndpoints/CreateSettingEndpoint.cs
similarity index 87%
rename from PyroFetes/Endpoints/Setting/CreateSettingEndpoint.cs
rename to PyroFetes/Endpoints/SettingEndpoints/CreateSettingEndpoint.cs
index 11dcedd2..93250d65 100644
--- a/PyroFetes/Endpoints/Setting/CreateSettingEndpoint.cs
+++ b/PyroFetes/Endpoints/SettingEndpoints/CreateSettingEndpoint.cs
@@ -1,7 +1,8 @@
-using PyroFetes.DTO.SettingDTO.Request;
+using FastEndpoints;
+using PyroFetes.DTO.SettingDTO.Request;
 using PyroFetes.DTO.SettingDTO.Response;
-using FastEndpoints;
-namespace PyroFetes.Endpoints.Setting;
+
+namespace PyroFetes.Endpoints.SettingEndpoints;
 
 public class CreateSettingEndpoint(PyroFetesDbContext database) : Endpoint<CreateSettingDto, GetSettingDto>
 {
diff --git a/PyroFetes/Endpoints/Setting/DeleteSettingEndpoint.cs b/PyroFetes/Endpoints/SettingEndpoints/DeleteSettingEndpoint.cs
similarity index 94%
rename from PyroFetes/Endpoints/Setting/DeleteSettingEndpoint.cs
rename to PyroFetes/Endpoints/SettingEndpoints/DeleteSettingEndpoint.cs
index 92bfba78..0930566a 100644
--- a/PyroFetes/Endpoints/Setting/DeleteSettingEndpoint.cs
+++ b/PyroFetes/Endpoints/SettingEndpoints/DeleteSettingEndpoint.cs
@@ -1,7 +1,7 @@
 using FastEndpoints;
 using Microsoft.EntityFrameworkCore;
 
-namespace PyroFetes.Endpoints.Setting;
+namespace PyroFetes.Endpoints.SettingEndpoints;
 
 public class DeleteSettingRequest
 {
diff --git a/PyroFetes/Endpoints/Setting/GetSettingEndpoint.cs b/PyroFetes/Endpoints/SettingEndpoints/GetSettingEndpoint.cs
similarity index 95%
rename from PyroFetes/Endpoints/Setting/GetSettingEndpoint.cs
rename to PyroFetes/Endpoints/SettingEndpoints/GetSettingEndpoint.cs
index 9ebd72bc..34b059d0 100644
--- a/PyroFetes/Endpoints/Setting/GetSettingEndpoint.cs
+++ b/PyroFetes/Endpoints/SettingEndpoints/GetSettingEndpoint.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.SettingDTO.Response;
 
-namespace PyroFetes.Endpoints.Setting;
+namespace PyroFetes.Endpoints.SettingEndpoints;
 
 public class GetSettingRequest
 {
diff --git a/PyroFetes/Endpoints/Setting/PatchSettingElectronicSignatureEndpoint.cs b/PyroFetes/Endpoints/SettingEndpoints/PatchSettingElectronicSignatureEndpoint.cs
similarity index 95%
rename from PyroFetes/Endpoints/Setting/PatchSettingElectronicSignatureEndpoint.cs
rename to PyroFetes/Endpoints/SettingEndpoints/PatchSettingElectronicSignatureEndpoint.cs
index c54d9155..39e84595 100644
--- a/PyroFetes/Endpoints/Setting/PatchSettingElectronicSignatureEndpoint.cs
+++ b/PyroFetes/Endpoints/SettingEndpoints/PatchSettingElectronicSignatureEndpoint.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.SettingDTO.Request;
 using PyroFetes.DTO.SettingDTO.Response;
 
-namespace PyroFetes.Endpoints.Setting;
+namespace PyroFetes.Endpoints.SettingEndpoints;
 
 public class PatchSettingElectronicSignatureEndpoint(PyroFetesDbContext database) : Endpoint<PatchSettingElectronicSignatureDto, GetSettingDto>
 {
diff --git a/PyroFetes/Endpoints/Setting/PatchSettingLogoEndpoint.cs b/PyroFetes/Endpoints/SettingEndpoints/PatchSettingLogoEndpoint.cs
similarity index 95%
rename from PyroFetes/Endpoints/Setting/PatchSettingLogoEndpoint.cs
rename to PyroFetes/Endpoints/SettingEndpoints/PatchSettingLogoEndpoint.cs
index 4bfe5c1f..553800a3 100644
--- a/PyroFetes/Endpoints/Setting/PatchSettingLogoEndpoint.cs
+++ b/PyroFetes/Endpoints/SettingEndpoints/PatchSettingLogoEndpoint.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.SettingDTO.Request;
 using PyroFetes.DTO.SettingDTO.Response;
 
-namespace PyroFetes.Endpoints.Setting;
+namespace PyroFetes.Endpoints.SettingEndpoints;
 
 public class PatchSettingLogoEndpoint(PyroFetesDbContext database) : Endpoint<PatchSettingLogoDto, GetSettingDto>
 {