[AC-1284] AC Team code ownership moves - Provider (#3359)

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/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/OrganizationsController.cs

@@ -11,6 +11,7 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Core;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Auth.Services;

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/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/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/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/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/Providers/Interfaces/ICreateProviderCommand.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
 
-namespace Bit.Core.Providers.Interfaces;
+namespace Bit.Core.AdminConsole.Providers.Interfaces;
 
 public interface ICreateProviderCommand
 {

src/Core/AdminConsole/Repositories/IProviderOrganizationRepository.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.AdminConsole.Repositories;
 
 public interface IProviderOrganizationRepository : IRepository<ProviderOrganization, Guid>
 {

src/Core/AdminConsole/Repositories/IProviderRepository.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.AdminConsole.Repositories;
 
 public interface IProviderRepository : IRepository<Provider, Guid>
 {

src/Core/AdminConsole/Repositories/IProviderUserRepository.cs

@@ -1,8 +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.AdminConsole.Models.Data.Provider;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.AdminConsole.Repositories;
 
 public interface IProviderUserRepository : IRepository<ProviderUser, Guid>
 {

src/Core/AdminConsole/Services/IProviderService.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Business.Provider;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.AdminConsole.Services;
 
 public interface IProviderService
 {

src/Core/AdminConsole/Services/NoopImplementations/NoopProviderService.cs

@@ -1,9 +1,9 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Models.Business.Provider;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Business.Provider;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.AdminConsole.Services.NoopImplementations;
 
 public class NoopProviderService : IProviderService
 {

src/Core/Context/CurrentContext.cs

@@ -1,7 +1,10 @@
 using System.Security.Claims;
+using Bit.Core.AdminConsole.Context;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Identity;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;

src/Core/Context/ICurrentContext.cs

@@ -1,4 +1,6 @@
 using System.Security.Claims;
+using Bit.Core.AdminConsole.Context;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Identity;

src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
 

src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs

@@ -1,10 +1,10 @@
-using Bit.Core.Entities;
+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.Business;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 

src/Core/Services/IApplicationCacheService.cs

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

src/Core/Services/IEventService.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.SecretsManager.Entities;
 using Bit.Core.Vault.Entities;

src/Core/Services/IMailService.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Services;

src/Core/Services/Implementations/EventService.cs

@@ -1,7 +1,9 @@
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Models.Data.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.Models.Data;
 using Bit.Core.Models.Data.Organizations;

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -1,10 +1,10 @@
 using System.Net;
 using System.Reflection;
+using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Auth.Models.Mail;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Mail;
 using Bit.Core.Models.Mail.FamiliesForEnterprise;
 using Bit.Core.Models.Mail.Provider;

src/Core/Services/Implementations/InMemoryApplicationCacheService.cs

@@ -1,6 +1,7 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Models.Data.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Repositories;
 

src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs

@@ -1,4 +1,5 @@
 using Azure.Messaging.ServiceBus;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;

src/Core/Services/Implementations/OrganizationService.cs

@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
@@ -9,7 +10,6 @@ using Bit.Core.Auth.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;

src/Core/Services/Implementations/UserService.cs

@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
 using Bit.Core.Context;

src/Core/Services/NoopImplementations/NoopEventService.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.SecretsManager.Entities;
 using Bit.Core.Vault.Entities;

src/Core/Services/NoopImplementations/NoopMailService.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Entities;
-using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Services;

src/Core/Utilities/CoreHelpers.cs

@@ -10,11 +10,12 @@ using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Queues.Models;
+using Bit.Core.AdminConsole.Context;
+using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Core.Identity;
 using Bit.Core.Settings;
 using IdentityModel;

src/Identity/IdentityServer/ClientStore.cs

@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Security.Claims;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Identity;

src/Identity/IdentityServer/ProfileService.cs

@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Identity;
 using Bit.Core.Repositories;

src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderOrganizationRepository.cs

@@ -1,12 +1,13 @@
 using System.Data;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.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 ProviderOrganizationRepository : Repository<ProviderOrganization, Guid>, IProviderOrganizationRepository
 {

src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderRepository.cs

@@ -1,12 +1,13 @@
 using System.Data;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.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 ProviderRepository : Repository<Provider, Guid>, IProviderRepository
 {

src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderUserRepository.cs

@@ -1,13 +1,14 @@
 using System.Data;
-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;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.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 ProviderUserRepository : Repository<ProviderUser, Guid>, IProviderUserRepository
 {

src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/Provider.cs

@@ -0,0 +1,15 @@
+using AutoMapper;
+
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
+
+public class Provider : Core.AdminConsole.Entities.Provider.Provider
+{
+}
+
+public class ProviderMapperProfile : Profile
+{
+    public ProviderMapperProfile()
+    {
+        CreateMap<Core.AdminConsole.Entities.Provider.Provider, Provider>().ReverseMap();
+    }
+}

src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderOrganization.cs

@@ -0,0 +1,18 @@
+using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
+
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
+
+public class ProviderOrganization : Core.AdminConsole.Entities.Provider.ProviderOrganization
+{
+    public virtual Provider Provider { get; set; }
+    public virtual Organization Organization { get; set; }
+}
+
+public class ProviderOrganizationMapperProfile : Profile
+{
+    public ProviderOrganizationMapperProfile()
+    {
+        CreateMap<Core.AdminConsole.Entities.Provider.ProviderOrganization, ProviderOrganization>().ReverseMap();
+    }
+}

src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderUser.cs

@@ -0,0 +1,18 @@
+using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
+
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
+
+public class ProviderUser : Core.AdminConsole.Entities.Provider.ProviderUser
+{
+    public virtual User User { get; set; }
+    public virtual Provider Provider { get; set; }
+}
+
+public class ProviderUserMapperProfile : Profile
+{
+    public ProviderUserMapperProfile()
+    {
+        CreateMap<Core.AdminConsole.Entities.Provider.ProviderUser, ProviderUser>().ReverseMap();
+    }
+}

src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderOrganizationRepository.cs

@@ -1,15 +1,16 @@
 using AutoMapper;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Repositories;
-using Bit.Infrastructure.EntityFramework.Repositories.Queries;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
+using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 
 public class ProviderOrganizationRepository :
-    Repository<ProviderOrganization, Models.ProviderOrganization, Guid>, IProviderOrganizationRepository
+    Repository<ProviderOrganization, Models.Provider.ProviderOrganization, Guid>, IProviderOrganizationRepository
 {
     public ProviderOrganizationRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
         : base(serviceScopeFactory, mapper, context => context.ProviderOrganizations)

src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderRepository.cs

@@ -1,13 +1,14 @@
 using AutoMapper;
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 
-public class ProviderRepository : Repository<Provider, Models.Provider, Guid>, IProviderRepository
+public class ProviderRepository : Repository<Provider, Models.Provider.Provider, Guid>, IProviderRepository
 {
 
     public ProviderRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)

src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderUserRepository.cs

@@ -1,16 +1,18 @@
 using AutoMapper;
-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;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
+using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 
 public class ProviderUserRepository :
-    Repository<ProviderUser, Models.ProviderUser, Guid>, IProviderUserRepository
+    Repository<ProviderUser, Models.Provider.ProviderUser, Guid>, IProviderUserRepository
 {
     public ProviderUserRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
         : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.ProviderUsers)

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs

@@ -1,6 +1,8 @@
-using Bit.Core.Entities.Provider;
+using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 
 public class ProviderOrganizationCountByOrganizationIdsQuery : IQuery<ProviderOrganization>
 {

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs

@@ -1,6 +1,8 @@
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 
 public class ProviderOrganizationOrganizationDetailsReadByProviderIdQuery : IQuery<ProviderOrganizationOrganizationDetails>
 {

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs

@@ -1,6 +1,8 @@
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 
 public class ProviderOrganizationReadByUserIdQuery : IQuery<ProviderOrganizationProviderDetails>
 {

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs

@@ -1,6 +1,8 @@
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 
 public class ProviderUserOrganizationDetailsViewQuery : IQuery<ProviderUserOrganizationDetails>
 {

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs

@@ -1,7 +1,9 @@
-using Bit.Core.Enums.Provider;
+using Bit.Core.AdminConsole.Enums.Provider;
-using Bit.Core.Models.Data;
+using Bit.Core.AdminConsole.Models.Data.Provider;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 
 public class ProviderUserProviderDetailsReadByUserIdStatusQuery : IQuery<ProviderUserProviderDetails>
 {

src/Infrastructure.EntityFramework/Models/Provider/Provider.cs

@@ -1,15 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Infrastructure.EntityFramework.Models;
-
-public class Provider : Core.Entities.Provider.Provider
-{
-}
-
-public class ProviderMapperProfile : Profile
-{
-    public ProviderMapperProfile()
-    {
-        CreateMap<Core.Entities.Provider.Provider, Provider>().ReverseMap();
-    }
-}

src/Infrastructure.EntityFramework/Models/Provider/ProviderOrganization.cs

@@ -1,17 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Infrastructure.EntityFramework.Models;
-
-public class ProviderOrganization : Core.Entities.Provider.ProviderOrganization
-{
-    public virtual Provider Provider { get; set; }
-    public virtual Organization Organization { get; set; }
-}
-
-public class ProviderOrganizationMapperProfile : Profile
-{
-    public ProviderOrganizationMapperProfile()
-    {
-        CreateMap<Core.Entities.Provider.ProviderOrganization, ProviderOrganization>().ReverseMap();
-    }
-}

src/Infrastructure.EntityFramework/Models/Provider/ProviderUser.cs

@@ -1,17 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Infrastructure.EntityFramework.Models;
-
-public class ProviderUser : Core.Entities.Provider.ProviderUser
-{
-    public virtual User User { get; set; }
-    public virtual Provider Provider { get; set; }
-}
-
-public class ProviderUserMapperProfile : Profile
-{
-    public ProviderUserMapperProfile()
-    {
-        CreateMap<Core.Entities.Provider.ProviderUser, ProviderUser>().ReverseMap();
-    }
-}

src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs

@@ -1,4 +1,5 @@
 using Bit.Core;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
 using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Converters;
 using Bit.Infrastructure.EntityFramework.Models;

src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Auth.Enums;
+using Bit.Core.AdminConsole.Enums.Provider;
+using Bit.Core.Auth.Enums;
 using Bit.Core.Enums;
-using Bit.Core.Enums.Provider;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 using Microsoft.EntityFrameworkCore;
 

src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs

@@ -1,5 +1,5 @@
-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.Infrastructure.EntityFramework.Repositories.Queries;