diff --git a/src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs b/src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs
index f1c5bda3ff..f9d6603a6b 100644
--- a/src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs
+++ b/src/Api/KeyManagement/Models/Requests/AccountKeysRequestModel.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using Bit.Core.KeyManagement.Models.Data;
-using Bit.Core.KeyManagement.Models.Data.Models;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.KeyManagement.Models.Requests;
diff --git a/src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs b/src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs
index 983f6bbefa..9445b1ba2f 100644
--- a/src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs
+++ b/src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs
@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using Bit.Core.KeyManagement.Models.Data.Models;
+using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.KeyManagement.Models.Response;
diff --git a/src/Api/KeyManagement/Models/Response/PublicKeysResponseModel.cs b/src/Api/KeyManagement/Models/Response/PublicKeysResponseModel.cs
index d28e7d9825..8c2bde58aa 100644
--- a/src/Api/KeyManagement/Models/Response/PublicKeysResponseModel.cs
+++ b/src/Api/KeyManagement/Models/Response/PublicKeysResponseModel.cs
@@ -1,4 +1,4 @@
-using Bit.Core.KeyManagement.Models.Data.Models;
+using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.KeyManagement.Models.Response;
diff --git a/src/Core/KeyManagement/Models/Data/RotateUserAccountKeysData.cs b/src/Core/KeyManagement/Models/Data/RotateUserAccountKeysData.cs
index b6730a62ff..6c402038ad 100644
--- a/src/Core/KeyManagement/Models/Data/RotateUserAccountKeysData.cs
+++ b/src/Core/KeyManagement/Models/Data/RotateUserAccountKeysData.cs
@@ -1,7 +1,6 @@
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.Models.Data.Models;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;
 
diff --git a/src/Core/KeyManagement/Models/Data/UserAccountKeysData.cs b/src/Core/KeyManagement/Models/Data/UserAccountKeysData.cs
index 7ac0e4a7dc..bfd33e690b 100644
--- a/src/Core/KeyManagement/Models/Data/UserAccountKeysData.cs
+++ b/src/Core/KeyManagement/Models/Data/UserAccountKeysData.cs
@@ -1,4 +1,4 @@
-namespace Bit.Core.KeyManagement.Models.Data.Models;
+namespace Bit.Core.KeyManagement.Models.Data;
 
 #nullable enable
 
diff --git a/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs b/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs
index d238d13245..d58154e6e6 100644
--- a/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs
+++ b/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs
@@ -1,7 +1,7 @@
 #nullable enable
 
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.Models.Data.Models;
+using Bit.Core.KeyManagement.Models.Data;
 
 namespace Bit.Api.KeyManagement.Queries.Interfaces;
 
diff --git a/src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs b/src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
index 9d6282c0db..8c8eeed0d6 100644
--- a/src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
+++ b/src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
@@ -2,7 +2,7 @@
 
 using Bit.Api.KeyManagement.Queries.Interfaces;
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.Models.Data.Models;
+using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.KeyManagement.Repositories;
 
 namespace Bit.Core.KeyManagement.Queries;
diff --git a/test/Api.Test/KeyManagement/Controllers/UsersControllerTests.cs b/test/Api.Test/KeyManagement/Controllers/UsersControllerTests.cs
index b86f0177ca..70eb1cf1ad 100644
--- a/test/Api.Test/KeyManagement/Controllers/UsersControllerTests.cs
+++ b/test/Api.Test/KeyManagement/Controllers/UsersControllerTests.cs
@@ -5,7 +5,6 @@ using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.KeyManagement.Enums;
 using Bit.Core.KeyManagement.Models.Data;
-using Bit.Core.KeyManagement.Models.Data.Models;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Api.Test/Vault/Controllers/SyncControllerTests.cs b/test/Api.Test/Vault/Controllers/SyncControllerTests.cs
index cc7ec38931..2b32ece33a 100644
--- a/test/Api.Test/Vault/Controllers/SyncControllerTests.cs
+++ b/test/Api.Test/Vault/Controllers/SyncControllerTests.cs
@@ -13,7 +13,7 @@ using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.KeyManagement.Models.Data.Models;
+using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Repositories;