diff --git a/Endpoint/Common/Extensions/BadRequestResponseAttribute.cs b/Endpoint/Common/Attributes/BadRequestResponseAttribute.cs
similarity index 90%
rename from Endpoint/Common/Extensions/BadRequestResponseAttribute.cs
rename to Endpoint/Common/Attributes/BadRequestResponseAttribute.cs
index 171da23..b81f692 100644
--- a/Endpoint/Common/Extensions/BadRequestResponseAttribute.cs
+++ b/Endpoint/Common/Attributes/BadRequestResponseAttribute.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
-using System;
 using Microsoft.AspNetCore.Mvc;
+using Mirea.Api.Endpoint.Models;
+using System;
 
 namespace Mirea.Api.Endpoint.Common.Extensions;
 
diff --git a/Endpoint/Common/Extensions/NotFoundResponseAttribute.cs b/Endpoint/Common/Attributes/NotFoundResponseAttribute.cs
similarity index 90%
rename from Endpoint/Common/Extensions/NotFoundResponseAttribute.cs
rename to Endpoint/Common/Attributes/NotFoundResponseAttribute.cs
index 15db1cc..8f05a69 100644
--- a/Endpoint/Common/Extensions/NotFoundResponseAttribute.cs
+++ b/Endpoint/Common/Attributes/NotFoundResponseAttribute.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
-using System;
 using Microsoft.AspNetCore.Mvc;
+using Mirea.Api.Endpoint.Models;
+using System;
 
 namespace Mirea.Api.Endpoint.Common.Extensions;
 
diff --git a/Endpoint/ConfigureSwaggerOptions.cs b/Endpoint/Configuration/ConfigureSwaggerOptions.cs
similarity index 96%
rename from Endpoint/ConfigureSwaggerOptions.cs
rename to Endpoint/Configuration/ConfigureSwaggerOptions.cs
index 9b53140..39280bb 100644
--- a/Endpoint/ConfigureSwaggerOptions.cs
+++ b/Endpoint/Configuration/ConfigureSwaggerOptions.cs
@@ -5,7 +5,7 @@ using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System;
 
-namespace Mirea.Api.Endpoint;
+namespace Mirea.Api.Endpoint.Configuration;
 
 public class ConfigureSwaggerOptions(IApiVersionDescriptionProvider provider) : IConfigureOptions<SwaggerGenOptions>
 {
diff --git a/Endpoint/EnvironmentManager.cs b/Endpoint/Configuration/EnvironmentManager.cs
similarity index 93%
rename from Endpoint/EnvironmentManager.cs
rename to Endpoint/Configuration/EnvironmentManager.cs
index 3cbe859..cc2b201 100644
--- a/Endpoint/EnvironmentManager.cs
+++ b/Endpoint/Configuration/EnvironmentManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Mirea.Api.Endpoint;
+namespace Mirea.Api.Endpoint.Configuration;
 
 internal static class EnvironmentManager
 {
diff --git a/Endpoint/Common/Extensions/ErrorResponseVm.cs b/Endpoint/Models/ErrorResponseVm.cs
similarity index 92%
rename from Endpoint/Common/Extensions/ErrorResponseVm.cs
rename to Endpoint/Models/ErrorResponseVm.cs
index 7c4a099..d409ae1 100644
--- a/Endpoint/Common/Extensions/ErrorResponseVm.cs
+++ b/Endpoint/Models/ErrorResponseVm.cs
@@ -1,4 +1,4 @@
-namespace Mirea.Api.Endpoint.Common.Extensions;
+namespace Mirea.Api.Endpoint.Models;
 
 /// <summary>
 /// A class for providing information about an error