diff --git a/src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs b/src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs
index 8e54bfca9c..b0ca103f0e 100644
--- a/src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs
+++ b/src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs
@@ -2,13 +2,13 @@
 using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
+using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs b/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs
index b4d9d75aa0..c9e511fafa 100644
--- a/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs
+++ b/src/Api/Jobs/SelfHostedSponsorshipSyncJob.cs
@@ -1,9 +1,9 @@
-using Bit.Core.Enums;
+using Bit.Core.Billing.Services;
+using Bit.Core.Enums;
 using Bit.Core.Jobs;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Settings;
 using Quartz;
 
diff --git a/src/Api/Jobs/ValidateOrganizationsJob.cs b/src/Api/Jobs/ValidateOrganizationsJob.cs
index 8c4225a015..b027b4d049 100644
--- a/src/Api/Jobs/ValidateOrganizationsJob.cs
+++ b/src/Api/Jobs/ValidateOrganizationsJob.cs
@@ -1,5 +1,5 @@
-using Bit.Core.Jobs;
-using Bit.Core.Services;
+using Bit.Core.Billing.Services;
+using Bit.Core.Jobs;
 using Quartz;
 
 namespace Bit.Api.Jobs;
diff --git a/src/Api/Jobs/ValidateUsersJob.cs b/src/Api/Jobs/ValidateUsersJob.cs
index be531b47de..351e141113 100644
--- a/src/Api/Jobs/ValidateUsersJob.cs
+++ b/src/Api/Jobs/ValidateUsersJob.cs
@@ -1,5 +1,5 @@
-using Bit.Core.Jobs;
-using Bit.Core.Services;
+using Bit.Core.Billing.Services;
+using Bit.Core.Jobs;
 using Quartz;
 
 namespace Bit.Api.Jobs;
diff --git a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
index 827a4ca1b9..389fb5192a 100644
--- a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
+++ b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
@@ -21,6 +21,7 @@ using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
 using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Pricing;
+using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/src/Core/Billing/Licenses/Models/UserLicense.cs b/src/Core/Billing/Licenses/Models/UserLicense.cs
index d688c5831f..44f6239b86 100644
--- a/src/Core/Billing/Licenses/Models/UserLicense.cs
+++ b/src/Core/Billing/Licenses/Models/UserLicense.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
 using Bit.Core.Billing.Licenses.Attributes;
 using Bit.Core.Billing.Licenses.Extensions;
+using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
-using Bit.Core.Services;
 
 namespace Bit.Core.Billing.Licenses.Models;
 
