diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/EfCore/IdentityRoleEntityTypeConfiguration.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/EfCore/IdentityRoleEntityTypeConfiguration.cs
similarity index 91%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/EfCore/IdentityRoleEntityTypeConfiguration.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/EfCore/IdentityRoleEntityTypeConfiguration.cs
index 8a5faca..679d937 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/EfCore/IdentityRoleEntityTypeConfiguration.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/EfCore/IdentityRoleEntityTypeConfiguration.cs
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HackathonPreparing.ApiService.Auth.EfCore;
+namespace HackathonPreparing.ApiService.AuthFeature.EfCore;
 
 public class IdentityRoleEntityTypeConfiguration : IEntityTypeConfiguration<IdentityRole<int>>
 {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/EfCore/UserContext.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/EfCore/UserContext.cs
similarity index 75%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/EfCore/UserContext.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/EfCore/UserContext.cs
index d97a9f7..fec04ac 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/EfCore/UserContext.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/EfCore/UserContext.cs
@@ -2,9 +2,9 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace HackathonPreparing.ApiService.Auth.EfCore;
+namespace HackathonPreparing.ApiService.AuthFeature.EfCore;
 
-public class UserContext : IdentityDbContext<Auth.User, IdentityRole<int>, int>
+public class UserContext : IdentityDbContext<AuthFeature.User, IdentityRole<int>, int>
 {
     public UserContext (DbContextOptions<UserContext> options) : base(options) {}
 
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/UserModel.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/UserModel.cs
similarity index 76%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/UserModel.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/UserModel.cs
index 486ff56..22b7887 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/UserModel.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/UserModel.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace HackathonPreparing.ApiService.Auth;
+namespace HackathonPreparing.ApiService.AuthFeature;
 
 public class User : IdentityUser<int>
 {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/UserOpenApiSchemeFilter.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/UserOpenApiSchemeFilter.cs
similarity index 94%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/UserOpenApiSchemeFilter.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/UserOpenApiSchemeFilter.cs
index 2d5f0e9..59800a0 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Auth/UserOpenApiSchemeFilter.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/AuthFeature/UserOpenApiSchemeFilter.cs
@@ -3,7 +3,7 @@ using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace HackathonPreparing.ApiService.Auth;
+namespace HackathonPreparing.ApiService.AuthFeature;
 
 public class UserOpenApiSchemeFilter : ISchemaFilter
 {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/GlobalHelpers/DbHelpersEndpointsExtensions.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/DbHelpersEndpointsExtensions.cs
similarity index 94%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/GlobalHelpers/DbHelpersEndpointsExtensions.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/DbHelpersEndpointsExtensions.cs
index 98be0d7..657305e 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/GlobalHelpers/DbHelpersEndpointsExtensions.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/DbHelpersEndpointsExtensions.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace HackathonPreparing.ApiService.GlobalHelpers;
+namespace HackathonPreparing.ApiService.DevFeature;
 
 public static class DbHelpersEndpointsExtensions
 {
@@ -53,8 +53,8 @@ public static class DbHelpersEndpointsExtensions
             return Results.Ok();
         });
 
-        group.MapPost("/add-moderator", async ([FromServices]UserManager<Auth.User> userManager) => {
-            var user = new Auth.User{
+        group.MapPost("/add-moderator", async ([FromServices]UserManager<AuthFeature.User> userManager) => {
+            var user = new AuthFeature.User{
                 Email = "m@gmail.com",
                 UserName = "m@gmail.com"
             };
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/GlobalHelpers/ServicesExtensions.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs
similarity index 89%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/GlobalHelpers/ServicesExtensions.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs
index a4811bd..ce6d64e 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/GlobalHelpers/ServicesExtensions.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 
 
-namespace HackathonPreparing.ApiService.GlobalHelpers;
+namespace HackathonPreparing.ApiService.DevFeature;
 
 public static class ServicesExtensions
 {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/EfCore/WeatherForecastContext.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/EfCore/WeatherForecastContext.cs
similarity index 82%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/EfCore/WeatherForecastContext.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/EfCore/WeatherForecastContext.cs
index 7e7e319..16a5866 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/EfCore/WeatherForecastContext.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/EfCore/WeatherForecastContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace HackathonPreparing.ApiService.WeatherForecast.EfCore;
+namespace HackathonPreparing.ApiService.WeatherForecastFeature.EfCore;
 
 public sealed class WeatherForecastContext : DbContext
 {
@@ -10,7 +10,7 @@ public sealed class WeatherForecastContext : DbContext
 
     }
     
-    public DbSet<WeatherForecast> Forecasts => Set<ApiService.WeatherForecast.WeatherForecast>();
+    public DbSet<WeatherForecast> Forecasts => Set<ApiService.WeatherForecastFeature.WeatherForecast>();
 
     protected override void OnModelCreating(ModelBuilder builder)
     {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/EfCore/WeatherForecastEntityTypeConfiguration.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/EfCore/WeatherForecastEntityTypeConfiguration.cs
similarity index 93%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/EfCore/WeatherForecastEntityTypeConfiguration.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/EfCore/WeatherForecastEntityTypeConfiguration.cs
index d32c19a..04ad93a 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/EfCore/WeatherForecastEntityTypeConfiguration.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/EfCore/WeatherForecastEntityTypeConfiguration.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace HackathonPreparing.ApiService.WeatherForecast.EfCore;
+namespace HackathonPreparing.ApiService.WeatherForecastFeature.EfCore;
 
 public class WeatherForecastEntityTypeConfiguration : IEntityTypeConfiguration<WeatherForecast>
 {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/WeatherForecastEndpointsExtensions.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/WeatherForecastEndpointsExtensions.cs
similarity index 86%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/WeatherForecastEndpointsExtensions.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/WeatherForecastEndpointsExtensions.cs
index c306fff..2830ab8 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/WeatherForecastEndpointsExtensions.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/WeatherForecastEndpointsExtensions.cs
@@ -1,7 +1,7 @@
-using HackathonPreparing.ApiService.WeatherForecast.EfCore;
+using HackathonPreparing.ApiService.WeatherForecastFeature.EfCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace HackathonPreparing.ApiService.WeatherForecast;
+namespace HackathonPreparing.ApiService.WeatherForecastFeature;
 
 public static class WeatherForecastEndpointsExtensions
 {
@@ -22,14 +22,14 @@ public static class WeatherForecastEndpointsExtensions
 
             return Results.NoContent();
         }).RequireAuthorization("moderator");
-        group.MapPost("/", async (WeatherForecastContext db, ApiService.WeatherForecast.WeatherForecast forecast) =>
+        group.MapPost("/", async (WeatherForecastContext db, ApiService.WeatherForecastFeature.WeatherForecast forecast) =>
         {
             db.Forecasts.Add(forecast);
             await db.SaveChangesAsync();
 
             return Results.Created($"/weatherforecast/{forecast.Id}", forecast);
         });
-        group.MapPut("/{id}", async (WeatherForecastContext db, int id, ApiService.WeatherForecast.WeatherForecast forecast) =>
+        group.MapPut("/{id}", async (WeatherForecastContext db, int id, ApiService.WeatherForecastFeature.WeatherForecast forecast) =>
         {
             if (id != forecast.Id)
             {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/WeatherForecastModel.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/WeatherForecastModel.cs
similarity index 85%
rename from HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/WeatherForecastModel.cs
rename to HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/WeatherForecastModel.cs
index 9c758a6..dc8bc64 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/WeatherForecast/WeatherForecastModel.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Features/WeatherForecastFeature/WeatherForecastModel.cs
@@ -1,4 +1,4 @@
-namespace HackathonPreparing.ApiService.WeatherForecast;
+namespace HackathonPreparing.ApiService.WeatherForecastFeature;
 
 public class WeatherForecast
 {
diff --git a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Program.cs b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Program.cs
index 326e623..bc431c7 100644
--- a/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Program.cs
+++ b/HackathonPreparing/HackathonPreparing/HackathonPreparing.ApiService/Program.cs
@@ -1,8 +1,8 @@
-using HackathonPreparing.ApiService.Auth;
-using HackathonPreparing.ApiService.Auth.EfCore;
-using HackathonPreparing.ApiService.GlobalHelpers;
-using HackathonPreparing.ApiService.WeatherForecast;
-using HackathonPreparing.ApiService.WeatherForecast.EfCore;
+using HackathonPreparing.ApiService.AuthFeature;
+using HackathonPreparing.ApiService.AuthFeature.EfCore;
+using HackathonPreparing.ApiService.DevFeature;
+using HackathonPreparing.ApiService.WeatherForecastFeature;
+using HackathonPreparing.ApiService.WeatherForecastFeature.EfCore;
 using HackathonPreparing.ServiceDefaults;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.OpenApi.Models;