diff --git a/src/Api/Controllers/OrganizationExportController.cs b/src/Api/Tools/Controllers/OrganizationExportController.cs
similarity index 97%
rename from src/Api/Controllers/OrganizationExportController.cs
rename to src/Api/Tools/Controllers/OrganizationExportController.cs
index be5aa0e14a..b3c0643b28 100644
--- a/src/Api/Controllers/OrganizationExportController.cs
+++ b/src/Api/Tools/Controllers/OrganizationExportController.cs
@@ -1,4 +1,5 @@
 using Bit.Api.Models.Response;
+using Bit.Api.Tools.Models.Response;
 using Bit.Api.Vault.Models.Response;
 using Bit.Core.Context;
 using Bit.Core.Entities;
@@ -9,7 +10,7 @@ using Bit.Core.Vault.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.Tools.Controllers;
 
 [Route("organizations/{organizationId}")]
 [Authorize("Application")]
diff --git a/src/Api/Models/Response/OrganizationExportResponseModel.cs b/src/Api/Tools/Models/Response/OrganizationExportResponseModel.cs
similarity index 85%
rename from src/Api/Models/Response/OrganizationExportResponseModel.cs
rename to src/Api/Tools/Models/Response/OrganizationExportResponseModel.cs
index 1bfca7e3d5..a4b35d8de1 100644
--- a/src/Api/Models/Response/OrganizationExportResponseModel.cs
+++ b/src/Api/Tools/Models/Response/OrganizationExportResponseModel.cs
@@ -1,7 +1,8 @@
-using Bit.Api.Vault.Models.Response;
+using Bit.Api.Models.Response;
+using Bit.Api.Vault.Models.Response;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Tools.Models.Response;
 
 public class OrganizationExportResponseModel : ResponseModel
 {