diff --git a/bitwarden_license/src/Commercial.Core/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandler.cs b/bitwarden_license/src/Commercial.Core/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandler.cs
index 2915b4393..4cb90223e 100644
--- a/bitwarden_license/src/Commercial.Core/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandler.cs
+++ b/bitwarden_license/src/Commercial.Core/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandler.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.AuthorizationRequirements;
diff --git a/bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs b/bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs
index 68bdf8f29..5df0b2921 100644
--- a/bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs
+++ b/bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs
@@ -1,6 +1,7 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Scim.Groups.Interfaces;
 using Bit.Scim.Models;
diff --git a/bitwarden_license/src/Scim/Groups/GetGroupsListQuery.cs b/bitwarden_license/src/Scim/Groups/GetGroupsListQuery.cs
index 1afab3a0f..7055736a4 100644
--- a/bitwarden_license/src/Scim/Groups/GetGroupsListQuery.cs
+++ b/bitwarden_license/src/Scim/Groups/GetGroupsListQuery.cs
@@ -1,5 +1,5 @@
-using Bit.Core.Entities;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Scim.Groups.Interfaces;
 
 namespace Bit.Scim.Groups;
diff --git a/bitwarden_license/src/Scim/Groups/Interfaces/IGetGroupsListQuery.cs b/bitwarden_license/src/Scim/Groups/Interfaces/IGetGroupsListQuery.cs
index d2cf5ef0a..07ff04470 100644
--- a/bitwarden_license/src/Scim/Groups/Interfaces/IGetGroupsListQuery.cs
+++ b/bitwarden_license/src/Scim/Groups/Interfaces/IGetGroupsListQuery.cs
@@ -1,4 +1,4 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
 namespace Bit.Scim.Groups.Interfaces;
 
diff --git a/bitwarden_license/src/Scim/Groups/Interfaces/IPostGroupCommand.cs b/bitwarden_license/src/Scim/Groups/Interfaces/IPostGroupCommand.cs
index 76e80f08d..011199f03 100644
--- a/bitwarden_license/src/Scim/Groups/Interfaces/IPostGroupCommand.cs
+++ b/bitwarden_license/src/Scim/Groups/Interfaces/IPostGroupCommand.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Scim.Models;
 
 namespace Bit.Scim.Groups.Interfaces;
diff --git a/bitwarden_license/src/Scim/Groups/Interfaces/IPutGroupCommand.cs b/bitwarden_license/src/Scim/Groups/Interfaces/IPutGroupCommand.cs
index 052a4e554..8c0b9108c 100644
--- a/bitwarden_license/src/Scim/Groups/Interfaces/IPutGroupCommand.cs
+++ b/bitwarden_license/src/Scim/Groups/Interfaces/IPutGroupCommand.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Scim.Models;
 
 namespace Bit.Scim.Groups.Interfaces;
diff --git a/bitwarden_license/src/Scim/Groups/PatchGroupCommand.cs b/bitwarden_license/src/Scim/Groups/PatchGroupCommand.cs
index 750dcec46..f31225754 100644
--- a/bitwarden_license/src/Scim/Groups/PatchGroupCommand.cs
+++ b/bitwarden_license/src/Scim/Groups/PatchGroupCommand.cs
@@ -1,10 +1,10 @@
 using System.Text.Json;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Scim.Groups.Interfaces;
 using Bit.Scim.Models;
 
diff --git a/bitwarden_license/src/Scim/Groups/PostGroupCommand.cs b/bitwarden_license/src/Scim/Groups/PostGroupCommand.cs
index 00da7a8d7..80ec5c5e3 100644
--- a/bitwarden_license/src/Scim/Groups/PostGroupCommand.cs
+++ b/bitwarden_license/src/Scim/Groups/PostGroupCommand.cs
@@ -1,8 +1,10 @@
-using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Scim.Context;
 using Bit.Scim.Groups.Interfaces;
diff --git a/bitwarden_license/src/Scim/Groups/PutGroupCommand.cs b/bitwarden_license/src/Scim/Groups/PutGroupCommand.cs
index 0310139ec..96c67be91 100644
--- a/bitwarden_license/src/Scim/Groups/PutGroupCommand.cs
+++ b/bitwarden_license/src/Scim/Groups/PutGroupCommand.cs
@@ -1,9 +1,10 @@
-using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
-using Bit.Core.Repositories;
 using Bit.Scim.Context;
 using Bit.Scim.Groups.Interfaces;
 using Bit.Scim.Models;
diff --git a/bitwarden_license/src/Scim/Models/ScimGroupRequestModel.cs b/bitwarden_license/src/Scim/Models/ScimGroupRequestModel.cs
index ac99eca2e..11bd40c58 100644
--- a/bitwarden_license/src/Scim/Models/ScimGroupRequestModel.cs
+++ b/bitwarden_license/src/Scim/Models/ScimGroupRequestModel.cs
@@ -1,4 +1,4 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Utilities;
 
 namespace Bit.Scim.Models;
diff --git a/bitwarden_license/src/Scim/Models/ScimGroupResponseModel.cs b/bitwarden_license/src/Scim/Models/ScimGroupResponseModel.cs
index 7ba209df9..697a3d59d 100644
--- a/bitwarden_license/src/Scim/Models/ScimGroupResponseModel.cs
+++ b/bitwarden_license/src/Scim/Models/ScimGroupResponseModel.cs
@@ -1,4 +1,4 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
 namespace Bit.Scim.Models;
 
