diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs
index 80d902a4..ab9551c7 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs
@@ -1,14 +1,14 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.CustomFormat;
 using Recyclarr.TrashGuide.CustomFormat;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
 
 public class CustomFormatApiFetchPhase
 {
-    private readonly ICustomFormatService _api;
+    private readonly ICustomFormatApiService _api;
 
-    public CustomFormatApiFetchPhase(ICustomFormatService api)
+    public CustomFormatApiFetchPhase(ICustomFormatApiService api)
     {
         _api = api;
     }
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
index d206ff10..3018a101 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
@@ -1,13 +1,13 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.CustomFormat;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
 
 public class CustomFormatApiPersistencePhase
 {
-    private readonly ICustomFormatService _api;
+    private readonly ICustomFormatApiService _api;
 
-    public CustomFormatApiPersistencePhase(ICustomFormatService api)
+    public CustomFormatApiPersistencePhase(ICustomFormatApiService api)
     {
         _api = api;
     }
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
index c6c5156e..faadaa83 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 
@@ -8,9 +7,9 @@ public record QualityProfileServiceData(IReadOnlyList<QualityProfileDto> Profile
 
 public class QualityProfileApiFetchPhase
 {
-    private readonly IQualityProfileService _api;
+    private readonly IQualityProfileApiService _api;
 
-    public QualityProfileApiFetchPhase(IQualityProfileService api)
+    public QualityProfileApiFetchPhase(IQualityProfileApiService api)
     {
         _api = api;
     }
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
index f1bbcb73..4b11dce5 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
@@ -1,17 +1,17 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 
 public class QualityProfileApiPersistencePhase
 {
     private readonly ILogger _log;
-    private readonly IQualityProfileService _api;
+    private readonly IQualityProfileApiService _api;
     private readonly QualityProfileStatCalculator _statCalculator;
 
     public QualityProfileApiPersistencePhase(
         ILogger log,
-        IQualityProfileService api,
+        IQualityProfileApiService api,
         QualityProfileStatCalculator statCalculator)
     {
         _log = log;
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfilePreviewPhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfilePreviewPhase.cs
index 48420e11..5809a79d 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfilePreviewPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfilePreviewPhase.cs
@@ -1,4 +1,4 @@
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 using Spectre.Console;
 using Spectre.Console.Rendering;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileStatCalculator.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileStatCalculator.cs
index b66f907a..165dd87e 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileStatCalculator.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileStatCalculator.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.JsonDiffPatch;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhase.cs
index c7d2c259..83602829 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhase.cs
@@ -3,7 +3,7 @@ using FluentValidation.Results;
 using Recyclarr.Common.Extensions;
 using Recyclarr.Common.FluentValidation;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs
index 1b4dcc46..755c7723 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Common.Extensions;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileExtensions.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileExtensions.cs
index ab9595e6..79c994b9 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileExtensions.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileExtensions.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Common.Extensions;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedFormatScore.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedFormatScore.cs
index 84f83ded..9f7157eb 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedFormatScore.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedFormatScore.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Common.Extensions;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedQualityProfile.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedQualityProfile.cs
index 26d9b0d6..f8575bc2 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedQualityProfile.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/UpdatedQualityProfile.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs
index a7753a34..36ea2105 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs
@@ -1,14 +1,13 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.QualityDefinition;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
 public class QualitySizeApiFetchPhase
 {
-    private readonly IQualityDefinitionService _api;
+    private readonly IQualityDefinitionApiService _api;
 
-    public QualitySizeApiFetchPhase(IQualityDefinitionService api)
+    public QualitySizeApiFetchPhase(IQualityDefinitionApiService api)
     {
         _api = api;
     }
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs
index 2a9d2f52..d0785da1 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs
@@ -1,15 +1,14 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.QualityDefinition;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
 public class QualitySizeApiPersistencePhase
 {
     private readonly ILogger _log;
-    private readonly IQualityDefinitionService _api;
+    private readonly IQualityDefinitionApiService _api;
 
-    public QualitySizeApiPersistencePhase(ILogger log, IQualityDefinitionService api)
+    public QualitySizeApiPersistencePhase(ILogger log, IQualityDefinitionApiService api)
     {
         _log = log;
         _api = api;
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
index e1d05c0d..7a845ef2 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityDefinition;
 using Recyclarr.TrashGuide.QualitySize;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Models/ReleaseProfileTransactionData.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Models/ReleaseProfileTransactionData.cs
index e5ca114f..f4d1b0cb 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Models/ReleaseProfileTransactionData.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Models/ReleaseProfileTransactionData.cs
@@ -1,4 +1,4 @@
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Models;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs
index ad6e01af..f7e93a20 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs
@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiPersistencePhase.cs
index f6e7cde4..4906d0bb 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiPersistencePhase.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Models;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfilePreviewPhase.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfilePreviewPhase.cs
index fa7d8662..a47cb0b0 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfilePreviewPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfilePreviewPhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.ReleaseProfile;
 using Spectre.Console;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileTransactionPhase.cs
index 36f184f0..156e3abf 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileTransactionPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileTransactionPhase.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Models;
 using Recyclarr.Cli.Pipelines.Tags;
 using Recyclarr.Common.Extensions;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileAutofacModule.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileAutofacModule.cs
index 6138899c..82ec13e3 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileAutofacModule.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileAutofacModule.cs
@@ -3,7 +3,7 @@ using Autofac.Extras.AggregateService;
 using Autofac.Extras.Ordering;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs
index 1e80bdfe..578c25c7 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs
@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs
index 2fd168c9..80f8686c 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs
@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagTransactionPhase.cs
index 22ca0a81..2bcc96aa 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagTransactionPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagTransactionPhase.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Common.Extensions;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/ServiceTagCache.cs b/src/Recyclarr.Cli/Pipelines/Tags/ServiceTagCache.cs
index 43cfea78..10a0a0e9 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/ServiceTagCache.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/ServiceTagCache.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Common.Extensions;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Pipelines.Tags;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/TagsAutofacModule.cs b/src/Recyclarr.Cli/Pipelines/Tags/TagsAutofacModule.cs
index 0b73c0c7..45d82404 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/TagsAutofacModule.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/TagsAutofacModule.cs
@@ -1,7 +1,7 @@
 using Autofac;
 using Autofac.Extras.AggregateService;
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Pipelines.Tags;
 
diff --git a/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs b/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
index f90b3bc9..489cc89f 100644
--- a/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
+++ b/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
@@ -5,7 +5,7 @@ using Recyclarr.Compatibility;
 using Recyclarr.Compatibility.Sonarr;
 using Recyclarr.Config;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.CustomFormat;
 using Recyclarr.TrashGuide.CustomFormat;
 using Spectre.Console;
 
@@ -15,14 +15,14 @@ public class DeleteCustomFormatsProcessor : IDeleteCustomFormatsProcessor
 {
     private readonly ILogger _log;
     private readonly IAnsiConsole _console;
-    private readonly ICustomFormatService _api;
+    private readonly ICustomFormatApiService _api;
     private readonly IConfigurationRegistry _configRegistry;
     private readonly ISonarrCapabilityFetcher _sonarCapabilities;
 
     public DeleteCustomFormatsProcessor(
         ILogger log,
         IAnsiConsole console,
-        ICustomFormatService api,
+        ICustomFormatApiService api,
         IConfigurationRegistry configRegistry,
         ISonarrCapabilityFetcher sonarCapabilities)
     {
diff --git a/src/Recyclarr.Compatibility/ServiceInformation.cs b/src/Recyclarr.Compatibility/ServiceInformation.cs
index bde6c815..095b084b 100644
--- a/src/Recyclarr.Compatibility/ServiceInformation.cs
+++ b/src/Recyclarr.Compatibility/ServiceInformation.cs
@@ -1,6 +1,6 @@
 using Flurl.Http;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.System;
 using Serilog;
 
 namespace Recyclarr.Compatibility;
diff --git a/src/Recyclarr.ServarrApi/ApiServicesAutofacModule.cs b/src/Recyclarr.ServarrApi/ApiServicesAutofacModule.cs
index 51fee518..4bfb1e5f 100644
--- a/src/Recyclarr.ServarrApi/ApiServicesAutofacModule.cs
+++ b/src/Recyclarr.ServarrApi/ApiServicesAutofacModule.cs
@@ -1,7 +1,10 @@
 using Autofac;
 using Flurl.Http.Configuration;
+using Recyclarr.ServarrApi.CustomFormat;
 using Recyclarr.ServarrApi.Http;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.QualityDefinition;
+using Recyclarr.ServarrApi.QualityProfile;
+using Recyclarr.ServarrApi.System;
 
 namespace Recyclarr.ServarrApi;
 
@@ -13,8 +16,8 @@ public class ApiServicesAutofacModule : Module
         builder.RegisterType<SystemApiService>().As<ISystemApiService>();
         builder.RegisterType<FlurlClientFactory>().As<IFlurlClientFactory>().SingleInstance();
         builder.RegisterType<ServiceRequestBuilder>().As<IServiceRequestBuilder>();
-        builder.RegisterType<QualityProfileService>().As<IQualityProfileService>();
-        builder.RegisterType<CustomFormatService>().As<ICustomFormatService>();
-        builder.RegisterType<QualityDefinitionService>().As<IQualityDefinitionService>();
+        builder.RegisterType<QualityProfileApiService>().As<IQualityProfileApiService>();
+        builder.RegisterType<CustomFormatApiService>().As<ICustomFormatApiService>();
+        builder.RegisterType<QualityDefinitionApiService>().As<IQualityDefinitionApiService>();
     }
 }
diff --git a/src/Recyclarr.ServarrApi/Services/CustomFormatService.cs b/src/Recyclarr.ServarrApi/CustomFormat/CustomFormatApiService.cs
similarity index 87%
rename from src/Recyclarr.ServarrApi/Services/CustomFormatService.cs
rename to src/Recyclarr.ServarrApi/CustomFormat/CustomFormatApiService.cs
index b14d19e4..45af7130 100644
--- a/src/Recyclarr.ServarrApi/Services/CustomFormatService.cs
+++ b/src/Recyclarr.ServarrApi/CustomFormat/CustomFormatApiService.cs
@@ -3,13 +3,13 @@ using Recyclarr.Config.Models;
 using Recyclarr.ServarrApi.Http;
 using Recyclarr.TrashGuide.CustomFormat;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.CustomFormat;
 
-public class CustomFormatService : ICustomFormatService
+public class CustomFormatApiService : ICustomFormatApiService
 {
     private readonly IServiceRequestBuilder _service;
 
-    public CustomFormatService(IServiceRequestBuilder service)
+    public CustomFormatApiService(IServiceRequestBuilder service)
     {
         _service = service;
     }
diff --git a/src/Recyclarr.ServarrApi/Services/ICustomFormatService.cs b/src/Recyclarr.ServarrApi/CustomFormat/ICustomFormatApiService.cs
similarity index 85%
rename from src/Recyclarr.ServarrApi/Services/ICustomFormatService.cs
rename to src/Recyclarr.ServarrApi/CustomFormat/ICustomFormatApiService.cs
index 33a68b9e..66674833 100644
--- a/src/Recyclarr.ServarrApi/Services/ICustomFormatService.cs
+++ b/src/Recyclarr.ServarrApi/CustomFormat/ICustomFormatApiService.cs
@@ -1,9 +1,9 @@
 using Recyclarr.Config.Models;
 using Recyclarr.TrashGuide.CustomFormat;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.CustomFormat;
 
-public interface ICustomFormatService
+public interface ICustomFormatApiService
 {
     Task<IList<CustomFormatData>> GetCustomFormats(IServiceConfiguration config);
     Task<CustomFormatData?> CreateCustomFormat(IServiceConfiguration config, CustomFormatData cf);
diff --git a/src/Recyclarr.ServarrApi/Services/IQualityDefinitionService.cs b/src/Recyclarr.ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs
similarity index 72%
rename from src/Recyclarr.ServarrApi/Services/IQualityDefinitionService.cs
rename to src/Recyclarr.ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs
index 22d853f4..de20deb8 100644
--- a/src/Recyclarr.ServarrApi/Services/IQualityDefinitionService.cs
+++ b/src/Recyclarr.ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs
@@ -1,9 +1,8 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.QualityDefinition;
 
-public interface IQualityDefinitionService
+public interface IQualityDefinitionApiService
 {
     Task<IList<ServiceQualityDefinitionItem>> GetQualityDefinition(IServiceConfiguration config);
 
diff --git a/src/Recyclarr.ServarrApi/Services/QualityDefinitionService.cs b/src/Recyclarr.ServarrApi/QualityDefinition/QualityDefinitionApiService.cs
similarity index 79%
rename from src/Recyclarr.ServarrApi/Services/QualityDefinitionService.cs
rename to src/Recyclarr.ServarrApi/QualityDefinition/QualityDefinitionApiService.cs
index b1ec6f69..e1c520f0 100644
--- a/src/Recyclarr.ServarrApi/Services/QualityDefinitionService.cs
+++ b/src/Recyclarr.ServarrApi/QualityDefinition/QualityDefinitionApiService.cs
@@ -1,15 +1,14 @@
 using Flurl.Http;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 using Recyclarr.ServarrApi.Http;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.QualityDefinition;
 
-internal class QualityDefinitionService : IQualityDefinitionService
+internal class QualityDefinitionApiService : IQualityDefinitionApiService
 {
     private readonly IServiceRequestBuilder _service;
 
-    public QualityDefinitionService(IServiceRequestBuilder service)
+    public QualityDefinitionApiService(IServiceRequestBuilder service)
     {
         _service = service;
     }
diff --git a/src/Recyclarr.ServarrApi/Dto/ServiceQualityDefinitionItem.cs b/src/Recyclarr.ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs
similarity index 93%
rename from src/Recyclarr.ServarrApi/Dto/ServiceQualityDefinitionItem.cs
rename to src/Recyclarr.ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs
index 76144adb..1651af1d 100644
--- a/src/Recyclarr.ServarrApi/Dto/ServiceQualityDefinitionItem.cs
+++ b/src/Recyclarr.ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Recyclarr.ServarrApi.Dto;
+namespace Recyclarr.ServarrApi.QualityDefinition;
 
 [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 public class ServiceQualityItem
diff --git a/src/Recyclarr.ServarrApi/Services/IQualityProfileService.cs b/src/Recyclarr.ServarrApi/QualityProfile/IQualityProfileApiService.cs
similarity index 76%
rename from src/Recyclarr.ServarrApi/Services/IQualityProfileService.cs
rename to src/Recyclarr.ServarrApi/QualityProfile/IQualityProfileApiService.cs
index 5ea4b6b3..9b62574f 100644
--- a/src/Recyclarr.ServarrApi/Services/IQualityProfileService.cs
+++ b/src/Recyclarr.ServarrApi/QualityProfile/IQualityProfileApiService.cs
@@ -1,9 +1,8 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.QualityProfile;
 
-public interface IQualityProfileService
+public interface IQualityProfileApiService
 {
     Task<IList<QualityProfileDto>> GetQualityProfiles(IServiceConfiguration config);
     Task UpdateQualityProfile(IServiceConfiguration config, QualityProfileDto profile);
diff --git a/src/Recyclarr.ServarrApi/Extensions/QualityProfileApiExtensions.cs b/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiExtensions.cs
similarity index 85%
rename from src/Recyclarr.ServarrApi/Extensions/QualityProfileApiExtensions.cs
rename to src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiExtensions.cs
index e3fad0cc..3f8307b1 100644
--- a/src/Recyclarr.ServarrApi/Extensions/QualityProfileApiExtensions.cs
+++ b/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiExtensions.cs
@@ -1,7 +1,6 @@
 using Recyclarr.Common.Extensions;
-using Recyclarr.ServarrApi.Dto;
 
-namespace Recyclarr.ServarrApi.Extensions;
+namespace Recyclarr.ServarrApi.QualityProfile;
 
 public static class QualityProfileApiExtensions
 {
diff --git a/src/Recyclarr.ServarrApi/Services/QualityProfileService.cs b/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiService.cs
similarity index 85%
rename from src/Recyclarr.ServarrApi/Services/QualityProfileService.cs
rename to src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiService.cs
index 3de31844..a7936188 100644
--- a/src/Recyclarr.ServarrApi/Services/QualityProfileService.cs
+++ b/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiService.cs
@@ -1,16 +1,14 @@
 using Flurl.Http;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Extensions;
 using Recyclarr.ServarrApi.Http;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.QualityProfile;
 
-internal class QualityProfileService : IQualityProfileService
+internal class QualityProfileApiService : IQualityProfileApiService
 {
     private readonly IServiceRequestBuilder _service;
 
-    public QualityProfileService(IServiceRequestBuilder service)
+    public QualityProfileApiService(IServiceRequestBuilder service)
     {
         _service = service;
     }
diff --git a/src/Recyclarr.ServarrApi/Dto/QualityProfileDto.cs b/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileDto.cs
similarity index 98%
rename from src/Recyclarr.ServarrApi/Dto/QualityProfileDto.cs
rename to src/Recyclarr.ServarrApi/QualityProfile/QualityProfileDto.cs
index ce49a295..1835eb41 100644
--- a/src/Recyclarr.ServarrApi/Dto/QualityProfileDto.cs
+++ b/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileDto.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace Recyclarr.ServarrApi.Dto;
+namespace Recyclarr.ServarrApi.QualityProfile;
 
 [UsedImplicitly]
 public record QualityProfileDto
diff --git a/src/Recyclarr.ServarrApi/Services/IReleaseProfileApiService.cs b/src/Recyclarr.ServarrApi/ReleaseProfile/IReleaseProfileApiService.cs
similarity index 86%
rename from src/Recyclarr.ServarrApi/Services/IReleaseProfileApiService.cs
rename to src/Recyclarr.ServarrApi/ReleaseProfile/IReleaseProfileApiService.cs
index a1c2940a..f315b199 100644
--- a/src/Recyclarr.ServarrApi/Services/IReleaseProfileApiService.cs
+++ b/src/Recyclarr.ServarrApi/ReleaseProfile/IReleaseProfileApiService.cs
@@ -1,7 +1,6 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.ReleaseProfile;
 
 public interface IReleaseProfileApiService
 {
diff --git a/src/Recyclarr.ServarrApi/Services/ReleaseProfileApiService.cs b/src/Recyclarr.ServarrApi/ReleaseProfile/ReleaseProfileApiService.cs
similarity index 94%
rename from src/Recyclarr.ServarrApi/Services/ReleaseProfileApiService.cs
rename to src/Recyclarr.ServarrApi/ReleaseProfile/ReleaseProfileApiService.cs
index 7c0a630a..89cb7c03 100644
--- a/src/Recyclarr.ServarrApi/Services/ReleaseProfileApiService.cs
+++ b/src/Recyclarr.ServarrApi/ReleaseProfile/ReleaseProfileApiService.cs
@@ -1,9 +1,8 @@
 using Flurl.Http;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 using Recyclarr.ServarrApi.Http;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.ReleaseProfile;
 
 public class ReleaseProfileApiService : IReleaseProfileApiService
 {
diff --git a/src/Recyclarr.ServarrApi/Dto/SonarrReleaseProfile.cs b/src/Recyclarr.ServarrApi/ReleaseProfile/SonarrReleaseProfile.cs
similarity index 95%
rename from src/Recyclarr.ServarrApi/Dto/SonarrReleaseProfile.cs
rename to src/Recyclarr.ServarrApi/ReleaseProfile/SonarrReleaseProfile.cs
index 6631ad87..66bdee0d 100644
--- a/src/Recyclarr.ServarrApi/Dto/SonarrReleaseProfile.cs
+++ b/src/Recyclarr.ServarrApi/ReleaseProfile/SonarrReleaseProfile.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace Recyclarr.ServarrApi.Dto;
+namespace Recyclarr.ServarrApi.ReleaseProfile;
 
 [UsedImplicitly(ImplicitUseKindFlags.Assign, ImplicitUseTargetFlags.Members)]
 public class SonarrPreferredTerm
diff --git a/src/Recyclarr.ServarrApi/Services/ISystemApiService.cs b/src/Recyclarr.ServarrApi/System/ISystemApiService.cs
similarity index 65%
rename from src/Recyclarr.ServarrApi/Services/ISystemApiService.cs
rename to src/Recyclarr.ServarrApi/System/ISystemApiService.cs
index 9b112041..c719f0c7 100644
--- a/src/Recyclarr.ServarrApi/Services/ISystemApiService.cs
+++ b/src/Recyclarr.ServarrApi/System/ISystemApiService.cs
@@ -1,7 +1,6 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.System;
 
 public interface ISystemApiService
 {
diff --git a/src/Recyclarr.ServarrApi/Services/SystemApiService.cs b/src/Recyclarr.ServarrApi/System/SystemApiService.cs
similarity index 87%
rename from src/Recyclarr.ServarrApi/Services/SystemApiService.cs
rename to src/Recyclarr.ServarrApi/System/SystemApiService.cs
index 2fcd2424..154237ad 100644
--- a/src/Recyclarr.ServarrApi/Services/SystemApiService.cs
+++ b/src/Recyclarr.ServarrApi/System/SystemApiService.cs
@@ -1,9 +1,8 @@
 using Flurl.Http;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 using Recyclarr.ServarrApi.Http;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.System;
 
 public class SystemApiService : ISystemApiService
 {
diff --git a/src/Recyclarr.ServarrApi/Dto/SystemStatus.cs b/src/Recyclarr.ServarrApi/System/SystemStatus.cs
similarity index 64%
rename from src/Recyclarr.ServarrApi/Dto/SystemStatus.cs
rename to src/Recyclarr.ServarrApi/System/SystemStatus.cs
index 864e85ec..22ad05d4 100644
--- a/src/Recyclarr.ServarrApi/Dto/SystemStatus.cs
+++ b/src/Recyclarr.ServarrApi/System/SystemStatus.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.ServarrApi.Dto;
+namespace Recyclarr.ServarrApi.System;
 
 public record SystemStatus(
     string AppName,
diff --git a/src/Recyclarr.ServarrApi/Services/ISonarrTagApiService.cs b/src/Recyclarr.ServarrApi/Tag/ISonarrTagApiService.cs
similarity index 74%
rename from src/Recyclarr.ServarrApi/Services/ISonarrTagApiService.cs
rename to src/Recyclarr.ServarrApi/Tag/ISonarrTagApiService.cs
index 66cc910c..01655b7d 100644
--- a/src/Recyclarr.ServarrApi/Services/ISonarrTagApiService.cs
+++ b/src/Recyclarr.ServarrApi/Tag/ISonarrTagApiService.cs
@@ -1,7 +1,6 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.Tag;
 
 public interface ISonarrTagApiService
 {
diff --git a/src/Recyclarr.ServarrApi/Dto/SonarrTag.cs b/src/Recyclarr.ServarrApi/Tag/SonarrTag.cs
similarity index 90%
rename from src/Recyclarr.ServarrApi/Dto/SonarrTag.cs
rename to src/Recyclarr.ServarrApi/Tag/SonarrTag.cs
index ec3813e2..0740a094 100644
--- a/src/Recyclarr.ServarrApi/Dto/SonarrTag.cs
+++ b/src/Recyclarr.ServarrApi/Tag/SonarrTag.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Recyclarr.Common;
 
-namespace Recyclarr.ServarrApi.Dto;
+namespace Recyclarr.ServarrApi.Tag;
 
 public class SonarrTag
 {
diff --git a/src/Recyclarr.ServarrApi/Services/SonarrTagApiService.cs b/src/Recyclarr.ServarrApi/Tag/SonarrTagApiService.cs
similarity index 90%
rename from src/Recyclarr.ServarrApi/Services/SonarrTagApiService.cs
rename to src/Recyclarr.ServarrApi/Tag/SonarrTagApiService.cs
index eb144244..e202c699 100644
--- a/src/Recyclarr.ServarrApi/Services/SonarrTagApiService.cs
+++ b/src/Recyclarr.ServarrApi/Tag/SonarrTagApiService.cs
@@ -1,9 +1,8 @@
 using Flurl.Http;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
 using Recyclarr.ServarrApi.Http;
 
-namespace Recyclarr.ServarrApi.Services;
+namespace Recyclarr.ServarrApi.Tag;
 
 public class SonarrTagApiService : ISonarrTagApiService
 {
diff --git a/src/tests/Recyclarr.Cli.Tests/NewQp.cs b/src/tests/Recyclarr.Cli.Tests/NewQp.cs
index 255b26d6..20a602bd 100644
--- a/src/tests/Recyclarr.Cli.Tests/NewQp.cs
+++ b/src/tests/Recyclarr.Cli.Tests/NewQp.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Tests;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/Api/QualityProfileDtoTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/Api/QualityProfileDtoTest.cs
index 04f7720d..40cd0735 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/Api/QualityProfileDtoTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/Api/QualityProfileDtoTest.cs
@@ -1,4 +1,4 @@
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile.Api;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhaseTest.cs
index 64ead7e6..7cf4a812 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhaseTest.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile.PipelinePhases;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityItemOrganizerTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityItemOrganizerTest.cs
index eacf6156..43e8b8aa 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityItemOrganizerTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityItemOrganizerTest.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityProfileExtensionsTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityProfileExtensionsTest.cs
index 79287a74..8b4cf671 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityProfileExtensionsTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityProfileExtensionsTest.cs
@@ -1,6 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualityProfile;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Extensions;
+using Recyclarr.ServarrApi.QualityProfile;
 
 // ReSharper disable CollectionNeverUpdated.Local
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs
index cc37335a..ea68dbd4 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileValidatorTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileValidatorTest.cs
index df91a9ca..da2e1697 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileValidatorTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileValidatorTest.cs
@@ -2,7 +2,7 @@ using FluentValidation.TestHelper;
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhaseTest.cs
index 951cdd8b..8c47b84b 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhaseTest.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityDefinition;
 using Recyclarr.TrashGuide.QualitySize;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualitySize.PipelinePhases;
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiFetchPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiFetchPhaseTest.cs
index 5becc673..4c754f5b 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiFetchPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiFetchPhaseTest.cs
@@ -1,7 +1,6 @@
 using Recyclarr.Cli.Pipelines.Tags;
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiPersistencePhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiPersistencePhaseTest.cs
index 431de4bb..02f6a844 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiPersistencePhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiPersistencePhaseTest.cs
@@ -1,8 +1,7 @@
 using Recyclarr.Cli.Pipelines.Tags;
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagTransactionPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagTransactionPhaseTest.cs
index fb3cf16d..a5a998d9 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagTransactionPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagTransactionPhaseTest.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.Tag;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/tests/Recyclarr.IntegrationTests/CustomFormatServiceTest.cs b/src/tests/Recyclarr.IntegrationTests/CustomFormatServiceTest.cs
index b66ae20a..4a5ed368 100644
--- a/src/tests/Recyclarr.IntegrationTests/CustomFormatServiceTest.cs
+++ b/src/tests/Recyclarr.IntegrationTests/CustomFormatServiceTest.cs
@@ -1,7 +1,7 @@
 using Flurl.Http.Testing;
 using Recyclarr.Common;
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Services;
+using Recyclarr.ServarrApi.CustomFormat;
 
 namespace Recyclarr.IntegrationTests;
 
@@ -18,7 +18,7 @@ public class CustomFormatServiceTest : IntegrationTestFixture
         using var http = new HttpTest();
         http.RespondWith(jsonBody);
 
-        var sut = Resolve<CustomFormatService>();
+        var sut = Resolve<CustomFormatApiService>();
         var result = await sut.GetCustomFormats(Substitute.ForPartsOf<ServiceConfiguration>());
 
         result.Should().HaveCountGreaterThan(5);