diff --git a/src/Core/Services/ILicensingService.cs b/src/Core/Billing/Services/ILicensingService.cs
similarity index 96%
rename from src/Core/Services/ILicensingService.cs
rename to src/Core/Billing/Services/ILicensingService.cs
index 4ee2d14832..8b313f74c7 100644
--- a/src/Core/Services/ILicensingService.cs
+++ b/src/Core/Billing/Services/ILicensingService.cs
@@ -6,7 +6,7 @@ using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Billing.Services;
 
 public interface ILicensingService
 {
diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Billing/Services/Implementations/LicensingService.cs
similarity index 96%
rename from src/Core/Services/Implementations/LicensingService.cs
rename to src/Core/Billing/Services/Implementations/LicensingService.cs
index 671fd50d91..64762190ab 100644
--- a/src/Core/Services/Implementations/LicensingService.cs
+++ b/src/Core/Billing/Services/Implementations/LicensingService.cs
@@ -11,6 +11,7 @@ using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Repositories;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using IdentityModel;
@@ -19,7 +20,7 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Billing.Services.Implementations;
 
 public class LicensingService : ILicensingService
 {
@@ -92,7 +93,7 @@ public class LicensingService : ILicensingService
         }
 
         var enabledOrgs = await _organizationRepository.GetManyByEnabledAsync();
-        _logger.LogInformation(Constants.BypassFiltersEventId, null,
+        _logger.LogInformation(Core.Constants.BypassFiltersEventId, null,
             "Validating licenses for {NumberOfOrganizations} organizations.", enabledOrgs.Count);
 
         var exceptions = new List<Exception>();
@@ -141,7 +142,7 @@ public class LicensingService : ILicensingService
 
     private async Task DisableOrganizationAsync(Organization org, ILicense license, string reason)
     {
-        _logger.LogInformation(Constants.BypassFiltersEventId, null,
+        _logger.LogInformation(Core.Constants.BypassFiltersEventId, null,
             "Organization {0} ({1}) has an invalid license and is being disabled. Reason: {2}",
             org.Id, org.DisplayName(), reason);
         org.Enabled = false;
@@ -160,7 +161,7 @@ public class LicensingService : ILicensingService
         }
 
         var premiumUsers = await _userRepository.GetManyByPremiumAsync(true);
-        _logger.LogInformation(Constants.BypassFiltersEventId, null,
+        _logger.LogInformation(Core.Constants.BypassFiltersEventId, null,
             "Validating premium for {0} users.", premiumUsers.Count);
 
         foreach (var user in premiumUsers)
@@ -199,7 +200,7 @@ public class LicensingService : ILicensingService
             _userCheckCache.Add(user.Id, now);
         }
 
-        _logger.LogInformation(Constants.BypassFiltersEventId, null,
+        _logger.LogInformation(Core.Constants.BypassFiltersEventId, null,
             "Validating premium license for user {0}({1}).", user.Id, user.Email);
         return await ProcessUserValidationAsync(user);
     }
@@ -231,7 +232,7 @@ public class LicensingService : ILicensingService
 
     private async Task DisablePremiumAsync(User user, ILicense license, string reason)
     {
-        _logger.LogInformation(Constants.BypassFiltersEventId, null,
+        _logger.LogInformation(Core.Constants.BypassFiltersEventId, null,
             "User {0}({1}) has an invalid license and premium is being disabled. Reason: {2}",
             user.Id, user.Email, reason);
 
diff --git a/src/Core/Services/NoopImplementations/NoopLicensingService.cs b/src/Core/Billing/Services/NoopImplementations/NoopLicensingService.cs
similarity index 97%
rename from src/Core/Services/NoopImplementations/NoopLicensingService.cs
rename to src/Core/Billing/Services/NoopImplementations/NoopLicensingService.cs
index fb7823f3b9..5eac02e6a3 100644
--- a/src/Core/Services/NoopImplementations/NoopLicensingService.cs
+++ b/src/Core/Billing/Services/NoopImplementations/NoopLicensingService.cs
@@ -9,7 +9,7 @@ using Bit.Core.Settings;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Billing.Services.NoopImplementations;
 
 public class NoopLicensingService : ILicensingService
 {
diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
index 4c6d1eff26..830b073301 100644
--- a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
+++ b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
@@ -3,6 +3,7 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
 using Bit.Core.Billing.Licenses.Models;
+using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs
index 77dbd893e0..1e5faa927d 100644
--- a/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs
+++ b/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs
@@ -4,6 +4,7 @@ using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Licenses.Extensions;
 using Bit.Core.Billing.Licenses.Models;
+using Bit.Core.Billing.Services;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
diff --git a/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs
index 82abfa3536..57699ae415 100644
--- a/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs
@@ -3,10 +3,10 @@
 using System.Collections.ObjectModel;
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Identity;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Duende.IdentityServer.Models;
 using IdentityModel;
diff --git a/src/Identity/IdentityServer/ProfileService.cs b/src/Identity/IdentityServer/ProfileService.cs
index d7d6708374..13708584c9 100644
--- a/src/Identity/IdentityServer/ProfileService.cs
+++ b/src/Identity/IdentityServer/ProfileService.cs
@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Identity;
 using Bit.Core.Repositories;
diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
index ccf2b5212f..4ecee87b56 100644
--- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
+++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
@@ -22,6 +22,7 @@ using Bit.Core.Auth.Services.Implementations;
 using Bit.Core.Auth.UserFeatures;
 using Bit.Core.Billing.Services;
 using Bit.Core.Billing.Services.Implementations;
+using Bit.Core.Billing.Services.NoopImplementations;
 using Bit.Core.Billing.TrialInitiation;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs
index bcc61f6bab..fc613be07f 100644
--- a/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs
@@ -5,13 +5,13 @@ using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces;
 using Bit.Core.Billing.Licenses.Models;
+using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs
index f9d783d144..0fda7b7f85 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs
@@ -3,6 +3,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Models;
+using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs
index 077a9679af..a151b5a41b 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs
@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Licenses.Enums;
 using Bit.Core.Billing.Licenses.Models;
+using Bit.Core.Billing.Services;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses;
 using Bit.Core.Services;
diff --git a/test/Core.Test/Services/LicensingServiceTests.cs b/test/Core.Test/Services/LicensingServiceTests.cs
index 357e41b6c6..2df76b8897 100644
--- a/test/Core.Test/Services/LicensingServiceTests.cs
+++ b/test/Core.Test/Services/LicensingServiceTests.cs
@@ -2,7 +2,7 @@
 using AutoFixture;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Licenses.Models;
-using Bit.Core.Services;
+using Bit.Core.Billing.Services.Implementations;
 using Bit.Core.Settings;
 using Bit.Core.Test.AutoFixture;
 using Bit.Test.Common.AutoFixture;
diff --git a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
index e406915e38..75cf5f4f57 100644
--- a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
+++ b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs
@@ -1,5 +1,6 @@
 using AspNetCoreRateLimit;
 using Bit.Core.Billing.Services;
+using Bit.Core.Billing.Services.NoopImplementations;
 using Bit.Core.Platform.Push;
 using Bit.Core.Platform.Push.Internal;
 using Bit.Core.Repositories;