refactor: Reorganize and rename ServarrApi classes

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;
     }

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;
     }

src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs

@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityProfile;
-using Recyclarr.ServarrApi.Services;
 
 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;
     }

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs

@@ -1,14 +1,13 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityDefinition;
-using Recyclarr.ServarrApi.Services;
 
 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;
     }

src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs

@@ -1,15 +1,14 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.QualityDefinition;
-using Recyclarr.ServarrApi.Services;
 
 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;

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;

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;
 

src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs

@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.ReleaseProfile;
-using Recyclarr.ServarrApi.Services;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
 

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;
 

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;

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;
 

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;
 

src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs

@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.Tag;
-using Recyclarr.ServarrApi.Services;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 

src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs

@@ -1,6 +1,5 @@
 using Recyclarr.Config.Models;
-using Recyclarr.ServarrApi.Dto;
+using Recyclarr.ServarrApi.Tag;
-using Recyclarr.ServarrApi.Services;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 

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;
 

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;
 

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;
 

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)
     {

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;

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<QualityProfileApiService>().As<IQualityProfileApiService>();
-        builder.RegisterType<CustomFormatService>().As<ICustomFormatService>();
+        builder.RegisterType<CustomFormatApiService>().As<ICustomFormatApiService>();
-        builder.RegisterType<QualityDefinitionService>().As<IQualityDefinitionService>();
+        builder.RegisterType<QualityDefinitionApiService>().As<IQualityDefinitionApiService>();
     }
 }

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;
     }

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);

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);
 

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;
     }

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

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);

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
 {

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;
     }

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

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
 {

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
 {

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

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
 {

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
 {

src/Recyclarr.ServarrApi/System/SystemStatus.cs

@@ -1,4 +1,4 @@
-namespace Recyclarr.ServarrApi.Dto;
+namespace Recyclarr.ServarrApi.System;
 
 public record SystemStatus(
     string AppName,

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
 {

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
 {

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
 {

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;
 

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;
 

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;
 

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;
 

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.QualityProfile;
-using Recyclarr.ServarrApi.Extensions;
 
 // ReSharper disable CollectionNeverUpdated.Local
 

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;
 

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;
 

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;

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.Tag;
-using Recyclarr.ServarrApi.Services;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
 

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.Tag;
-using Recyclarr.ServarrApi.Services;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
 

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;
 

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);