diff --git a/BTCPayServer/Controllers/RestApi/ApiKeys/ApiKeysController.cs b/BTCPayServer/Controllers/RestApi/ApiKeysController.cs
similarity index 97%
rename from BTCPayServer/Controllers/RestApi/ApiKeys/ApiKeysController.cs
rename to BTCPayServer/Controllers/RestApi/ApiKeysController.cs
index ea2dc4ff2..d512552d7 100644
--- a/BTCPayServer/Controllers/RestApi/ApiKeys/ApiKeysController.cs
+++ b/BTCPayServer/Controllers/RestApi/ApiKeysController.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BTCPayServer.Controllers.RestApi.ApiKeys
+namespace BTCPayServer.Controllers.RestApi
 {
     [ApiController]
     [Authorize(AuthenticationSchemes = AuthenticationSchemes.ApiKey)]
diff --git a/BTCPayServer/Controllers/RestApi/Users/UsersController.cs b/BTCPayServer/Controllers/RestApi/UsersController.cs
similarity index 99%
rename from BTCPayServer/Controllers/RestApi/Users/UsersController.cs
rename to BTCPayServer/Controllers/RestApi/UsersController.cs
index 6a7a7aca2..9abefacee 100644
--- a/BTCPayServer/Controllers/RestApi/Users/UsersController.cs
+++ b/BTCPayServer/Controllers/RestApi/UsersController.cs
@@ -20,7 +20,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NicolasDorier.RateLimits;
 using BTCPayServer.Client;
 
-namespace BTCPayServer.Controllers.RestApi.Users
+namespace BTCPayServer.Controllers.RestApi
 {
     [ApiController]
     [Authorize(AuthenticationSchemes = AuthenticationSchemes.ApiKey)]