diff --git a/bitwarden_license/test/Commercial.Core.Test/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandlerTests.cs b/bitwarden_license/test/Commercial.Core.Test/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandlerTests.cs
index 6f95f3c45..b6779394c 100644
--- a/bitwarden_license/test/Commercial.Core.Test/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandlerTests.cs
+++ b/bitwarden_license/test/Commercial.Core.Test/SecretsManager/AuthorizationHandlers/AccessPolicies/AccessPolicyAuthorizationHandlerTests.cs
@@ -2,6 +2,8 @@
 using System.Security.Claims;
 using Bit.Commercial.Core.SecretsManager.AuthorizationHandlers.AccessPolicies;
 using Bit.Commercial.Core.Test.SecretsManager.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/bitwarden_license/test/Scim.Test/Groups/GetGroupsListQueryTests.cs b/bitwarden_license/test/Scim.Test/Groups/GetGroupsListQueryTests.cs
index fa8997580..1599b6e39 100644
--- a/bitwarden_license/test/Scim.Test/Groups/GetGroupsListQueryTests.cs
+++ b/bitwarden_license/test/Scim.Test/Groups/GetGroupsListQueryTests.cs
@@ -1,5 +1,5 @@
-using Bit.Core.Entities;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Scim.Groups;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/bitwarden_license/test/Scim.Test/Groups/PatchGroupCommandTests.cs b/bitwarden_license/test/Scim.Test/Groups/PatchGroupCommandTests.cs
index 505a67f57..066887fe7 100644
--- a/bitwarden_license/test/Scim.Test/Groups/PatchGroupCommandTests.cs
+++ b/bitwarden_license/test/Scim.Test/Groups/PatchGroupCommandTests.cs
@@ -1,10 +1,11 @@
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Scim.Groups;
 using Bit.Scim.Models;
 using Bit.Scim.Utilities;
diff --git a/bitwarden_license/test/Scim.Test/Groups/PostGroupCommandTests.cs b/bitwarden_license/test/Scim.Test/Groups/PostGroupCommandTests.cs
index 40281e4d1..2d06f23a2 100644
--- a/bitwarden_license/test/Scim.Test/Groups/PostGroupCommandTests.cs
+++ b/bitwarden_license/test/Scim.Test/Groups/PostGroupCommandTests.cs
@@ -1,9 +1,10 @@
-using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
-using Bit.Core.Repositories;
 using Bit.Scim.Context;
 using Bit.Scim.Groups;
 using Bit.Scim.Models;
diff --git a/bitwarden_license/test/Scim.Test/Groups/PutGroupCommandTests.cs b/bitwarden_license/test/Scim.Test/Groups/PutGroupCommandTests.cs
index ecf77d563..05f667277 100644
--- a/bitwarden_license/test/Scim.Test/Groups/PutGroupCommandTests.cs
+++ b/bitwarden_license/test/Scim.Test/Groups/PutGroupCommandTests.cs
@@ -1,9 +1,10 @@
-using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
-using Bit.Core.Repositories;
 using Bit.Scim.Context;
 using Bit.Scim.Groups;
 using Bit.Scim.Models;
diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
index 7c296dd3c..b3a232c2c 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/Controllers/OrganizationsController.cs
@@ -2,6 +2,8 @@
 using Bit.Admin.Models;
 using Bit.Admin.Services;
 using Bit.Admin.Utilities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs
index 4e90f5bde..f8bfa453d 100644
--- a/src/Admin/Models/OrganizationEditModel.cs
+++ b/src/Admin/Models/OrganizationEditModel.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
diff --git a/src/Admin/Models/OrganizationViewModel.cs b/src/Admin/Models/OrganizationViewModel.cs
index 7320b8594..541f7a2fc 100644
--- a/src/Admin/Models/OrganizationViewModel.cs
+++ b/src/Admin/Models/OrganizationViewModel.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Api/AdminConsole/Controllers/GroupsController.cs b/src/Api/AdminConsole/Controllers/GroupsController.cs
index cd12c8a99..9946c192b 100644
--- a/src/Api/AdminConsole/Controllers/GroupsController.cs
+++ b/src/Api/AdminConsole/Controllers/GroupsController.cs
@@ -1,11 +1,12 @@
 using Bit.Api.AdminConsole.Models.Request;
 using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.Models.Response;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
index 6de174ae7..85436b41b 100644
--- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
+++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
@@ -2,6 +2,7 @@
 using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
diff --git a/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs b/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs
index e15aef7ac..97c344f95 100644
--- a/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs
+++ b/src/Api/AdminConsole/Models/Request/GroupRequestModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Models.Request;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
 namespace Bit.Api.AdminConsole.Models.Request;
 
diff --git a/src/Api/AdminConsole/Models/Request/ImportOrganizationUsersRequestModel.cs b/src/Api/AdminConsole/Models/Request/ImportOrganizationUsersRequestModel.cs
index decb6d640..48d34c171 100644
--- a/src/Api/AdminConsole/Models/Request/ImportOrganizationUsersRequestModel.cs
+++ b/src/Api/AdminConsole/Models/Request/ImportOrganizationUsersRequestModel.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.Models.Business;
 
 namespace Bit.Api.AdminConsole.Models.Request;
