diff --git a/EnvelopeGenerator.API/Controllers/EnvelopeController.cs b/EnvelopeGenerator.API/Controllers/EnvelopeController.cs
index 2c4d5613..f9ff854e 100644
--- a/EnvelopeGenerator.API/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.API/Controllers/EnvelopeController.cs
@@ -1,4 +1,5 @@
-using EnvelopeGenerator.Application.Envelopes.Commands;
+using EnvelopeGenerator.API.Extensions;
+using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
diff --git a/EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs
index a61373f7..e8125779 100644
--- a/EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs
@@ -13,6 +13,7 @@ using System.Data;
 using EnvelopeGenerator.Application.Common.SQL;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+using EnvelopeGenerator.API.Extensions;
 
 namespace EnvelopeGenerator.API.Controllers;
 
diff --git a/EnvelopeGenerator.API/Controllers/ControllerExtensions.cs b/EnvelopeGenerator.API/Extensions/ControllerExtensions.cs
similarity index 98%
rename from EnvelopeGenerator.API/Controllers/ControllerExtensions.cs
rename to EnvelopeGenerator.API/Extensions/ControllerExtensions.cs
index ab7797ef..4eb12f74 100644
--- a/EnvelopeGenerator.API/Controllers/ControllerExtensions.cs
+++ b/EnvelopeGenerator.API/Extensions/ControllerExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Security.Claims;
 
-namespace EnvelopeGenerator.API.Controllers
+namespace EnvelopeGenerator.API.Extensions
 {
     /// <summary>
     /// Provides extension methods for extracting user information from a <see cref="ClaimsPrincipal"/>.