diff --git a/Endpoint/Configuration/AppConfig/ApiVersioningConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/ApiVersioningConfiguration.cs
similarity index 91%
rename from Endpoint/Configuration/AppConfig/ApiVersioningConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/ApiVersioningConfiguration.cs
index dd35369..f6abe4b 100644
--- a/Endpoint/Configuration/AppConfig/ApiVersioningConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/ApiVersioningConfiguration.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc.Versioning;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class ApiVersioningConfiguration
 {
diff --git a/Endpoint/Configuration/AppConfig/CacheConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/CacheConfiguration.cs
similarity index 91%
rename from Endpoint/Configuration/AppConfig/CacheConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/CacheConfiguration.cs
index d81c3cb..ccee805 100644
--- a/Endpoint/Configuration/AppConfig/CacheConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/CacheConfiguration.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Mirea.Api.Endpoint.Common.Settings;
 using Mirea.Api.Endpoint.Configuration.General.Settings;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class CacheConfiguration
 {
diff --git a/Endpoint/Configuration/AppConfig/EnvironmentConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/EnvironmentConfiguration.cs
similarity index 97%
rename from Endpoint/Configuration/AppConfig/EnvironmentConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/EnvironmentConfiguration.cs
index 796ee3f..6ac90c6 100644
--- a/Endpoint/Configuration/AppConfig/EnvironmentConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/EnvironmentConfiguration.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class EnvironmentConfiguration
 {
diff --git a/Endpoint/Configuration/AppConfig/JwtConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/JwtConfiguration.cs
similarity index 97%
rename from Endpoint/Configuration/AppConfig/JwtConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/JwtConfiguration.cs
index 213e244..307fa34 100644
--- a/Endpoint/Configuration/AppConfig/JwtConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/JwtConfiguration.cs
@@ -7,7 +7,7 @@ using Mirea.Api.Security.Common.Interfaces;
 using System;
 using System.Text;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class JwtConfiguration
 {
diff --git a/Endpoint/Configuration/AppConfig/LoggerConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/LoggerConfiguration.cs
similarity index 97%
rename from Endpoint/Configuration/AppConfig/LoggerConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/LoggerConfiguration.cs
index cd9583a..6fc9e3c 100644
--- a/Endpoint/Configuration/AppConfig/LoggerConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/LoggerConfiguration.cs
@@ -9,7 +9,7 @@ using Serilog.Filters;
 using Serilog.Formatting.Compact;
 using System.IO;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class LoggerConfiguration
 {
diff --git a/Endpoint/Configuration/AppConfig/SecureConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/SecureConfiguration.cs
similarity index 92%
rename from Endpoint/Configuration/AppConfig/SecureConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/SecureConfiguration.cs
index 5ea2fca..2b1f853 100644
--- a/Endpoint/Configuration/AppConfig/SecureConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/SecureConfiguration.cs
@@ -6,7 +6,7 @@ using Mirea.Api.Endpoint.Configuration.General.Settings;
 using Mirea.Api.Security;
 using Mirea.Api.Security.Common.Interfaces;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class SecureConfiguration
 {
diff --git a/Endpoint/Configuration/AppConfig/SwaggerConfiguration.cs b/Endpoint/Configuration/ApplicationConfiguration/SwaggerConfiguration.cs
similarity index 95%
rename from Endpoint/Configuration/AppConfig/SwaggerConfiguration.cs
rename to Endpoint/Configuration/ApplicationConfiguration/SwaggerConfiguration.cs
index f0ddea2..ad13435 100644
--- a/Endpoint/Configuration/AppConfig/SwaggerConfiguration.cs
+++ b/Endpoint/Configuration/ApplicationConfiguration/SwaggerConfiguration.cs
@@ -4,12 +4,12 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using Mirea.Api.Endpoint.Common.Services;
-using Mirea.Api.Endpoint.Configuration.Swagger;
+using Mirea.Api.Endpoint.Configuration.SwaggerOptions;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System;
 using System.IO;
 
-namespace Mirea.Api.Endpoint.Configuration.AppConfig;
+namespace Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 
 public static class SwaggerConfiguration
 {
diff --git a/Endpoint/Configuration/Swagger/ConfigureSwaggerOptions.cs b/Endpoint/Configuration/SwaggerOptions/ConfigureSwaggerOptions.cs
similarity index 95%
rename from Endpoint/Configuration/Swagger/ConfigureSwaggerOptions.cs
rename to Endpoint/Configuration/SwaggerOptions/ConfigureSwaggerOptions.cs
index bf47325..40f302b 100644
--- a/Endpoint/Configuration/Swagger/ConfigureSwaggerOptions.cs
+++ b/Endpoint/Configuration/SwaggerOptions/ConfigureSwaggerOptions.cs
@@ -5,7 +5,7 @@ using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System;
 
-namespace Mirea.Api.Endpoint.Configuration.Swagger;
+namespace Mirea.Api.Endpoint.Configuration.SwaggerOptions;
 
 public class ConfigureSwaggerOptions(IApiVersionDescriptionProvider provider) : IConfigureOptions<SwaggerGenOptions>
 {
diff --git a/Endpoint/Configuration/Swagger/SwaggerDefaultValues.cs b/Endpoint/Configuration/SwaggerOptions/SwaggerDefaultValues.cs
similarity index 96%
rename from Endpoint/Configuration/Swagger/SwaggerDefaultValues.cs
rename to Endpoint/Configuration/SwaggerOptions/SwaggerDefaultValues.cs
index 581393e..290f981 100644
--- a/Endpoint/Configuration/Swagger/SwaggerDefaultValues.cs
+++ b/Endpoint/Configuration/SwaggerOptions/SwaggerDefaultValues.cs
@@ -6,7 +6,7 @@ using System;
 using System.Linq;
 using System.Text.Json;
 
-namespace Mirea.Api.Endpoint.Configuration.Swagger;
+namespace Mirea.Api.Endpoint.Configuration.SwaggerOptions;
 
 public class SwaggerDefaultValues : IOperationFilter
 {
diff --git a/Endpoint/Configuration/Swagger/SwaggerExampleFilter.cs b/Endpoint/Configuration/SwaggerOptions/SwaggerExampleFilter.cs
similarity index 88%
rename from Endpoint/Configuration/Swagger/SwaggerExampleFilter.cs
rename to Endpoint/Configuration/SwaggerOptions/SwaggerExampleFilter.cs
index 2af76f4..0309293 100644
--- a/Endpoint/Configuration/Swagger/SwaggerExampleFilter.cs
+++ b/Endpoint/Configuration/SwaggerOptions/SwaggerExampleFilter.cs
@@ -3,7 +3,7 @@ using Mirea.Api.Endpoint.Common.Attributes;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System.Reflection;
 
-namespace Mirea.Api.Endpoint.Configuration.Swagger;
+namespace Mirea.Api.Endpoint.Configuration.SwaggerOptions;
 
 public class SwaggerExampleFilter : ISchemaFilter
 {
diff --git a/Endpoint/Program.cs b/Endpoint/Program.cs
index 1319332..dbf26e7 100644
--- a/Endpoint/Program.cs
+++ b/Endpoint/Program.cs
@@ -11,7 +11,7 @@ using Mirea.Api.DataAccess.Persistence.Common;
 using Mirea.Api.Endpoint.Common.Interfaces;
 using Mirea.Api.Endpoint.Common.Services;
 using Mirea.Api.Endpoint.Common.Settings;
-using Mirea.Api.Endpoint.Configuration.AppConfig;
+using Mirea.Api.Endpoint.Configuration.ApplicationConfiguration;
 using Mirea.Api.Endpoint.Configuration.General;
 using Mirea.Api.Endpoint.Configuration.General.Validators;
 using Mirea.Api.Endpoint.Middleware;