@@ -24,7 +25,7 @@ public class ImportOrganizationUsersRequestModel
         {
             var importedGroup = new ImportedGroup
             {
-                Group = new Core.Entities.Group
+                Group = new Core.AdminConsole.Entities.Group
                 {
                     OrganizationId = organizationId,
                     Name = Name,
diff --git a/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs b/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs
index a4d53438c..b5d00fca9 100644
--- a/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs
+++ b/src/Api/AdminConsole/Models/Response/GroupResponseModel.cs
@@ -1,5 +1,5 @@
 using Bit.Api.Models.Response;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 
diff --git a/src/Api/AdminConsole/Public/Controllers/GroupsController.cs b/src/Api/AdminConsole/Public/Controllers/GroupsController.cs
index c87d0c2d3..01c38a084 100644
--- a/src/Api/AdminConsole/Public/Controllers/GroupsController.cs
+++ b/src/Api/AdminConsole/Public/Controllers/GroupsController.cs
@@ -2,8 +2,9 @@
 using Bit.Api.AdminConsole.Public.Models.Request;
 using Bit.Api.AdminConsole.Public.Models.Response;
 using Bit.Api.Models.Public.Response;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/Api/AdminConsole/Public/Controllers/MembersController.cs b/src/Api/AdminConsole/Public/Controllers/MembersController.cs
index cefed4a5a..52cf952f7 100644
--- a/src/Api/AdminConsole/Public/Controllers/MembersController.cs
+++ b/src/Api/AdminConsole/Public/Controllers/MembersController.cs
@@ -2,6 +2,7 @@
 using Bit.Api.AdminConsole.Public.Models.Request;
 using Bit.Api.AdminConsole.Public.Models.Response;
 using Bit.Api.Models.Public.Response;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Models.Business;
 using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
diff --git a/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs
index d99165cc6..01850003d 100644
--- a/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs
+++ b/src/Api/AdminConsole/Public/Models/Request/GroupCreateUpdateRequestModel.cs
@@ -1,5 +1,5 @@
 using Bit.Api.Auth.Models.Public.Request;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
 namespace Bit.Api.AdminConsole.Public.Models.Request;
 
diff --git a/src/Api/AdminConsole/Public/Models/Request/OrganizationImportRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/OrganizationImportRequestModel.cs
index eeb972d7a..2adda81e4 100644
--- a/src/Api/AdminConsole/Public/Models/Request/OrganizationImportRequestModel.cs
+++ b/src/Api/AdminConsole/Public/Models/Request/OrganizationImportRequestModel.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.Models.Business;
 using Bit.Core.Utilities;
 
diff --git a/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs
index ca252ec0e..b1100ef02 100644
--- a/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs
+++ b/src/Api/AdminConsole/Public/Models/Response/GroupResponseModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Auth.Models.Public.Response;
 using Bit.Api.Models.Public.Response;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Models.Data;
 
 namespace Bit.Api.AdminConsole.Public.Models.Response;
diff --git a/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs b/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs
index 3e07d505d..c8d43293e 100644
--- a/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs
+++ b/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs
@@ -1,6 +1,7 @@
 using Bit.Api.Models.Response;
 using Bit.Api.SecretsManager.Models.Request;
 using Bit.Api.SecretsManager.Models.Response;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
diff --git a/src/Api/SecretsManager/Models/Response/PotentialGranteeResponseModel.cs b/src/Api/SecretsManager/Models/Response/PotentialGranteeResponseModel.cs
index e62437083..a64c0d86d 100644
--- a/src/Api/SecretsManager/Models/Response/PotentialGranteeResponseModel.cs
+++ b/src/Api/SecretsManager/Models/Response/PotentialGranteeResponseModel.cs
@@ -1,4 +1,4 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.SecretsManager.Entities;
diff --git a/src/Core/Entities/Group.cs b/src/Core/AdminConsole/Entities/Group.cs
similarity index 90%
rename from src/Core/Entities/Group.cs
rename to src/Core/AdminConsole/Entities/Group.cs
index 3c15380fa..19b9b6d00 100644
--- a/src/Core/Entities/Group.cs
+++ b/src/Core/AdminConsole/Entities/Group.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Models;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
+namespace Bit.Core.AdminConsole.Entities;
 
 public class Group : ITableObject<Guid>, IExternal
 {
diff --git a/src/Core/Entities/GroupUser.cs b/src/Core/AdminConsole/Entities/GroupUser.cs
similarity index 71%
rename from src/Core/Entities/GroupUser.cs
rename to src/Core/AdminConsole/Entities/GroupUser.cs
index 3497c2c74..ad889c93c 100644
--- a/src/Core/Entities/GroupUser.cs
+++ b/src/Core/AdminConsole/Entities/GroupUser.cs
@@ -1,4 +1,4 @@
-namespace Bit.Core.Entities;
+namespace Bit.Core.AdminConsole.Entities;
 
 public class GroupUser
 {
diff --git a/src/Core/Models/Business/ImportedGroup.cs b/src/Core/AdminConsole/Models/Business/ImportedGroup.cs
similarity index 58%
rename from src/Core/Models/Business/ImportedGroup.cs
rename to src/Core/AdminConsole/Models/Business/ImportedGroup.cs
index bd0e38933..bd4e81bf5 100644
--- a/src/Core/Models/Business/ImportedGroup.cs
+++ b/src/Core/AdminConsole/Models/Business/ImportedGroup.cs
@@ -1,6 +1,6 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Core.Models.Business;
+namespace Bit.Core.AdminConsole.Models.Business;
 
 public class ImportedGroup
 {
diff --git a/src/Core/Models/Data/GroupWithCollections.cs b/src/Core/AdminConsole/Models/Data/GroupWithCollections.cs
similarity index 58%
rename from src/Core/Models/Data/GroupWithCollections.cs
rename to src/Core/AdminConsole/Models/Data/GroupWithCollections.cs
index 3fa08bc45..e9ba51257 100644
--- a/src/Core/Models/Data/GroupWithCollections.cs
+++ b/src/Core/AdminConsole/Models/Data/GroupWithCollections.cs
@@ -1,7 +1,7 @@
 using System.Data;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data;
 
 public class GroupWithCollections : Group
 {
diff --git a/src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Groups/CreateGroupCommand.cs
similarity index 89%
rename from src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs
rename to src/Core/AdminConsole/OrganizationFeatures/Groups/CreateGroupCommand.cs
index 10633a7e9..94e03afd8 100644
--- a/src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Groups/CreateGroupCommand.cs
@@ -1,16 +1,18 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Tools.Enums;
 using Bit.Core.Tools.Models.Business;
 using Bit.Core.Tools.Services;
 
-namespace Bit.Core.OrganizationFeatures.Groups;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups;
 
 public class CreateGroupCommand : ICreateGroupCommand
 {
@@ -46,7 +48,7 @@ public class CreateGroupCommand : ICreateGroupCommand
             await GroupRepositoryUpdateUsersAsync(group, users);
         }
 
-        await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Created);
+        await _eventService.LogGroupEventAsync(group, Core.Enums.EventType.Group_Created);
     }
 
     public async Task CreateGroupAsync(Group group, Organization organization, EventSystemUser systemUser,
@@ -61,7 +63,7 @@ public class CreateGroupCommand : ICreateGroupCommand
             await GroupRepositoryUpdateUsersAsync(group, users, systemUser);
         }
 
-        await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Created, systemUser);
+        await _eventService.LogGroupEventAsync(group, Core.Enums.EventType.Group_Created, systemUser);
     }
 
     private async Task GroupRepositoryCreateGroupAsync(Group group, Organization organization, IEnumerable<CollectionAccessSelection> collections = null)
diff --git a/src/Core/OrganizationFeatures/Groups/DeleteGroupCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Groups/DeleteGroupCommand.cs
similarity index 90%
rename from src/Core/OrganizationFeatures/Groups/DeleteGroupCommand.cs
rename to src/Core/AdminConsole/OrganizationFeatures/Groups/DeleteGroupCommand.cs
index 86fb615f8..85f68eaf0 100644
--- a/src/Core/OrganizationFeatures/Groups/DeleteGroupCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Groups/DeleteGroupCommand.cs
@@ -1,11 +1,11 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.Groups;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups;
 
 public class DeleteGroupCommand : IDeleteGroupCommand
 {
diff --git a/src/Core/OrganizationFeatures/Groups/Interfaces/ICreateGroupCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/ICreateGroupCommand.cs
similarity index 77%
rename from src/Core/OrganizationFeatures/Groups/Interfaces/ICreateGroupCommand.cs
rename to src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/ICreateGroupCommand.cs
index d8da08e8f..54f5bc2ec 100644
--- a/src/Core/OrganizationFeatures/Groups/Interfaces/ICreateGroupCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/ICreateGroupCommand.cs
@@ -1,8 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.OrganizationFeatures.Groups.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
 
 public interface ICreateGroupCommand
 {
diff --git a/src/Core/OrganizationFeatures/Groups/Interfaces/IDeleteGroupCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IDeleteGroupCommand.cs
similarity index 72%
rename from src/Core/OrganizationFeatures/Groups/Interfaces/IDeleteGroupCommand.cs
rename to src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IDeleteGroupCommand.cs
index 6dc9d01f9..566cdb1f2 100644
--- a/src/Core/OrganizationFeatures/Groups/Interfaces/IDeleteGroupCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IDeleteGroupCommand.cs
@@ -1,7 +1,7 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Enums;
 
-namespace Bit.Core.OrganizationFeatures.Groups.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
 
 public interface IDeleteGroupCommand
 {
diff --git a/src/Core/OrganizationFeatures/Groups/Interfaces/IUpdateGroupCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IUpdateGroupCommand.cs
similarity index 77%
rename from src/Core/OrganizationFeatures/Groups/Interfaces/IUpdateGroupCommand.cs
rename to src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IUpdateGroupCommand.cs
index 7abb012fa..97b32fd95 100644
--- a/src/Core/OrganizationFeatures/Groups/Interfaces/IUpdateGroupCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IUpdateGroupCommand.cs
@@ -1,8 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.OrganizationFeatures.Groups.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
 
 public interface IUpdateGroupCommand
 {
diff --git a/src/Core/OrganizationFeatures/Groups/UpdateGroupCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Groups/UpdateGroupCommand.cs
similarity index 89%
rename from src/Core/OrganizationFeatures/Groups/UpdateGroupCommand.cs
rename to src/Core/AdminConsole/OrganizationFeatures/Groups/UpdateGroupCommand.cs
index 857adcc8c..3deb6994a 100644
--- a/src/Core/OrganizationFeatures/Groups/UpdateGroupCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Groups/UpdateGroupCommand.cs
@@ -1,12 +1,14 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.Groups;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups;
 
 public class UpdateGroupCommand : IUpdateGroupCommand
 {
@@ -36,7 +38,7 @@ public class UpdateGroupCommand : IUpdateGroupCommand
             await GroupRepositoryUpdateUsersAsync(group, userIds);
         }
 
-        await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Updated);
+        await _eventService.LogGroupEventAsync(group, Core.Enums.EventType.Group_Updated);
     }
 
     public async Task UpdateGroupAsync(Group group, Organization organization, EventSystemUser systemUser,
@@ -51,7 +53,7 @@ public class UpdateGroupCommand : IUpdateGroupCommand
             await GroupRepositoryUpdateUsersAsync(group, userIds, systemUser);
         }
 
-        await _eventService.LogGroupEventAsync(group, Enums.EventType.Group_Updated, systemUser);
+        await _eventService.LogGroupEventAsync(group, Core.Enums.EventType.Group_Updated, systemUser);
     }
 
     private async Task GroupRepositoryUpdateGroupAsync(Group group, IEnumerable<CollectionAccessSelection> collections = null)
diff --git a/src/Core/Repositories/IGroupRepository.cs b/src/Core/AdminConsole/Repositories/IGroupRepository.cs
similarity index 90%
rename from src/Core/Repositories/IGroupRepository.cs
rename to src/Core/AdminConsole/Repositories/IGroupRepository.cs
index f1b506de0..7e691db17 100644
--- a/src/Core/Repositories/IGroupRepository.cs
+++ b/src/Core/AdminConsole/Repositories/IGroupRepository.cs
@@ -1,7 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Models.Data;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.AdminConsole.Repositories;
 
 public interface IGroupRepository : IRepository<Group, Guid>
 {
diff --git a/src/Core/Services/IGroupService.cs b/src/Core/AdminConsole/Services/IGroupService.cs
similarity index 85%
rename from src/Core/Services/IGroupService.cs
rename to src/Core/AdminConsole/Services/IGroupService.cs
index 14967b6e8..d189a63de 100644
--- a/src/Core/Services/IGroupService.cs
+++ b/src/Core/AdminConsole/Services/IGroupService.cs
@@ -1,7 +1,7 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Enums;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.AdminConsole.Services;
 
 public interface IGroupService
 {
diff --git a/src/Core/Services/Implementations/GroupService.cs b/src/Core/AdminConsole/Services/Implementations/GroupService.cs
similarity index 92%
rename from src/Core/Services/Implementations/GroupService.cs
rename to src/Core/AdminConsole/Services/Implementations/GroupService.cs
index c878c321d..62ab4ed48 100644
--- a/src/Core/Services/Implementations/GroupService.cs
+++ b/src/Core/AdminConsole/Services/Implementations/GroupService.cs
@@ -1,9 +1,12 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
+using Bit.Core.Services;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.AdminConsole.Services.Implementations;
 
 public class GroupService : IGroupService
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs
index 39b3d33ee..b7bd08db8 100644
--- a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs
+++ b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
 using Bit.Core.AdminConsole.OrganizationAuth;
 using Bit.Core.AdminConsole.OrganizationAuth.Interfaces;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Models.Business.Tokenables;
-using Bit.Core.OrganizationFeatures.Groups;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys;
 using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationCollections;
diff --git a/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs b/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs
index 02b3818f1..b9e3c74da 100644
--- a/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs
@@ -1,4 +1,5 @@
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Context;
diff --git a/src/Core/SecretsManager/Entities/AccessPolicy.cs b/src/Core/SecretsManager/Entities/AccessPolicy.cs
index 6de856d8d..f450af557 100644
--- a/src/Core/SecretsManager/Entities/AccessPolicy.cs
+++ b/src/Core/SecretsManager/Entities/AccessPolicy.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
diff --git a/src/Core/Services/IEventService.cs b/src/Core/Services/IEventService.cs
index 10d8b6dbd..91a1a0782 100644
--- a/src/Core/Services/IEventService.cs
+++ b/src/Core/Services/IEventService.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.SecretsManager.Entities;
diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs
index 3c48367d5..044c4f147 100644
--- a/src/Core/Services/IOrganizationService.cs
+++ b/src/Core/Services/IOrganizationService.cs
@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/Implementations/EventService.cs b/src/Core/Services/Implementations/EventService.cs
index d5dec0a10..e2545ba6e 100644
--- a/src/Core/Services/Implementations/EventService.cs
+++ b/src/Core/Services/Implementations/EventService.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index d1e1085ac..45614387b 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -1,5 +1,8 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Models.Business;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Auth.Repositories;
diff --git a/src/Core/Services/NoopImplementations/NoopEventService.cs b/src/Core/Services/NoopImplementations/NoopEventService.cs
index 068e03e35..5d5dba16f 100644
--- a/src/Core/Services/NoopImplementations/NoopEventService.cs
+++ b/src/Core/Services/NoopImplementations/NoopEventService.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.SecretsManager.Entities;
diff --git a/src/Infrastructure.Dapper/Repositories/GroupRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/GroupRepository.cs
similarity index 97%
rename from src/Infrastructure.Dapper/Repositories/GroupRepository.cs
rename to src/Infrastructure.Dapper/AdminConsole/Repositories/GroupRepository.cs
index c5ef42c6b..c1a970f95 100644
--- a/src/Infrastructure.Dapper/Repositories/GroupRepository.cs
+++ b/src/Infrastructure.Dapper/AdminConsole/Repositories/GroupRepository.cs
@@ -1,13 +1,16 @@
 using System.Data;
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Models.Data;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.Repositories;
 using Bit.Core.Settings;
+using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;
 using Microsoft.Data.SqlClient;
 
-namespace Bit.Infrastructure.Dapper.Repositories;
+namespace Bit.Infrastructure.Dapper.AdminConsole.Repositories;
 
 public class GroupRepository : Repository<Group, Guid>, IGroupRepository
 {
diff --git a/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs b/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs
index d7082184d..8b8c54568 100644
--- a/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs
+++ b/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs
@@ -1,8 +1,10 @@
-using Bit.Core.Auth.Repositories;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Auth.Repositories;
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.Tools.Repositories;
 using Bit.Core.Vault.Repositories;
+using Bit.Infrastructure.Dapper.AdminConsole.Repositories;
 using Bit.Infrastructure.Dapper.Auth.Repositories;
 using Bit.Infrastructure.Dapper.Repositories;
 using Bit.Infrastructure.Dapper.SecretsManager.Repositories;
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs
index 008242c26..a5afbe390 100644
--- a/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs
@@ -1,5 +1,6 @@
 using System.Data;
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
diff --git a/src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/GroupRepository.cs
similarity index 85%
rename from src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs
rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/GroupRepository.cs
index 9efd5e90c..4c1e4d343 100644
--- a/src/Infrastructure.EntityFramework/Repositories/GroupRepository.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/GroupRepository.cs
@@ -1,19 +1,21 @@
 using AutoMapper;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Models.Data;
-using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using AdminConsoleEntities = Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 
-public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGroupRepository
+public class GroupRepository : Repository<AdminConsoleEntities.Group, Group, Guid>, IGroupRepository
 {
     public GroupRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
         : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.Groups)
     { }
 
-    public async Task CreateAsync(Core.Entities.Group obj, IEnumerable<CollectionAccessSelection> collections)
+    public async Task CreateAsync(AdminConsoleEntities.Group obj, IEnumerable<CollectionAccessSelection> collections)
     {
         var grp = await base.CreateAsync(obj);
         using (var scope = ServiceScopeFactory.CreateScope())
@@ -51,7 +53,7 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
         }
     }
 
-    public async Task<Tuple<Core.Entities.Group, ICollection<CollectionAccessSelection>>> GetByIdWithCollectionsAsync(Guid id)
+    public async Task<Tuple<AdminConsoleEntities.Group, ICollection<CollectionAccessSelection>>> GetByIdWithCollectionsAsync(Guid id)
     {
         var grp = await base.GetByIdAsync(id);
         using (var scope = ServiceScopeFactory.CreateScope())
@@ -67,12 +69,12 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
                 ReadOnly = c.ReadOnly,
                 HidePasswords = c.HidePasswords,
             }).ToList();
-            return new Tuple<Core.Entities.Group, ICollection<CollectionAccessSelection>>(
+            return new Tuple<AdminConsoleEntities.Group, ICollection<CollectionAccessSelection>>(
                 grp, collections);
         }
     }
 
-    public async Task<ICollection<Core.Entities.Group>> GetManyByOrganizationIdAsync(Guid organizationId)
+    public async Task<ICollection<AdminConsoleEntities.Group>> GetManyByOrganizationIdAsync(Guid organizationId)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
@@ -81,11 +83,11 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
                 from g in dbContext.Groups
                 where g.OrganizationId == organizationId
                 select g).ToListAsync();
-            return Mapper.Map<List<Core.Entities.Group>>(data);
+            return Mapper.Map<List<AdminConsoleEntities.Group>>(data);
         }
     }
 
-    public async Task<ICollection<Tuple<Core.Entities.Group, ICollection<CollectionAccessSelection>>>>
+    public async Task<ICollection<Tuple<AdminConsoleEntities.Group, ICollection<CollectionAccessSelection>>>>
         GetManyWithCollectionsByOrganizationIdAsync(Guid organizationId)
     {
         var groups = await GetManyByOrganizationIdAsync(organizationId);
@@ -100,7 +102,7 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
             var collections = query.GroupBy(c => c.GroupId).ToList();
 
             return groups.Select(group =>
-                new Tuple<Core.Entities.Group, ICollection<CollectionAccessSelection>>(
+                new Tuple<AdminConsoleEntities.Group, ICollection<CollectionAccessSelection>>(
                     group,
                     collections
                         .FirstOrDefault(c => c.Key == group.Id)?
@@ -115,7 +117,7 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
         }
     }
 
-    public async Task<ICollection<Core.Entities.Group>> GetManyByManyIds(IEnumerable<Guid> groupIds)
+    public async Task<ICollection<AdminConsoleEntities.Group>> GetManyByManyIds(IEnumerable<Guid> groupIds)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
@@ -124,11 +126,11 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
                         where groupIds.Contains(g.Id)
                         select g;
             var groups = await query.ToListAsync();
-            return Mapper.Map<List<Core.Entities.Group>>(groups);
+            return Mapper.Map<List<AdminConsoleEntities.Group>>(groups);
         }
     }
 
-    public async Task<ICollection<Core.Entities.GroupUser>> GetManyGroupUsersByOrganizationIdAsync(Guid organizationId)
+    public async Task<ICollection<AdminConsoleEntities.GroupUser>> GetManyGroupUsersByOrganizationIdAsync(Guid organizationId)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
@@ -140,7 +142,7 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
                 where g.OrganizationId == organizationId
                 select gu;
             var groupUsers = await query.ToListAsync();
-            return Mapper.Map<List<Core.Entities.GroupUser>>(groupUsers);
+            return Mapper.Map<List<AdminConsoleEntities.GroupUser>>(groupUsers);
         }
     }
 
