diff --git a/API/API.FileSharing/Controllers/FileItemsController.cs b/API/API.FileSharing/Controllers/FileItemsController.cs
index 798a3d5..2e5b22b 100644
--- a/API/API.FileSharing/Controllers/FileItemsController.cs
+++ b/API/API.FileSharing/Controllers/FileItemsController.cs
@@ -7,4 +7,6 @@ public class FileItemsController : BaseCrudController<FileItem, FileItemsControl
     public FileItemsController(IAppLogging<FileItemsController> logger, IFileItemRepo repo) : base(logger, repo)
     {
     }
+
+    // TODO: put more individual Requests here
 }
diff --git a/API/API.FileSharing/Controllers/AccountsController.cs b/API/API.FileSharing/Controllers/Identity/AccountsController.cs
similarity index 90%
rename from API/API.FileSharing/Controllers/AccountsController.cs
rename to API/API.FileSharing/Controllers/Identity/AccountsController.cs
index 2e60289..143c733 100644
--- a/API/API.FileSharing/Controllers/AccountsController.cs
+++ b/API/API.FileSharing/Controllers/Identity/AccountsController.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Identity;
-
-namespace API.FileSharing.Controllers;
+namespace API.FileSharing.Controllers.Identity;
 
 [ApiController]
 [Route("api/[controller]")]
@@ -46,7 +44,7 @@ public async Task<IResult> GetOneAsync(int id)
         return Results.Ok(
             new
             {
-                Email = userDetails?.Email
+                userDetails?.Email
             });
     }
 }
diff --git a/API/API.FileSharing/Controllers/IdentityUserEndpoints.cs b/API/API.FileSharing/Controllers/Identity/IdentityUserEndpoints.cs
similarity index 94%
rename from API/API.FileSharing/Controllers/IdentityUserEndpoints.cs
rename to API/API.FileSharing/Controllers/Identity/IdentityUserEndpoints.cs
index 3fc1f5d..68c5ba6 100644
--- a/API/API.FileSharing/Controllers/IdentityUserEndpoints.cs
+++ b/API/API.FileSharing/Controllers/Identity/IdentityUserEndpoints.cs
@@ -1,4 +1,4 @@
-namespace API.FileSharing.Controllers;
+namespace API.FileSharing.Controllers.Identity;
 
 public static class IdentityUserEndpoints
 {
diff --git a/API/API.FileSharing/GlobalUsings.cs b/API/API.FileSharing/GlobalUsings.cs
index 7776071..d064a59 100644
--- a/API/API.FileSharing/GlobalUsings.cs
+++ b/API/API.FileSharing/GlobalUsings.cs
@@ -1,7 +1,10 @@
 global using API.FileSharing.ApiVersionSupport;
 global using API.FileSharing.Swagger;
 global using API.FileSharing.Swagger.Models;
+global using API.FileSharing.Controllers;
 global using API.FileSharing.Controllers.Base;
+global using API.FileSharing.Controllers.Identity;
+global using API.FileSharing.Extensions;
 //global using API.FileSharing.Filters;
 //global using API.FileSharing.Security;
 
@@ -14,6 +17,7 @@
 
 global using MODELS.FileSharing.Entities;
 global using MODELS.FileSharing.Entities.Base;
+global using MODELS.FileSharing.Settings;
 
 global using SERVICES.FileSharing.Utilities;
 global using SERVICES.FileSharing.Logging.Interfaces;
@@ -29,9 +33,12 @@
 global using Microsoft.OpenApi.Any;
 global using Microsoft.OpenApi.Models;
 global using Microsoft.AspNetCore.Authentication;
+global using Microsoft.AspNetCore.Authentication.JwtBearer;
 global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Mvc.Authorization;
 global using Microsoft.AspNetCore.Identity;
+global using Microsoft.AspNetCore.Identity.Data;
+global using Microsoft.IdentityModel.Tokens;
 
 global using Swashbuckle.AspNetCore.Annotations;
 global using Swashbuckle.AspNetCore.SwaggerGen;
@@ -43,3 +50,4 @@
 global using System.Security.Claims;
 global using System.Text;
 global using System.Text.Encodings.Web;
+global using System.IdentityModel.Tokens.Jwt;