Merge remote-tracking branch 'origin/master' into feature/flexible-collections

bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs

@@ -1,11 +1,12 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Providers.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Exceptions;
-using Bit.Core.Providers.Interfaces;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 
-namespace Bit.Commercial.Core.Providers;
+namespace Bit.Commercial.Core.AdminConsole.Providers;
 
 public class CreateProviderCommand : ICreateProviderCommand
 {

bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs

@@ -1,11 +1,13 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Business.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
@@ -13,7 +15,7 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.DataProtection;
 
-namespace Bit.Commercial.Core.Services;
+namespace Bit.Commercial.Core.AdminConsole.Services;
 
 public class ProviderService : IProviderService
 {

bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs

@@ -1,7 +1,7 @@
-using Bit.Commercial.Core.Providers;
+using Bit.Commercial.Core.AdminConsole.Providers;
-using Bit.Commercial.Core.Services;
+using Bit.Commercial.Core.AdminConsole.Services;
-using Bit.Core.Providers.Interfaces;
+using Bit.Core.AdminConsole.Providers.Interfaces;
-using Bit.Core.Services;
+using Bit.Core.AdminConsole.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Commercial.Core.Utilities;

bitwarden_license/src/Scim/Controllers/v2/UsersController.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Scim.Models;

bitwarden_license/test/Commercial.Core.Test/AdminConsole/AutoFixture/ProviderUserFixtures.cs

@@ -1,9 +1,9 @@
 using System.Reflection;
 using AutoFixture;
 using AutoFixture.Xunit2;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Commercial.Core.Test.AutoFixture;
+namespace Bit.Commercial.Core.Test.AdminConsole.AutoFixture;
 
 internal class ProviderUser : ICustomization
 {
@@ -18,7 +18,7 @@ internal class ProviderUser : ICustomization
 
     public void Customize(IFixture fixture)
     {
-        fixture.Customize<Bit.Core.Entities.Provider.ProviderUser>(composer => composer
+        fixture.Customize<Bit.Core.AdminConsole.Entities.Provider.ProviderUser>(composer => composer
             .With(o => o.Type, Type)
             .With(o => o.Status, Status));
     }

bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/CreateProviderCommandTests.cs

@@ -1,16 +1,17 @@
-using Bit.Commercial.Core.Providers;
+using Bit.Commercial.Core.AdminConsole.Providers;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Commercial.Core.Test.ProviderFeatures;
+namespace Bit.Commercial.Core.Test.AdminConsole.ProviderFeatures;
 
 [SutProviderCustomize]
 public class CreateProviderCommandTests

bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs

@@ -1,13 +1,14 @@
-using Bit.Commercial.Core.Services;
+using Bit.Commercial.Core.AdminConsole.Services;
-using Bit.Commercial.Core.Test.AutoFixture;
+using Bit.Commercial.Core.Test.AdminConsole.AutoFixture;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Business.Provider;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -17,10 +18,10 @@ using Microsoft.AspNetCore.DataProtection;
 using NSubstitute;
 using NSubstitute.ReturnsExtensions;
 using Xunit;
-using Provider = Bit.Core.Entities.Provider.Provider;
+using Provider = Bit.Core.AdminConsole.Entities.Provider.Provider;
-using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
+using ProviderUser = Bit.Core.AdminConsole.Entities.Provider.ProviderUser;
 
-namespace Bit.Commercial.Core.Test.Services;
+namespace Bit.Commercial.Core.Test.AdminConsole.Services;
 
 [SutProviderCustomize]
 public class ProviderServiceTests

src/Admin/Controllers/ProvidersController.cs

@@ -1,9 +1,11 @@
 using Bit.Admin.Enums;
 using Bit.Admin.Models;
 using Bit.Admin.Utilities;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
-using Bit.Core.Providers.Interfaces;
+using Bit.Core.AdminConsole.Providers.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Admin/Models/CreateProviderModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.SharedWeb.Utilities;
 
 namespace Bit.Admin.Models;

src/Admin/Models/OrganizationEditModel.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Settings;

src/Admin/Models/OrganizationViewModel.cs

@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Vault.Entities;

src/Admin/Models/ProviderEditModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 
 namespace Bit.Admin.Models;
 

src/Admin/Models/ProviderViewModel.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 
 namespace Bit.Admin.Models;
 

src/Admin/Models/ProvidersModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
 
 namespace Bit.Admin.Models;
 

src/Admin/Views/Organizations/_ProviderInformation.cshtml

@@ -1,5 +1,5 @@
 @using Bit.SharedWeb.Utilities
-@model Bit.Core.Entities.Provider.Provider
+@model Bit.Core.AdminConsole.Entities.Provider.Provider
 <dl class="row">
     <dt class="col-sm-4 col-lg-3">Provider Name</dt>
     <dd class="col-sm-8 col-lg-9">@Model.Name</dd>

src/Admin/Views/Providers/Admins.cshtml

@@ -1,4 +1,5 @@
 @using Bit.Admin.Enums;
+@using Bit.Core.AdminConsole.Enums.Provider
 @inject Bit.Admin.Services.IAccessControlService AccessControlService
 @model ProviderViewModel
 

src/Admin/Views/Providers/Create.cshtml

@@ -1,4 +1,5 @@
 @using Bit.SharedWeb.Utilities
+@using Bit.Core.AdminConsole.Enums.Provider
 @model CreateProviderModel
 @{
     ViewData["Title"] = "Create Provider";

src/Admin/Views/Providers/Organizations.cshtml

@@ -1,3 +1,4 @@
+@using Bit.Core.AdminConsole.Enums.Provider
 @model ProviderViewModel
 
 @await Html.PartialAsync("_ProviderScripts")

src/Admin/Views/Providers/_ViewInformation.cshtml

@@ -1,4 +1,5 @@
 @using Bit.SharedWeb.Utilities
+@using Bit.Core.AdminConsole.Enums.Provider
 @model ProviderViewModel
 <dl class="row">
     <dt class="col-sm-4 col-lg-3">Id</dt>

src/Admin/Views/Shared/_OrganizationForm.cshtml

@@ -1,5 +1,6 @@
 @using Bit.SharedWeb.Utilities
 @using Bit.Admin.Enums;
+@using Bit.Core.AdminConsole.Enums.Provider
 @inject Bit.Admin.Services.IAccessControlService AccessControlService;
 
 @model OrganizationEditModel

src/Admin/Views/_ViewImports.cshtml

@@ -1,7 +1,6 @@
 @using Microsoft.AspNetCore.Identity
 @using Bit.Admin
 @using Bit.Admin.Models
-@using Bit.Core.Enums.Provider
 @using Bit.Core.Enums
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper "*, Admin"

src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs

@@ -12,7 +12,7 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.AdminConsole.Controllers;
 
 [Route("organizations/{orgId}/auth-requests")]
 [Authorize("Application")]

src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs

@@ -1,19 +1,19 @@
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.AdminConsole.Models.Request.Organizations;
-using Bit.Api.Models.Response.Organizations;
+using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.OrganizationConnectionConfigs;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.AdminConsole.Controllers;
 
 [Authorize("Application")]
 [Route("organizations/connections")]

src/Api/AdminConsole/Controllers/OrganizationDomainController.cs

@@ -1,16 +1,16 @@
-using Bit.Api.Models.Request;
+using Bit.Api.AdminConsole.Models.Request;
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.AdminConsole.Models.Request.Organizations;
+using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Api.Models.Response;
-using Bit.Api.Models.Response.Organizations;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.AdminConsole.Controllers;
 
 [Route("organizations")]
 [Authorize("Application")]

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.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Enums;
@@ -10,7 +11,6 @@ using Bit.Core.Models.Business;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -11,6 +11,8 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Core;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Auth.Services;
@@ -19,7 +21,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data.Organizations.Policies;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
 using Bit.Core.Repositories;

src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs

@@ -1,9 +1,10 @@
 using Bit.Api.AdminConsole.Models.Request.Providers;
 using Bit.Api.AdminConsole.Models.Response.Providers;
 using Bit.Api.Models.Response;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;

src/Api/AdminConsole/Controllers/ProviderUsersController.cs

@@ -1,10 +1,11 @@
 using Bit.Api.AdminConsole.Models.Request.Providers;
 using Bit.Api.AdminConsole.Models.Response.Providers;
 using Bit.Api.Models.Response;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Business.Provider;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Api/AdminConsole/Controllers/ProvidersController.cs

@@ -1,8 +1,9 @@
 using Bit.Api.AdminConsole.Models.Request.Providers;
 using Bit.Api.AdminConsole.Models.Response.Providers;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;

src/Api/AdminConsole/Models/Request/OrganizationDomainRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.AdminConsole.Models.Request;
 
 public class OrganizationDomainRequestModel
 {

src/Api/AdminConsole/Models/Request/Organizations/OrganizationConnectionRequestModel.cs

@@ -5,7 +5,7 @@ using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request.Organizations;
+namespace Bit.Api.AdminConsole.Models.Request.Organizations;
 
 public class OrganizationConnectionRequestModel
 {

src/Api/AdminConsole/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request.Organizations;
+namespace Bit.Api.AdminConsole.Models.Request.Organizations;
 
 public class OrganizationDomainSsoDetailsRequestModel
 {

src/Api/AdminConsole/Models/Request/Providers/ProviderSetupRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
 
 namespace Bit.Api.AdminConsole.Models.Request.Providers;
 

src/Api/AdminConsole/Models/Request/Providers/ProviderUpdateRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Settings;
 
 namespace Bit.Api.AdminConsole.Models.Request.Providers;

src/Api/AdminConsole/Models/Request/Providers/ProviderUserRequestModels.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.AdminConsole.Models.Request.Providers;

src/Api/AdminConsole/Models/Response/Organizations/OrganizationConnectionResponseModel.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
-namespace Bit.Api.Models.Response.Organizations;
+namespace Bit.Api.AdminConsole.Models.Response.Organizations;
 
 public class OrganizationConnectionResponseModel
 {

src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response.Organizations;
+namespace Bit.Api.AdminConsole.Models.Response.Organizations;
 
 public class OrganizationDomainResponseModel : ResponseModel
 {

src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data.Organizations;
 
-namespace Bit.Api.Models.Response.Organizations;
+namespace Bit.Api.AdminConsole.Models.Response.Organizations;
 
 public class OrganizationDomainSsoDetailsResponseModel : ResponseModel
 {

src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Auth.Enums;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;

src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 

src/Api/AdminConsole/Models/Response/Providers/ProfileProviderResponseModel.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;

src/Api/AdminConsole/Models/Response/Providers/ProviderOrganizationResponseModel.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Data;
 
 namespace Bit.Api.AdminConsole.Models.Response.Providers;
 

src/Api/AdminConsole/Models/Response/Providers/ProviderResponseModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.AdminConsole.Models.Response.Providers;

src/Api/AdminConsole/Models/Response/Providers/ProviderUserResponseModel.cs

@@ -1,5 +1,6 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;

src/Api/AdminConsole/Public/Controllers/MembersController.cs

@@ -2,10 +2,10 @@
 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.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Models.Business;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;

src/Api/Controllers/AccountsController.cs

@@ -5,12 +5,13 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Auth.Models.Api.Response.Accounts;
 using Bit.Core.Auth.Services;
 using Bit.Core.Auth.Utilities;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.Response;
 using Bit.Core.Models.Business;

src/Api/Controllers/EventsController.cs

@@ -1,5 +1,6 @@
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;

src/Api/Controllers/LicensesController.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Context;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Context;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.OrganizationLicenses;
 using Bit.Core.Models.Business;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;

src/Api/Controllers/OrganizationSponsorshipsController.cs

@@ -1,11 +1,11 @@
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response.Organizations;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Api.Request.OrganizationSponsorships;
 using Bit.Core.Models.Api.Response.OrganizationSponsorships;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;

src/Api/Models/Response/ProfileResponseModel.cs

@@ -1,8 +1,8 @@
 using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.AdminConsole.Models.Response.Providers;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
 namespace Bit.Api.Models.Response;

src/Api/Tools/Controllers/ImportCiphersController.cs

@@ -5,7 +5,6 @@ using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Bit.Core.Vault.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -26,7 +25,6 @@ public class ImportCiphersController : Controller
         ICollectionCipherRepository collectionCipherRepository,
         ICipherService cipherService,
         IUserService userService,
-        IProviderService providerService,
         ICurrentContext currentContext,
         ILogger<ImportCiphersController> logger,
         GlobalSettings globalSettings)

src/Api/Vault/Controllers/CiphersController.cs

@@ -6,6 +6,7 @@ using Bit.Api.Utilities;
 using Bit.Api.Vault.Models.Request;
 using Bit.Api.Vault.Models.Response;
 using Bit.Core;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;

src/Api/Vault/Controllers/SyncController.cs

@@ -1,7 +1,8 @@
 using Bit.Api.Vault.Models.Response;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;

src/Api/Vault/Models/Response/SyncResponseModel.cs

@@ -1,5 +1,6 @@
 using Bit.Api.Models.Response;
 using Bit.Api.Tools.Models.Response;
+using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Api.Response;

src/Core/AdminConsole/Context/CurrentContextProvider.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Context;
+namespace Bit.Core.AdminConsole.Context;
 
 public class CurrentContextProvider
 {

src/Core/AdminConsole/Entities/Provider/Provider.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities.Provider;
+namespace Bit.Core.AdminConsole.Entities.Provider;
 
 public class Provider : ITableObject<Guid>
 {

src/Core/AdminConsole/Entities/Provider/ProviderOrganization.cs

@@ -1,6 +1,7 @@
-using Bit.Core.Utilities;
+using Bit.Core.Entities;
+using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities.Provider;
+namespace Bit.Core.AdminConsole.Entities.Provider;
 
 public class ProviderOrganization : ITableObject<Guid>
 {

src/Core/AdminConsole/Entities/Provider/ProviderUser.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities.Provider;
+namespace Bit.Core.AdminConsole.Entities.Provider;
 
 public class ProviderUser : ITableObject<Guid>
 {

src/Core/AdminConsole/Enums/Provider/ProviderStatusType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums.Provider;
+namespace Bit.Core.AdminConsole.Enums.Provider;
 
 public enum ProviderStatusType : byte
 {

src/Core/AdminConsole/Enums/Provider/ProviderType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Enums.Provider;
+namespace Bit.Core.AdminConsole.Enums.Provider;
 
 public enum ProviderType : byte
 {

src/Core/AdminConsole/Enums/Provider/ProviderUserStatusType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums.Provider;
+namespace Bit.Core.AdminConsole.Enums.Provider;
 
 public enum ProviderUserStatusType : byte
 {

src/Core/AdminConsole/Enums/Provider/ProviderUserType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums.Provider;
+namespace Bit.Core.AdminConsole.Enums.Provider;
 
 public enum ProviderUserType : byte
 {

src/Core/AdminConsole/Models/Business/Provider/ProviderUserInvite.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Core.Models.Business.Provider;
+namespace Bit.Core.AdminConsole.Models.Business.Provider;
 
 public class ProviderUserInvite<T>
 {

src/Core/AdminConsole/Models/Data/Provider/ProviderAbility.cs

@@ -1,12 +1,10 @@
-using Bit.Core.Entities.Provider;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
-
-namespace Bit.Core.Models.Data;
 
 public class ProviderAbility
 {
     public ProviderAbility() { }
 
-    public ProviderAbility(Provider provider)
+    public ProviderAbility(Entities.Provider.Provider provider)
     {
         Id = provider.Id;
         UseEvents = provider.UseEvents;

src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Enums;
 
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
 
 public class ProviderOrganizationOrganizationDetails
 {

src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationProviderDetails.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
 
 public class ProviderOrganizationProviderDetails
 {

src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
 
 public class ProviderUserOrganizationDetails
 {
@@ -34,5 +34,5 @@ public class ProviderUserOrganizationDetails
     public Guid? ProviderId { get; set; }
     public Guid? ProviderUserId { get; set; }
     public string ProviderName { get; set; }
-    public Enums.PlanType PlanType { get; set; }
+    public Core.Enums.PlanType PlanType { get; set; }
 }

src/Core/AdminConsole/Models/Data/Provider/ProviderUserProviderDetails.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
 
 public class ProviderUserProviderDetails
 {

src/Core/AdminConsole/Models/Data/Provider/ProviderUserPublicKey.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
 
 public class ProviderUserPublicKey
 {

src/Core/AdminConsole/Models/Data/Provider/ProviderUserUserDetails.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
-namespace Bit.Core.Models.Data;
+namespace Bit.Core.AdminConsole.Models.Data.Provider;
 
 public class ProviderUserUserDetails
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys;
 
 public class CreateOrganizationApiKeyCommand : ICreateOrganizationApiKeyCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys;
 
 public class GetOrganizationApiKeyQuery : IGetOrganizationApiKeyQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 
 public interface ICreateOrganizationApiKeyCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 
 public interface IGetOrganizationApiKeyQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 
 public interface IRotateOrganizationApiKeyCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys;
 
 public class RotateOrganizationApiKeyCommand : IRotateOrganizationApiKeyCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections;
 
 public class CreateOrganizationConnectionCommand : ICreateOrganizationConnectionCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections;
 
 public class DeleteOrganizationConnectionCommand : IDeleteOrganizationConnectionCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 
 public interface ICreateOrganizationConnectionCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 
 public interface IDeleteOrganizationConnectionCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 
 public interface IUpdateOrganizationConnectionCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 
 public interface IValidateBillingSyncKeyCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs

@@ -1,11 +1,11 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationConnections;
 using Bit.Core.Models.OrganizationConnectionConfigs;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections;
 
 public class UpdateOrganizationConnectionCommand : IUpdateOrganizationConnectionCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationConnections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections;
 
 public class ValidateBillingSyncKeyCommand : IValidateBillingSyncKeyCommand
 {
@@ -26,7 +26,7 @@ public class ValidateBillingSyncKeyCommand : IValidateBillingSyncKeyCommand
             return false;
         }
 
-        var orgApiKey = (await _apiKeyRepository.GetManyByOrganizationIdTypeAsync(organization.Id, Enums.OrganizationApiKeyType.BillingSync)).FirstOrDefault();
+        var orgApiKey = (await _apiKeyRepository.GetManyByOrganizationIdTypeAsync(organization.Id, Core.Enums.OrganizationApiKeyType.BillingSync)).FirstOrDefault();
         if (string.Equals(orgApiKey.ApiKey, billingSyncKey))
         {
             return true;

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs

@@ -1,13 +1,13 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
 
 public class CreateOrganizationDomainCommand : ICreateOrganizationDomainCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
 
 public class DeleteOrganizationDomainCommand : IDeleteOrganizationDomainCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
-using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
 
 public class GetOrganizationDomainByIdOrganizationIdQuery : IGetOrganizationDomainByIdOrganizationIdQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
-using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
 
 public class GetOrganizationDomainByOrganizationIdQuery : IGetOrganizationDomainByOrganizationIdQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 
 public interface ICreateOrganizationDomainCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 
 public interface IDeleteOrganizationDomainCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 
 public interface IGetOrganizationDomainByIdOrganizationIdQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 
 public interface IGetOrganizationDomainByOrganizationIdQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 
 public interface IVerifyOrganizationDomainCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs

@@ -1,12 +1,12 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationDomains;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
 
 public class VerifyOrganizationDomainCommand : IVerifyOrganizationDomainCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Exceptions;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
+using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationUsers;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
 
 public class CountNewSmSeatsRequiredQuery : ICountNewSmSeatsRequiredQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
+using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationUsers;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
 
 public class DeleteOrganizationUserCommand : IDeleteOrganizationUserCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 
 public interface ICountNewSmSeatsRequiredQuery
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Enums;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 
 public interface IDeleteOrganizationUserCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 
 public interface IUpdateOrganizationUserGroupsCommand
 {

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationUsers;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
 
 public class UpdateOrganizationUserGroupsCommand : IUpdateOrganizationUserGroupsCommand
 {