@@ -172,7 +174,7 @@ public class GroupRepository : Repository<Core.Entities.Group, Group, Guid>, IGr
         }
     }
 
-    public async Task ReplaceAsync(Core.Entities.Group group, IEnumerable<CollectionAccessSelection> requestedCollections)
+    public async Task ReplaceAsync(AdminConsoleEntities.Group group, IEnumerable<CollectionAccessSelection> requestedCollections)
     {
         await base.ReplaceAsync(group);
         using (var scope = ServiceScopeFactory.CreateScope())
diff --git a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
index 74716e207..9026a7abd 100644
--- a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
+++ b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
@@ -1,9 +1,11 @@
-using Bit.Core.Auth.Repositories;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Auth.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.Tools.Repositories;
 using Bit.Core.Vault.Repositories;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 using Bit.Infrastructure.EntityFramework.Auth.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.SecretsManager.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Models/Group.cs b/src/Infrastructure.EntityFramework/Models/Group.cs
index eaa41bed8..8df9dbd7b 100644
--- a/src/Infrastructure.EntityFramework/Models/Group.cs
+++ b/src/Infrastructure.EntityFramework/Models/Group.cs
@@ -2,7 +2,7 @@
 
 namespace Bit.Infrastructure.EntityFramework.Models;
 
-public class Group : Core.Entities.Group
+public class Group : Core.AdminConsole.Entities.Group
 {
     public virtual Organization Organization { get; set; }
     public virtual ICollection<GroupUser> GroupUsers { get; set; }
@@ -12,6 +12,6 @@ public class GroupMapperProfile : Profile
 {
     public GroupMapperProfile()
     {
-        CreateMap<Core.Entities.Group, Group>().ReverseMap();
+        CreateMap<Core.AdminConsole.Entities.Group, Group>().ReverseMap();
     }
 }
diff --git a/src/Infrastructure.EntityFramework/Models/GroupUser.cs b/src/Infrastructure.EntityFramework/Models/GroupUser.cs
index 3f25e7d87..4499b20f8 100644
--- a/src/Infrastructure.EntityFramework/Models/GroupUser.cs
+++ b/src/Infrastructure.EntityFramework/Models/GroupUser.cs
@@ -2,7 +2,7 @@
 
 namespace Bit.Infrastructure.EntityFramework.Models;
 
-public class GroupUser : Core.Entities.GroupUser
+public class GroupUser : Core.AdminConsole.Entities.GroupUser
 {
     public virtual Group Group { get; set; }
     public virtual OrganizationUser OrganizationUser { get; set; }
@@ -12,7 +12,7 @@ public class GroupUserMapperProfile : Profile
 {
     public GroupUserMapperProfile()
     {
-        CreateMap<Core.Entities.GroupUser, GroupUser>().ReverseMap();
+        CreateMap<Core.AdminConsole.Entities.GroupUser, GroupUser>().ReverseMap();
     }
 }
 
diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
index ea97af041..20b8d31c8 100644
--- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
+++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
@@ -3,6 +3,8 @@ using System.Reflection;
 using System.Security.Claims;
 using System.Security.Cryptography.X509Certificates;
 using AspNetCoreRateLimit;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.AdminConsole.Services.Implementations;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Identity;
 using Bit.Core.Auth.IdentityServer;
diff --git a/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs
index 1bf97e0e8..9777cb9e6 100644
--- a/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs
@@ -1,9 +1,11 @@
 using Bit.Api.AdminConsole.Controllers;
 using Bit.Api.AdminConsole.Models.Request;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs b/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs
index 2ba4cfd01..37351b325 100644
--- a/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs
@@ -1,10 +1,12 @@
 using Bit.Api.AdminConsole.Public.Controllers;
 using Bit.Api.AdminConsole.Public.Models.Request;
 using Bit.Api.AdminConsole.Public.Models.Response;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Api.Test/SecretsManager/Controllers/AccessPoliciesControllerTests.cs b/test/Api.Test/SecretsManager/Controllers/AccessPoliciesControllerTests.cs
index e369120a9..6c3d85e42 100644
--- a/test/Api.Test/SecretsManager/Controllers/AccessPoliciesControllerTests.cs
+++ b/test/Api.Test/SecretsManager/Controllers/AccessPoliciesControllerTests.cs
@@ -2,8 +2,9 @@
 using Bit.Api.SecretsManager.Controllers;
 using Bit.Api.SecretsManager.Models.Request;
 using Bit.Api.Test.SecretsManager.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
-using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
diff --git a/test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Groups/CreateGroupCommandTests.cs
similarity index 95%
rename from test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs
rename to test/Core.Test/AdminConsole/OrganizationFeatures/Groups/CreateGroupCommandTests.cs
index 92011e49f..6d521887a 100644
--- a/test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Groups/CreateGroupCommandTests.cs
@@ -1,9 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Core.Tools.Enums;
@@ -15,7 +16,7 @@ using Bit.Test.Common.Helpers;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Core.Test.OrganizationFeatures.Groups;
+namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.Groups;
 
 [SutProviderCustomize]
 public class CreateGroupCommandTests
diff --git a/test/Core.Test/OrganizationFeatures/Groups/DeleteGroupCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Groups/DeleteGroupCommandTests.cs
similarity index 93%
rename from test/Core.Test/OrganizationFeatures/Groups/DeleteGroupCommandTests.cs
rename to test/Core.Test/AdminConsole/OrganizationFeatures/Groups/DeleteGroupCommandTests.cs
index 27b070d21..fcd63203f 100644
--- a/test/Core.Test/OrganizationFeatures/Groups/DeleteGroupCommandTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Groups/DeleteGroupCommandTests.cs
@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.Groups;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Test.Common.AutoFixture;
@@ -10,7 +10,7 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Core.Test.OrganizationFeatures.Groups;
+namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.Groups;
 
 [SutProviderCustomize]
 public class DeleteGroupCommandTests
@@ -42,7 +42,7 @@ public class DeleteGroupCommandTests
     {
         sutProvider.GetDependency<IGroupRepository>()
             .GetByIdAsync(groupId)
-            .Returns(new Core.Entities.Group
+            .Returns(new Group
             {
                 Id = groupId,
                 OrganizationId = Guid.NewGuid()
diff --git a/test/Core.Test/OrganizationFeatures/Groups/UpdateGroupCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Groups/UpdateGroupCommandTests.cs
similarity index 94%
rename from test/Core.Test/OrganizationFeatures/Groups/UpdateGroupCommandTests.cs
rename to test/Core.Test/AdminConsole/OrganizationFeatures/Groups/UpdateGroupCommandTests.cs
index dde281b78..67ca9ffad 100644
--- a/test/Core.Test/OrganizationFeatures/Groups/UpdateGroupCommandTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Groups/UpdateGroupCommandTests.cs
@@ -1,9 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Test.Common.AutoFixture;
@@ -12,7 +13,7 @@ using Bit.Test.Common.Helpers;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Core.Test.OrganizationFeatures.Groups;
+namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.Groups;
 
 [SutProviderCustomize]
 public class UpdateGroupCommandTests
diff --git a/test/Core.Test/Services/GroupServiceTests.cs b/test/Core.Test/AdminConsole/Services/GroupServiceTests.cs
similarity index 95%
rename from test/Core.Test/Services/GroupServiceTests.cs
rename to test/Core.Test/AdminConsole/Services/GroupServiceTests.cs
index e904ea7a7..46d6dc479 100644
--- a/test/Core.Test/Services/GroupServiceTests.cs
+++ b/test/Core.Test/AdminConsole/Services/GroupServiceTests.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services.Implementations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
@@ -9,7 +12,7 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Core.Test.Services;
+namespace Bit.Core.Test.AdminConsole.Services;
 
 [SutProviderCustomize]
 [OrganizationCustomize(UseGroups = true)]
diff --git a/test/Core.Test/AutoFixture/OrganizationFixtures.cs b/test/Core.Test/AutoFixture/OrganizationFixtures.cs
index e4e75ed0e..658964b73 100644
--- a/test/Core.Test/AutoFixture/OrganizationFixtures.cs
+++ b/test/Core.Test/AutoFixture/OrganizationFixtures.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using AutoFixture;
 using AutoFixture.Kernel;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
 using Bit.Core.Entities;
diff --git a/test/Core.Test/Services/EventServiceTests.cs b/test/Core.Test/Services/EventServiceTests.cs
index 2cda759b1..ad73541d1 100644
--- a/test/Core.Test/Services/EventServiceTests.cs
+++ b/test/Core.Test/Services/EventServiceTests.cs
@@ -1,4 +1,5 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
diff --git a/test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/GroupCompare.cs b/test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/EqualityComparers/GroupCompare.cs
similarity index 73%
rename from test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/GroupCompare.cs
rename to test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/EqualityComparers/GroupCompare.cs
index dcb0be2ff..eb52446af 100644
--- a/test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/GroupCompare.cs
+++ b/test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/EqualityComparers/GroupCompare.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers;
+namespace Bit.Infrastructure.EFIntegration.Test.AdminConsole.Repositories.EqualityComparers;
 
 public class GroupCompare : IEqualityComparer<Group>
 {
diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupFixtures.cs b/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupFixtures.cs
index c6cca4901..67d15c177 100644
--- a/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupFixtures.cs
+++ b/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupFixtures.cs
@@ -1,7 +1,8 @@
 using AutoFixture;
 using AutoFixture.Kernel;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Infrastructure.EFIntegration.Test.AutoFixture.Relays;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupUserFixtures.cs b/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupUserFixtures.cs
index 2b68cde32..f12738304 100644
--- a/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupUserFixtures.cs
+++ b/test/Infrastructure.EFIntegration.Test/AutoFixture/GroupUserFixtures.cs
@@ -1,7 +1,7 @@
 using AutoFixture;
 using AutoFixture.Kernel;
-using Bit.Core.Entities;
-using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;