diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 49dda01f..8d10c9f9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -11,10 +11,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Using Include="Serilog" />
-  </ItemGroup>
-
   <!--
     To prevent System.Reactive.xml (and other XML docs) from being in the publish dir.
     See: https://github.com/dotnet/reactive/issues/1066#issuecomment-548941146
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 25ff72cc..7810913c 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -8,7 +8,7 @@
     <PackageVersion Include="AutofacSerilogIntegration" Version="5.0.0" />
     <PackageVersion Include="AutoMapper" Version="12.0.1" />
     <PackageVersion Include="AutoMapper.Collection" Version="9.0.0" />
-    <PackageVersion Include="AutoMapper.Contrib.Autofac.DependencyInjection" Version="7.1.0" />
+    <PackageVersion Include="AutoMapper.Contrib.Autofac.DependencyInjection" Version="7.2.0-alpha.0" />
     <PackageVersion Include="CliWrap" Version="3.6.4" />
     <PackageVersion Include="FluentValidation" Version="11.7.1" />
     <PackageVersion Include="Flurl" Version="3.0.7" />
@@ -64,4 +64,4 @@
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Recyclarr.Cli/Cache/CachePersister.cs b/src/Recyclarr.Cli/Cache/CachePersister.cs
index 2caf873f..69b4f336 100644
--- a/src/Recyclarr.Cli/Cache/CachePersister.cs
+++ b/src/Recyclarr.Cli/Cache/CachePersister.cs
@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Cache;
 
diff --git a/src/Recyclarr.Cli/Cache/ICachePersister.cs b/src/Recyclarr.Cli/Cache/ICachePersister.cs
index c1630ae7..14fccbee 100644
--- a/src/Recyclarr.Cli/Cache/ICachePersister.cs
+++ b/src/Recyclarr.Cli/Cache/ICachePersister.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Cache;
 
diff --git a/src/Recyclarr.Cli/Cache/IServiceCache.cs b/src/Recyclarr.Cli/Cache/IServiceCache.cs
index a5e0b137..e6d9dab2 100644
--- a/src/Recyclarr.Cli/Cache/IServiceCache.cs
+++ b/src/Recyclarr.Cli/Cache/IServiceCache.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Cache;
 
diff --git a/src/Recyclarr.Cli/Cache/ServiceCache.cs b/src/Recyclarr.Cli/Cache/ServiceCache.cs
index 0dfdf607..aecd8dd0 100644
--- a/src/Recyclarr.Cli/Cache/ServiceCache.cs
+++ b/src/Recyclarr.Cli/Cache/ServiceCache.cs
@@ -3,7 +3,7 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Interfaces;
 using Recyclarr.TrashLib.Json;
 
diff --git a/src/Recyclarr.Cli/CompositionRoot.cs b/src/Recyclarr.Cli/CompositionRoot.cs
index fb78e043..610b5370 100644
--- a/src/Recyclarr.Cli/CompositionRoot.cs
+++ b/src/Recyclarr.Cli/CompositionRoot.cs
@@ -2,6 +2,8 @@ using System.IO.Abstractions;
 using System.Reflection;
 using Autofac;
 using Autofac.Extras.Ordering;
+using AutoMapper.Contrib.Autofac.DependencyInjection;
+using AutoMapper.EquivalencyExpression;
 using Recyclarr.Cli.Cache;
 using Recyclarr.Cli.Console.Helpers;
 using Recyclarr.Cli.Console.Setup;
@@ -16,8 +18,11 @@ using Recyclarr.Cli.Pipelines.Tags;
 using Recyclarr.Cli.Processors;
 using Recyclarr.Common;
 using Recyclarr.TrashLib;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide;
 using Recyclarr.TrashLib.Interfaces;
 using Recyclarr.TrashLib.Startup;
+using Recyclarr.Yaml;
 using Serilog.Core;
 using Spectre.Console.Cli;
 
@@ -32,7 +37,10 @@ public static class CompositionRoot
         RegisterLogger(builder);
 
         builder.RegisterModule<MigrationAutofacModule>();
-        builder.RegisterModule(new TrashLibAutofacModule {AdditionalMapperProfileAssembly = thisAssembly});
+        builder.RegisterModule<TrashLibAutofacModule>();
+        builder.RegisterModule<ConfigAutofacModule>();
+        builder.RegisterModule<GuideAutofacModule>();
+        builder.RegisterModule<YamlAutofacModule>();
         builder.RegisterModule<ServiceProcessorsAutofacModule>();
         builder.RegisterModule<CacheAutofacModule>();
 
@@ -40,6 +48,8 @@ public static class CompositionRoot
         builder.RegisterType<FileSystem>().As<IFileSystem>();
         builder.Register(_ => new ResourceDataReader(thisAssembly)).As<IResourceDataReader>();
 
+        builder.RegisterAutoMapper(c => c.AddCollectionMappers(), thisAssembly);
+
         CommandRegistrations(builder);
         PipelineRegistrations(builder);
     }
diff --git a/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs b/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs
index a7f70f6c..34d1f2df 100644
--- a/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs
+++ b/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs
@@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Recyclarr.Cli.Console.Helpers;
 using Recyclarr.Cli.Console.Settings;
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+using Recyclarr.Cli.Pipelines.CustomFormat;
 using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Repo;
 using Spectre.Console.Cli;
diff --git a/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs b/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs
index a8333865..fd551833 100644
--- a/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs
+++ b/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs
@@ -2,7 +2,7 @@ using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Recyclarr.Cli.Console.Helpers;
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
+using Recyclarr.Cli.Pipelines.QualitySize;
 using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Repo;
 using Spectre.Console.Cli;
diff --git a/src/Recyclarr.Cli/Console/Commands/ListReleaseProfilesCommand.cs b/src/Recyclarr.Cli/Console/Commands/ListReleaseProfilesCommand.cs
index f8fe24a7..4206be99 100644
--- a/src/Recyclarr.Cli/Console/Commands/ListReleaseProfilesCommand.cs
+++ b/src/Recyclarr.Cli/Console/Commands/ListReleaseProfilesCommand.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
+using Recyclarr.Cli.Pipelines.ReleaseProfile;
 using Recyclarr.TrashLib.Repo;
 using Spectre.Console.Cli;
 
diff --git a/src/Recyclarr.Cli/Console/Helpers/CacheStoragePath.cs b/src/Recyclarr.Cli/Console/Helpers/CacheStoragePath.cs
index 948bd278..971a853a 100644
--- a/src/Recyclarr.Cli/Console/Helpers/CacheStoragePath.cs
+++ b/src/Recyclarr.Cli/Console/Helpers/CacheStoragePath.cs
@@ -2,7 +2,7 @@ using System.Data.HashFunction.FNV;
 using System.Globalization;
 using System.IO.Abstractions;
 using System.Text;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Interfaces;
 using Recyclarr.TrashLib.Startup;
 
diff --git a/src/Recyclarr.Cli/GlobalUsings.cs b/src/Recyclarr.Cli/GlobalUsings.cs
index 53885661..1e3063b8 100644
--- a/src/Recyclarr.Cli/GlobalUsings.cs
+++ b/src/Recyclarr.Cli/GlobalUsings.cs
@@ -1 +1,2 @@
 global using SuperLinq;
+global using Serilog;
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/CustomFormatService.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/CustomFormatService.cs
index c2c71be9..9c8180a2 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/CustomFormatService.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/CustomFormatService.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 using Recyclarr.TrashLib.Models;
 
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/ICustomFormatService.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/ICustomFormatService.cs
index 84d616f7..1ee15cd0 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/ICustomFormatService.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/Api/ICustomFormatService.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.Api;
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs
index ab0df5a8..f2dcacae 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs
@@ -2,7 +2,6 @@ using Autofac;
 using Autofac.Extras.AggregateService;
 using Recyclarr.Cli.Cache;
 using Recyclarr.Cli.Pipelines.CustomFormat.Api;
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
 using Recyclarr.Cli.Pipelines.CustomFormat.Models;
 using Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
 
@@ -12,13 +11,10 @@ public class CustomFormatAutofacModule : Module
 {
     protected override void Load(ContainerBuilder builder)
     {
-        builder.RegisterType<CustomFormatGuideService>().As<ICustomFormatGuideService>().SingleInstance();
         builder.RegisterType<ProcessedCustomFormatCache>().As<IPipelineCache>().AsSelf().InstancePerLifetimeScope();
 
         builder.RegisterType<CustomFormatService>().As<ICustomFormatService>();
         builder.RegisterType<CachePersister>().As<ICachePersister>();
-        builder.RegisterType<CustomFormatLoader>().As<ICustomFormatLoader>();
-        builder.RegisterType<CustomFormatCategoryParser>().As<ICustomFormatCategoryParser>();
         builder.RegisterType<CustomFormatDataLister>();
 
         builder.RegisterAggregateService<ICustomFormatPipelinePhases>();
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatDataLister.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs
similarity index 96%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatDataLister.cs
rename to src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs
index 534f5044..412b6008 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatDataLister.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs
@@ -1,8 +1,9 @@
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.CustomFormat;
 using Spectre.Console;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.Cli.Pipelines.CustomFormat;
 
 public class CustomFormatDataLister
 {
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs
index 352be4ac..a5a198c2 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs
@@ -4,7 +4,7 @@ using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines.CustomFormat.Models;
 using Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat;
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Models/ProcessedConfigData.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/Models/ProcessedConfigData.cs
index 5c723f9a..0dc35165 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Models/ProcessedConfigData.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/Models/ProcessedConfigData.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.Models;
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs
index e4d78e56..043a874c 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiFetchPhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.CustomFormat.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
index 340df45c..4ea111e2 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatApiPersistencePhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.CustomFormat.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhase.cs
index c3e1cc2a..d1efa15c 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhase.cs
@@ -1,7 +1,7 @@
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
 using Recyclarr.Cli.Pipelines.CustomFormat.Models;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.CustomFormat;
 using Recyclarr.TrashLib.Models;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs
index ab01c7dc..47c05433 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Cli.Cache;
 using Recyclarr.Cli.Pipelines.CustomFormat.Models;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
 namespace Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
diff --git a/src/Recyclarr.Cli/Pipelines/ISyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/ISyncPipeline.cs
index e9650cd1..49791110 100644
--- a/src/Recyclarr.Cli/Pipelines/ISyncPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/ISyncPipeline.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Console.Settings;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/IQualityProfileService.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/IQualityProfileService.cs
index ad25c357..9975dc2c 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/IQualityProfileService.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/IQualityProfileService.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.Api;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/QualityProfileService.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/QualityProfileService.cs
index dea01713..8436fa2c 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/QualityProfileService.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/Api/QualityProfileService.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.Api;
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
index 81326830..20ff3fac 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiFetchPhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
index 3b55c2cb..a8695fc0 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileApiPersistencePhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhase.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhase.cs
index bf558f35..ad80a702 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhase.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Pipelines.CustomFormat.Models;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
 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 063beae3..bfae85ba 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.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Common.Extensions;
 using Recyclarr.Common.FluentValidation;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 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 64f7c3d8..22cb2a80 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityItemOrganizer.cs
@@ -1,6 +1,7 @@
+using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile;
 
@@ -24,6 +25,8 @@ public class QualityItemOrganizer
         };
     }
 
+    [SuppressMessage("SonarLint", "S1751", Justification =
+        "'continue' used here is for separating local methods")]
     private List<ProfileItemDto> ProcessWantedItems(
         IReadOnlyCollection<ProfileItemDto> dtoItems,
         IReadOnlyCollection<QualityProfileQualityConfig> configQualities)
diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileSyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileSyncPipeline.cs
index 60201dfa..cda0401b 100644
--- a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileSyncPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfileSyncPipeline.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualityProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Api/IQualityDefinitionService.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/Api/IQualityDefinitionService.cs
index cb80a883..acded6d7 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Api/IQualityDefinitionService.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/Api/IQualityDefinitionService.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.Api;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Api/QualityDefinitionService.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/Api/QualityDefinitionService.cs
index 1660607f..e74a7f43 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Api/QualityDefinitionService.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/Api/QualityDefinitionService.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.Api;
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs
index 9af68640..395750f2 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiFetchPhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualitySize.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs
index fcbf3e12..417c18be 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeApiPersistencePhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.QualitySize.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhase.cs
index 3c8a0b0a..c2e3f188 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhase.cs
@@ -1,15 +1,15 @@
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.QualitySize;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
 public class QualitySizeGuidePhase
 {
     private readonly ILogger _log;
-    private readonly IQualityGuideService _guide;
+    private readonly IQualitySizeGuideService _guide;
 
-    public QualitySizeGuidePhase(ILogger log, IQualityGuideService guide)
+    public QualitySizeGuidePhase(ILogger log, IQualitySizeGuideService guide)
     {
         _log = log;
         _guide = guide;
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizePreviewPhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizePreviewPhase.cs
index f1c4a525..40c52527 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizePreviewPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizePreviewPhase.cs
@@ -1,3 +1,4 @@
+using Recyclarr.TrashLib.Guide.QualitySize;
 using Spectre.Console;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
index 6aed98a4..69fa71c0 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhase.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using Recyclarr.Cli.Pipelines.QualitySize.Api;
+using Recyclarr.TrashLib.Guide.QualitySize;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeAutofacModule.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeAutofacModule.cs
index d7a1a7b9..035f9691 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeAutofacModule.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeAutofacModule.cs
@@ -1,7 +1,6 @@
 using Autofac;
 using Autofac.Extras.AggregateService;
 using Recyclarr.Cli.Pipelines.QualitySize.Api;
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
 using Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize;
@@ -12,8 +11,6 @@ public class QualitySizeAutofacModule : Module
     {
         base.Load(builder);
         builder.RegisterType<QualityDefinitionService>().As<IQualityDefinitionService>();
-        builder.RegisterType<QualityGuideService>().As<IQualityGuideService>().SingleInstance();
-        builder.RegisterType<QualitySizeGuideParser>();
         builder.RegisterType<QualitySizeDataLister>();
 
         builder.RegisterAggregateService<IQualitySizePipelinePhases>();
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizeDataLister.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs
similarity index 80%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizeDataLister.cs
rename to src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs
index f3133c3a..23d53c92 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizeDataLister.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs
@@ -1,16 +1,17 @@
 using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.QualitySize;
 using Spectre.Console;
 
-namespace Recyclarr.Cli.Pipelines.QualitySize.Guide;
+namespace Recyclarr.Cli.Pipelines.QualitySize;
 
 public class QualitySizeDataLister
 {
     private readonly IAnsiConsole _console;
-    private readonly IQualityGuideService _guide;
+    private readonly IQualitySizeGuideService _guide;
 
     public QualitySizeDataLister(
         IAnsiConsole console,
-        IQualityGuideService guide)
+        IQualitySizeGuideService guide)
     {
         _console = console;
         _guide = guide;
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeSyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeSyncPipeline.cs
index 6c4182c4..94e13c51 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeSyncPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeSyncPipeline.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.QualitySize;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/IReleaseProfileApiService.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/IReleaseProfileApiService.cs
index e962d83b..56035310 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/IReleaseProfileApiService.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/IReleaseProfileApiService.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Objects;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Api;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ISonarrReleaseProfileCompatibilityHandler.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ISonarrReleaseProfileCompatibilityHandler.cs
index 02863aca..efa9052b 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ISonarrReleaseProfileCompatibilityHandler.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ISonarrReleaseProfileCompatibilityHandler.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json.Linq;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Objects;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Api;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ReleaseProfileApiService.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ReleaseProfileApiService.cs
index 46042cb2..53c02305 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ReleaseProfileApiService.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/ReleaseProfileApiService.cs
@@ -1,7 +1,7 @@
 using Flurl.Http;
 using Newtonsoft.Json.Linq;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Objects;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Api;
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandler.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandler.cs
index 47e92ada..3eb8cd71 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandler.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandler.cs
@@ -4,7 +4,7 @@ using Newtonsoft.Json.Schema;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Objects;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Schemas;
 using Recyclarr.TrashLib.Compatibility.Sonarr;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Api;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilter.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilter.cs
index 0ce04609..335c6733 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilter.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilter.cs
@@ -1,4 +1,5 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilterPipeline.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilterPipeline.cs
index 26dc979f..860ac0da 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilterPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IReleaseProfileFilterPipeline.cs
@@ -1,4 +1,5 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IncludeExcludeFilter.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IncludeExcludeFilter.cs
index 75dc0fc1..35f777ff 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IncludeExcludeFilter.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/IncludeExcludeFilter.cs
@@ -1,4 +1,5 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFilterer.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFilterer.cs
index 6e8d5368..a81b9182 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFilterer.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFilterer.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileFilterPipeline.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileFilterPipeline.cs
index a55d665d..826b3736 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileFilterPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileFilterPipeline.cs
@@ -1,4 +1,5 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilter.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilter.cs
index 77ce5bb2..074b53f9 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilter.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilter.cs
@@ -1,4 +1,5 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs
index e11a7ac8..cd0d3b3e 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileApiFetchPhase.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Objects;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 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 312f7c18..4f6626d4 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.Api;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Models;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileConfigPhase.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileConfigPhase.cs
index 2c202a8d..eee79050 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileConfigPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/PipelinePhases/ReleaseProfileConfigPhase.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.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 6348ed32..1f9828f7 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileAutofacModule.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileAutofacModule.cs
@@ -3,7 +3,6 @@ using Autofac.Extras.AggregateService;
 using Autofac.Extras.Ordering;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Api;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
@@ -16,14 +15,11 @@ public class ReleaseProfileAutofacModule : Module
 
         builder.RegisterType<ReleaseProfileApiService>().As<IReleaseProfileApiService>();
         builder.RegisterType<ReleaseProfileFilterPipeline>().As<IReleaseProfileFilterPipeline>();
-        builder.RegisterType<ReleaseProfileGuideParser>();
         builder.RegisterType<ReleaseProfileDataLister>();
 
         builder.RegisterType<SonarrReleaseProfileCompatibilityHandler>()
             .As<ISonarrReleaseProfileCompatibilityHandler>();
 
-        builder.RegisterType<ReleaseProfileGuideService>().As<IReleaseProfileGuideService>().SingleInstance();
-
         builder.RegisterAggregateService<IReleaseProfilePipelinePhases>();
         builder.RegisterType<ReleaseProfileConfigPhase>();
         builder.RegisterType<ReleaseProfileApiFetchPhase>();
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileDataLister.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileDataLister.cs
similarity index 96%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileDataLister.cs
rename to src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileDataLister.cs
index 6538bf09..bbe05711 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileDataLister.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileDataLister.cs
@@ -1,8 +1,9 @@
 using System.Text;
 using Recyclarr.Common.Extensions;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 using Spectre.Console;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
+namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
 
 public class ReleaseProfileDataLister
 {
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileSyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileSyncPipeline.cs
index 19d4b6a8..030c64ae 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileSyncPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileSyncPipeline.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/Api/ISonarrTagApiService.cs b/src/Recyclarr.Cli/Pipelines/Tags/Api/ISonarrTagApiService.cs
index 3a867cd8..8342d2b6 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/Api/ISonarrTagApiService.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/Api/ISonarrTagApiService.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.Tags.Api;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/Api/SonarrTagApiService.cs b/src/Recyclarr.Cli/Pipelines/Tags/Api/SonarrTagApiService.cs
index 4884e538..83b68a6e 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/Api/SonarrTagApiService.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/Api/SonarrTagApiService.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 
 namespace Recyclarr.Cli.Pipelines.Tags.Api;
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs
index 3b40908c..a6d5e6fe 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiFetchPhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.Tags.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 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 a8de87cc..d03abaf3 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagApiPersistencePhase.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.Tags.Api;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagConfigPhase.cs b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagConfigPhase.cs
index 473c5a62..c7d1e8ec 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagConfigPhase.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/PipelinePhases/TagConfigPhase.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/Recyclarr.Cli/Pipelines/Tags/TagSyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/Tags/TagSyncPipeline.cs
index 5ca4b4fe..9881a868 100644
--- a/src/Recyclarr.Cli/Pipelines/Tags/TagSyncPipeline.cs
+++ b/src/Recyclarr.Cli/Pipelines/Tags/TagSyncPipeline.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Pipelines.Tags;
 
diff --git a/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs b/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs
index b9e05b92..41d67b8a 100644
--- a/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs
+++ b/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs
@@ -1,7 +1,6 @@
 using System.IO.Abstractions;
 using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.Config.Services;
 using Recyclarr.TrashLib.Startup;
 using Spectre.Console;
 using Spectre.Console.Rendering;
diff --git a/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs b/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs
index 419af74a..f2cb9931 100644
--- a/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs
+++ b/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Console.Commands;
 using Recyclarr.TrashLib.Config;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Guide;
 using Spectre.Console;
 
 namespace Recyclarr.Cli.Processors.Config;
diff --git a/src/Recyclarr.Cli/Processors/Config/TemplateConfigCreator.cs b/src/Recyclarr.Cli/Processors/Config/TemplateConfigCreator.cs
index 68a34593..ce35b719 100644
--- a/src/Recyclarr.Cli/Processors/Config/TemplateConfigCreator.cs
+++ b/src/Recyclarr.Cli/Processors/Config/TemplateConfigCreator.cs
@@ -1,8 +1,8 @@
 using System.IO.Abstractions;
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
 using Recyclarr.TrashLib.ExceptionTypes;
+using Recyclarr.TrashLib.Guide;
 using Recyclarr.TrashLib.Startup;
 
 namespace Recyclarr.Cli.Processors.Config;
diff --git a/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs b/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
index b5148ecd..bc578acc 100644
--- a/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
+++ b/src/Recyclarr.Cli/Processors/Delete/DeleteCustomFormatsProcessor.cs
@@ -3,7 +3,6 @@ using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines.CustomFormat.Api;
 using Recyclarr.TrashLib.Compatibility.Sonarr;
 using Recyclarr.TrashLib.Config;
-using Recyclarr.TrashLib.Config.Services;
 using Recyclarr.TrashLib.ExceptionTypes;
 using Recyclarr.TrashLib.Models;
 using Spectre.Console;
diff --git a/src/Recyclarr.Cli/Processors/ErrorHandling/ConsoleExceptionHandler.cs b/src/Recyclarr.Cli/Processors/ErrorHandling/ConsoleExceptionHandler.cs
index 229d1025..7ee0cd8d 100644
--- a/src/Recyclarr.Cli/Processors/ErrorHandling/ConsoleExceptionHandler.cs
+++ b/src/Recyclarr.Cli/Processors/ErrorHandling/ConsoleExceptionHandler.cs
@@ -1,4 +1,5 @@
 using Flurl.Http;
+using Recyclarr.TrashLib.Config.ExceptionTypes;
 using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
 using Recyclarr.TrashLib.ExceptionTypes;
 using Recyclarr.TrashLib.Http;
diff --git a/src/Recyclarr.Cli/Processors/IServiceProcessor.cs b/src/Recyclarr.Cli/Processors/IServiceProcessor.cs
index e088735c..d899e724 100644
--- a/src/Recyclarr.Cli/Processors/IServiceProcessor.cs
+++ b/src/Recyclarr.Cli/Processors/IServiceProcessor.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Console.Settings;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Processors;
 
diff --git a/src/Recyclarr.Cli/Processors/Sync/SyncPipelineExecutor.cs b/src/Recyclarr.Cli/Processors/Sync/SyncPipelineExecutor.cs
index af98ca47..657a9158 100644
--- a/src/Recyclarr.Cli/Processors/Sync/SyncPipelineExecutor.cs
+++ b/src/Recyclarr.Cli/Processors/Sync/SyncPipelineExecutor.cs
@@ -1,6 +1,6 @@
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Pipelines;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Processors.Sync;
 
diff --git a/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs b/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs
index 680666e5..19761dc7 100644
--- a/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs
+++ b/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs
@@ -3,7 +3,6 @@ using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Processors.ErrorHandling;
 using Recyclarr.TrashLib.Compatibility;
 using Recyclarr.TrashLib.Config;
-using Recyclarr.TrashLib.Config.Services;
 using Spectre.Console;
 
 namespace Recyclarr.Cli.Processors.Sync;
diff --git a/src/Recyclarr.Cli/Recyclarr.Cli.csproj b/src/Recyclarr.Cli/Recyclarr.Cli.csproj
index f20fcd33..9bac1d75 100644
--- a/src/Recyclarr.Cli/Recyclarr.Cli.csproj
+++ b/src/Recyclarr.Cli/Recyclarr.Cli.csproj
@@ -29,10 +29,16 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.Config\Recyclarr.TrashLib.Config.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.Guide\Recyclarr.TrashLib.Guide.csproj" />
     <ProjectReference Include="..\Recyclarr.TrashLib\Recyclarr.TrashLib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="config-template.yml" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Pipelines\ReleaseProfile\Guide\" />
+  </ItemGroup>
 </Project>
diff --git a/src/Recyclarr.Common/GlobalUsings.cs b/src/Recyclarr.Common/GlobalUsings.cs
new file mode 100644
index 00000000..d1ab45b3
--- /dev/null
+++ b/src/Recyclarr.Common/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Serilog;
diff --git a/src/Recyclarr.Gui/Program.cs b/src/Recyclarr.Gui/Program.cs
index 144d903d..f08c1050 100644
--- a/src/Recyclarr.Gui/Program.cs
+++ b/src/Recyclarr.Gui/Program.cs
@@ -8,6 +8,7 @@ using Autofac.Extensions.DependencyInjection;
 using MudBlazor.Services;
 using Recyclarr.Gui;
 using Recyclarr.TrashLib.Startup;
+using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/src/Recyclarr.TrashLib/Config/ConfigAutofacModule.cs b/src/Recyclarr.TrashLib.Config/ConfigAutofacModule.cs
similarity index 77%
rename from src/Recyclarr.TrashLib/Config/ConfigAutofacModule.cs
rename to src/Recyclarr.TrashLib.Config/ConfigAutofacModule.cs
index ed9971c8..2d8d42e4 100644
--- a/src/Recyclarr.TrashLib/Config/ConfigAutofacModule.cs
+++ b/src/Recyclarr.TrashLib.Config/ConfigAutofacModule.cs
@@ -1,14 +1,12 @@
 using Autofac;
+using AutoMapper.Contrib.Autofac.DependencyInjection;
+using AutoMapper.EquivalencyExpression;
 using FluentValidation;
 using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
 using Recyclarr.TrashLib.Config.Secrets;
-using Recyclarr.TrashLib.Config.Services;
-using Recyclarr.TrashLib.Config.Yaml;
-using Recyclarr.TrashLib.Settings;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.ObjectFactories;
+using Recyclarr.Yaml;
 
 namespace Recyclarr.TrashLib.Config;
 
@@ -16,23 +14,19 @@ public class ConfigAutofacModule : Module
 {
     protected override void Load(ContainerBuilder builder)
     {
+        builder.RegisterAutoMapper(c => c.AddCollectionMappers(), ThisAssembly);
+
         builder.RegisterAssemblyTypes(ThisAssembly)
             .AssignableTo<IYamlBehavior>()
             .As<IYamlBehavior>();
 
-        builder.RegisterType<SettingsProvider>().As<ISettingsProvider>().SingleInstance();
         builder.RegisterType<SecretsProvider>().As<ISecretsProvider>().SingleInstance();
-        builder.RegisterType<YamlSerializerFactory>().As<IYamlSerializerFactory>();
-
         builder.RegisterType<YamlIncludeResolver>().As<IYamlIncludeResolver>();
         builder.RegisterType<ConfigIncludeProcessor>().As<IIncludeProcessor>();
         builder.RegisterType<TemplateIncludeProcessor>().As<IIncludeProcessor>();
-
         builder.RegisterType<ConfigurationRegistry>().As<IConfigurationRegistry>();
-        builder.RegisterType<DefaultObjectFactory>().As<IObjectFactory>();
         builder.RegisterType<ConfigurationLoader>().As<IConfigurationLoader>();
         builder.RegisterType<ConfigurationFinder>().As<IConfigurationFinder>();
-        builder.RegisterType<ConfigTemplateGuideService>().As<IConfigTemplateGuideService>().SingleInstance();
         builder.RegisterType<ConfigValidationExecutor>();
         builder.RegisterType<ConfigParser>();
         builder.RegisterType<ConfigSaver>();
diff --git a/src/Recyclarr.TrashLib/Config/ConfigExtensions.cs b/src/Recyclarr.TrashLib.Config/ConfigExtensions.cs
similarity index 98%
rename from src/Recyclarr.TrashLib/Config/ConfigExtensions.cs
rename to src/Recyclarr.TrashLib.Config/ConfigExtensions.cs
index b2e9b1f0..21e48a1e 100644
--- a/src/Recyclarr.TrashLib/Config/ConfigExtensions.cs
+++ b/src/Recyclarr.TrashLib.Config/ConfigExtensions.cs
@@ -1,6 +1,5 @@
 using Recyclarr.Common.Extensions;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.Config.Services;
 
 namespace Recyclarr.TrashLib.Config;
 
diff --git a/src/Recyclarr.TrashLib/Config/ConfigFilterCriteria.cs b/src/Recyclarr.TrashLib.Config/ConfigFilterCriteria.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/ConfigFilterCriteria.cs
rename to src/Recyclarr.TrashLib.Config/ConfigFilterCriteria.cs
diff --git a/src/Recyclarr.TrashLib/Config/ConfigurationRegistry.cs b/src/Recyclarr.TrashLib.Config/ConfigurationRegistry.cs
similarity index 96%
rename from src/Recyclarr.TrashLib/Config/ConfigurationRegistry.cs
rename to src/Recyclarr.TrashLib.Config/ConfigurationRegistry.cs
index 666b6efa..7903e735 100644
--- a/src/Recyclarr.TrashLib/Config/ConfigurationRegistry.cs
+++ b/src/Recyclarr.TrashLib.Config/ConfigurationRegistry.cs
@@ -1,8 +1,7 @@
 using System.IO.Abstractions;
+using Recyclarr.TrashLib.Config.ExceptionTypes;
 using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
-using Recyclarr.TrashLib.Config.Services;
-using Recyclarr.TrashLib.ExceptionTypes;
 
 namespace Recyclarr.TrashLib.Config;
 
diff --git a/src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs b/src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs
rename to src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs
diff --git a/src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs b/src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs
rename to src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs
diff --git a/src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs b/src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs
similarity index 94%
rename from src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs
rename to src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs
index 43bf3cde..559b7096 100644
--- a/src/Recyclarr.TrashLib/Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs
+++ b/src/Recyclarr.TrashLib.Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using Recyclarr.Common;
-using Recyclarr.TrashLib.Config.Yaml;
+using Recyclarr.Yaml;
 using YamlDotNet.Serialization;
 
 namespace Recyclarr.TrashLib.Config.EnvironmentVariables;
diff --git a/src/Recyclarr.TrashLib/ExceptionTypes/DuplicateInstancesException.cs b/src/Recyclarr.TrashLib.Config/ExceptionTypes/DuplicateInstancesException.cs
similarity index 83%
rename from src/Recyclarr.TrashLib/ExceptionTypes/DuplicateInstancesException.cs
rename to src/Recyclarr.TrashLib.Config/ExceptionTypes/DuplicateInstancesException.cs
index 390deb5b..2b34ad65 100644
--- a/src/Recyclarr.TrashLib/ExceptionTypes/DuplicateInstancesException.cs
+++ b/src/Recyclarr.TrashLib.Config/ExceptionTypes/DuplicateInstancesException.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.ExceptionTypes;
+namespace Recyclarr.TrashLib.Config.ExceptionTypes;
 
 public class DuplicateInstancesException : Exception
 {
diff --git a/src/Recyclarr.TrashLib/ExceptionTypes/InvalidInstancesException.cs b/src/Recyclarr.TrashLib.Config/ExceptionTypes/InvalidInstancesException.cs
similarity index 82%
rename from src/Recyclarr.TrashLib/ExceptionTypes/InvalidInstancesException.cs
rename to src/Recyclarr.TrashLib.Config/ExceptionTypes/InvalidInstancesException.cs
index 20c9d312..69374569 100644
--- a/src/Recyclarr.TrashLib/ExceptionTypes/InvalidInstancesException.cs
+++ b/src/Recyclarr.TrashLib.Config/ExceptionTypes/InvalidInstancesException.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.ExceptionTypes;
+namespace Recyclarr.TrashLib.Config.ExceptionTypes;
 
 public class InvalidInstancesException : Exception
 {
diff --git a/src/Recyclarr.TrashLib/ExceptionTypes/SplitInstancesException.cs b/src/Recyclarr.TrashLib.Config/ExceptionTypes/SplitInstancesException.cs
similarity index 82%
rename from src/Recyclarr.TrashLib/ExceptionTypes/SplitInstancesException.cs
rename to src/Recyclarr.TrashLib.Config/ExceptionTypes/SplitInstancesException.cs
index 80ec7bf3..967b3c25 100644
--- a/src/Recyclarr.TrashLib/ExceptionTypes/SplitInstancesException.cs
+++ b/src/Recyclarr.TrashLib.Config/ExceptionTypes/SplitInstancesException.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.ExceptionTypes;
+namespace Recyclarr.TrashLib.Config.ExceptionTypes;
 
 public class SplitInstancesException : Exception
 {
diff --git a/src/Recyclarr.TrashLib.Config/GlobalUsings.cs b/src/Recyclarr.TrashLib.Config/GlobalUsings.cs
new file mode 100644
index 00000000..1e3063b8
--- /dev/null
+++ b/src/Recyclarr.TrashLib.Config/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using SuperLinq;
+global using Serilog;
diff --git a/src/Recyclarr.TrashLib/Config/IConfigurationRegistry.cs b/src/Recyclarr.TrashLib.Config/IConfigurationRegistry.cs
similarity index 81%
rename from src/Recyclarr.TrashLib/Config/IConfigurationRegistry.cs
rename to src/Recyclarr.TrashLib.Config/IConfigurationRegistry.cs
index 283b9223..4eb92fbf 100644
--- a/src/Recyclarr.TrashLib/Config/IConfigurationRegistry.cs
+++ b/src/Recyclarr.TrashLib.Config/IConfigurationRegistry.cs
@@ -1,5 +1,3 @@
-using Recyclarr.TrashLib.Config.Services;
-
 namespace Recyclarr.TrashLib.Config;
 
 public interface IConfigurationRegistry
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/BackwardCompatibility/ResetUnmatchedScoresYamlTypeConverter.cs b/src/Recyclarr.TrashLib.Config/Parsing/BackwardCompatibility/ResetUnmatchedScoresYamlTypeConverter.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/BackwardCompatibility/ResetUnmatchedScoresYamlTypeConverter.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/BackwardCompatibility/ResetUnmatchedScoresYamlTypeConverter.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigParser.cs
similarity index 93%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigParser.cs
index 6fbe7334..c5707d38 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigParser.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ConfigParser.cs
@@ -1,7 +1,7 @@
 using System.IO.Abstractions;
 using JetBrains.Annotations;
 using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
-using Recyclarr.TrashLib.Config.Yaml;
+using Recyclarr.Yaml;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 
@@ -55,7 +55,7 @@ public class ConfigParser
                     break;
 
                 default:
-                    var msg = ContextualMessages.GetContextualErrorFromException(e) ??
+                    var msg = ConfigContextualMessages.GetContextualErrorFromException(e) ??
                         e.InnerException?.Message ?? e.Message;
                     _log.Error("Exception at line {Line}: {Msg}", line, msg);
                     break;
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigSaver.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigSaver.cs
similarity index 94%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigSaver.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigSaver.cs
index 0065d08c..87b52440 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigSaver.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ConfigSaver.cs
@@ -1,6 +1,6 @@
 using System.IO.Abstractions;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Yaml;
+using Recyclarr.Yaml;
 
 namespace Recyclarr.TrashLib.Config.Parsing;
 
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigValidationExecutor.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigValidationExecutor.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigValidationExecutor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigValidationExecutor.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlDataObjects.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlDataObjects.cs
similarity index 99%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlDataObjects.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlDataObjects.cs
index 3e8df15c..9689e699 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlDataObjects.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlDataObjects.cs
@@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Recyclarr.TrashLib.Config.Parsing.BackwardCompatibility;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
-using Recyclarr.TrashLib.Config.Services;
 using YamlDotNet.Serialization;
 
 namespace Recyclarr.TrashLib.Config.Parsing;
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlDataObjectsValidation.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlDataObjectsValidation.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlDataObjectsValidation.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlDataObjectsValidation.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlMapperProfile.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlMapperProfile.cs
similarity index 97%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlMapperProfile.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlMapperProfile.cs
index ba311f74..5743be33 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigYamlMapperProfile.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ConfigYamlMapperProfile.cs
@@ -1,6 +1,5 @@
 using AutoMapper;
 using JetBrains.Annotations;
-using Recyclarr.TrashLib.Config.Services;
 
 namespace Recyclarr.TrashLib.Config.Parsing;
 
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationFinder.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigurationFinder.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigurationFinder.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigurationFinder.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs b/src/Recyclarr.TrashLib.Config/Parsing/ConfigurationLoader.cs
similarity index 98%
rename from src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ConfigurationLoader.cs
index 05cd9118..eaafca88 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ConfigurationLoader.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ConfigurationLoader.cs
@@ -1,7 +1,6 @@
 using System.IO.Abstractions;
 using AutoMapper;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing;
-using Recyclarr.TrashLib.Config.Services;
 using Serilog.Context;
 
 namespace Recyclarr.TrashLib.Config.Parsing;
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ContextualMessages.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigContextualMessages.cs
similarity index 96%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ContextualMessages.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigContextualMessages.cs
index 947b500a..e45ee807 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ContextualMessages.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigContextualMessages.cs
@@ -3,7 +3,7 @@ using YamlDotNet.Core;
 
 namespace Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
 
-public static class ContextualMessages
+public static class ConfigContextualMessages
 {
     public static string? GetContextualErrorFromException(YamlException e)
     {
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs
similarity index 88%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs
index c816e69d..051a5321 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Yaml;
+using Recyclarr.Yaml;
 using YamlDotNet.Serialization;
 
 namespace Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ConfigurationException.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigurationException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/ConfigurationException.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/ConfigurationException.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/FeatureRemovalException.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/FeatureRemovalException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/FeatureRemovalException.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/FeatureRemovalException.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs b/src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/IConfigurationFinder.cs b/src/Recyclarr.TrashLib.Config/Parsing/IConfigurationFinder.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/IConfigurationFinder.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/IConfigurationFinder.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/IConfigurationLoader.cs b/src/Recyclarr.TrashLib.Config/Parsing/IConfigurationLoader.cs
similarity index 85%
rename from src/Recyclarr.TrashLib/Config/Parsing/IConfigurationLoader.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/IConfigurationLoader.cs
index a9ce096f..807e16ab 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/IConfigurationLoader.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/IConfigurationLoader.cs
@@ -1,5 +1,4 @@
 using System.IO.Abstractions;
-using Recyclarr.TrashLib.Config.Services;
 
 namespace Recyclarr.TrashLib.Config.Parsing;
 
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs
similarity index 94%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs
index 73b9a3d0..90a29402 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Yaml;
+using Recyclarr.Yaml;
 using YamlDotNet.Serialization;
 
 namespace Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs
similarity index 96%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs
index 8191878e..54d0ad86 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs
+++ b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs
@@ -1,6 +1,6 @@
 using System.IO.Abstractions;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Guide;
 
 namespace Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
 
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/IConfigPostProcessor.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/IConfigPostProcessor.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/IConfigPostProcessor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/IConfigPostProcessor.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/IncludePostProcessor.cs b/src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/IncludePostProcessor.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/PostProcessing/IncludePostProcessor.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/PostProcessing/IncludePostProcessor.cs
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/YamlValidatorRuleSets.cs b/src/Recyclarr.TrashLib.Config/Parsing/YamlValidatorRuleSets.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Parsing/YamlValidatorRuleSets.cs
rename to src/Recyclarr.TrashLib.Config/Parsing/YamlValidatorRuleSets.cs
diff --git a/src/Recyclarr.TrashLib.Config/Recyclarr.TrashLib.Config.csproj b/src/Recyclarr.TrashLib.Config/Recyclarr.TrashLib.Config.csproj
new file mode 100644
index 00000000..b45c13cf
--- /dev/null
+++ b/src/Recyclarr.TrashLib.Config/Recyclarr.TrashLib.Config.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="Autofac" />
+    <PackageReference Include="AutoMapper" />
+    <PackageReference Include="FluentValidation" />
+    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="SuperLinq" />
+    <PackageReference Include="YamlDotNet" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.Guide\Recyclarr.TrashLib.Guide.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib\Recyclarr.TrashLib.csproj" />
+    <ProjectReference Include="..\Recyclarr.Yaml\Recyclarr.Yaml.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Recyclarr.TrashLib/Config/Secrets/ISecretsProvider.cs b/src/Recyclarr.TrashLib.Config/Secrets/ISecretsProvider.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Secrets/ISecretsProvider.cs
rename to src/Recyclarr.TrashLib.Config/Secrets/ISecretsProvider.cs
diff --git a/src/Recyclarr.TrashLib/Config/Secrets/SecretNotFoundException.cs b/src/Recyclarr.TrashLib.Config/Secrets/SecretNotFoundException.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Secrets/SecretNotFoundException.cs
rename to src/Recyclarr.TrashLib.Config/Secrets/SecretNotFoundException.cs
diff --git a/src/Recyclarr.TrashLib/Config/Secrets/SecretsDeserializer.cs b/src/Recyclarr.TrashLib.Config/Secrets/SecretsDeserializer.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Secrets/SecretsDeserializer.cs
rename to src/Recyclarr.TrashLib.Config/Secrets/SecretsDeserializer.cs
diff --git a/src/Recyclarr.TrashLib/Config/Secrets/SecretsProvider.cs b/src/Recyclarr.TrashLib.Config/Secrets/SecretsProvider.cs
similarity index 100%
rename from src/Recyclarr.TrashLib/Config/Secrets/SecretsProvider.cs
rename to src/Recyclarr.TrashLib.Config/Secrets/SecretsProvider.cs
diff --git a/src/Recyclarr.TrashLib/Config/Secrets/SecretsYamlBehavior.cs b/src/Recyclarr.TrashLib.Config/Secrets/SecretsYamlBehavior.cs
similarity index 93%
rename from src/Recyclarr.TrashLib/Config/Secrets/SecretsYamlBehavior.cs
rename to src/Recyclarr.TrashLib.Config/Secrets/SecretsYamlBehavior.cs
index c4416100..d752f0d5 100644
--- a/src/Recyclarr.TrashLib/Config/Secrets/SecretsYamlBehavior.cs
+++ b/src/Recyclarr.TrashLib.Config/Secrets/SecretsYamlBehavior.cs
@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Recyclarr.TrashLib.Config.Yaml;
+using Recyclarr.Yaml;
 using YamlDotNet.Serialization;
 
 namespace Recyclarr.TrashLib.Config.Secrets;
diff --git a/src/Recyclarr.TrashLib/Config/Services/ConfigTemplateGuideService.cs b/src/Recyclarr.TrashLib.Guide/ConfigTemplateGuideService.cs
similarity index 78%
rename from src/Recyclarr.TrashLib/Config/Services/ConfigTemplateGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/ConfigTemplateGuideService.cs
index 66bc2afc..521d8d76 100644
--- a/src/Recyclarr.TrashLib/Config/Services/ConfigTemplateGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/ConfigTemplateGuideService.cs
@@ -1,9 +1,12 @@
 using System.Collections.ObjectModel;
 using System.IO.Abstractions;
 using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Json;
 using Recyclarr.TrashLib.Repo;
 
-namespace Recyclarr.TrashLib.Config.Services;
+namespace Recyclarr.TrashLib.Guide;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public record TemplateEntry(string Id, string Template, bool Hidden = false);
@@ -52,7 +55,7 @@ public class ConfigTemplateGuideService : IConfigTemplateGuideService
                 $"Recyclarr templates.json does not exist: {templatesPath}");
         }
 
-        var templates = TrashRepoJsonParser.Deserialize<TemplatesData>(templatesPath);
+        var templates = Deserialize(templatesPath);
 
         return templates.Radarr
             .Select(x => NewTemplatePath(x, SupportedServices.Radarr))
@@ -70,4 +73,19 @@ public class ConfigTemplateGuideService : IConfigTemplateGuideService
             };
         }
     }
+
+    private static TemplatesData Deserialize(IFileInfo jsonFile)
+    {
+        var serializer = JsonSerializer.Create(GlobalJsonSerializerSettings.Recyclarr);
+
+        using var stream = new JsonTextReader(jsonFile.OpenText());
+
+        var obj = serializer.Deserialize<TemplatesData>(stream);
+        if (obj is null)
+        {
+            throw new InvalidDataException($"Unable to deserialize {jsonFile}");
+        }
+
+        return obj;
+    }
 }
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatCategoryItem.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatCategoryItem.cs
similarity index 63%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatCategoryItem.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatCategoryItem.cs
index a56b408a..15d02723 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatCategoryItem.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatCategoryItem.cs
@@ -1,3 +1,3 @@
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public record CustomFormatCategoryItem(string CategoryName, string CfName, string CfAnchor);
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatCategoryParser.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatCategoryParser.cs
similarity index 98%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatCategoryParser.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatCategoryParser.cs
index a91e3ea7..cfdfb2eb 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatCategoryParser.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatCategoryParser.cs
@@ -2,7 +2,7 @@ using System.IO.Abstractions;
 using System.Text.RegularExpressions;
 using Recyclarr.Common.Extensions;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public partial class CustomFormatCategoryParser : ICustomFormatCategoryParser
 {
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatGuideService.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatGuideService.cs
similarity index 97%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatGuideService.cs
index d5c86f5d..68bdfd28 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatGuideService.cs
@@ -3,7 +3,7 @@ using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 using Recyclarr.TrashLib.Repo;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public class CustomFormatGuideService : ICustomFormatGuideService
 {
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatLoader.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs
similarity index 95%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatLoader.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs
index d85f0e08..bbd00d27 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatLoader.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs
@@ -4,7 +4,7 @@ using Recyclarr.Common.Extensions;
 using Recyclarr.TrashLib.Json;
 using Recyclarr.TrashLib.Models;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public class CustomFormatLoader : ICustomFormatLoader
 {
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatPaths.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatPaths.cs
similarity index 76%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatPaths.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatPaths.cs
index 6ca14de9..5ce75ff2 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/CustomFormatPaths.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatPaths.cs
@@ -1,6 +1,6 @@
 using System.IO.Abstractions;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 internal record CustomFormatPaths(
     IReadOnlyList<IDirectoryInfo> CustomFormatDirectories,
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatCategoryParser.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatCategoryParser.cs
similarity index 76%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatCategoryParser.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatCategoryParser.cs
index eb8d7617..67199a5e 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatCategoryParser.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatCategoryParser.cs
@@ -1,6 +1,6 @@
 using System.IO.Abstractions;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public interface ICustomFormatCategoryParser
 {
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatGuideService.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatGuideService.cs
similarity index 78%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatGuideService.cs
index 3c61514a..7823719a 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatGuideService.cs
@@ -1,7 +1,7 @@
 using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Models;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public interface ICustomFormatGuideService
 {
diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatLoader.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatLoader.cs
similarity index 82%
rename from src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatLoader.cs
rename to src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatLoader.cs
index 3af0c145..7e5473be 100644
--- a/src/Recyclarr.Cli/Pipelines/CustomFormat/Guide/ICustomFormatLoader.cs
+++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/ICustomFormatLoader.cs
@@ -1,7 +1,7 @@
 using System.IO.Abstractions;
 using Recyclarr.TrashLib.Models;
 
-namespace Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.CustomFormat;
 
 public interface ICustomFormatLoader
 {
diff --git a/src/Recyclarr.TrashLib.Guide/GlobalUsings.cs b/src/Recyclarr.TrashLib.Guide/GlobalUsings.cs
new file mode 100644
index 00000000..1e3063b8
--- /dev/null
+++ b/src/Recyclarr.TrashLib.Guide/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using SuperLinq;
+global using Serilog;
diff --git a/src/Recyclarr.TrashLib.Guide/GuideAutofacModule.cs b/src/Recyclarr.TrashLib.Guide/GuideAutofacModule.cs
new file mode 100644
index 00000000..e69f0514
--- /dev/null
+++ b/src/Recyclarr.TrashLib.Guide/GuideAutofacModule.cs
@@ -0,0 +1,29 @@
+using Autofac;
+using Recyclarr.TrashLib.Guide.CustomFormat;
+using Recyclarr.TrashLib.Guide.QualitySize;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
+
+namespace Recyclarr.TrashLib.Guide;
+
+public class GuideAutofacModule : Module
+{
+    protected override void Load(ContainerBuilder builder)
+    {
+        base.Load(builder);
+
+        builder.RegisterType<ConfigTemplateGuideService>().As<IConfigTemplateGuideService>().SingleInstance();
+
+        // Custom Format
+        builder.RegisterType<CustomFormatGuideService>().As<ICustomFormatGuideService>().SingleInstance();
+        builder.RegisterType<CustomFormatLoader>().As<ICustomFormatLoader>();
+        builder.RegisterType<CustomFormatCategoryParser>().As<ICustomFormatCategoryParser>();
+
+        // Release Profile
+        builder.RegisterType<ReleaseProfileGuideParser>();
+        builder.RegisterType<ReleaseProfileGuideService>().As<IReleaseProfileGuideService>().SingleInstance();
+
+        // Quality Size
+        builder.RegisterType<QualitySizeGuideService>().As<IQualitySizeGuideService>().SingleInstance();
+        builder.RegisterType<QualitySizeGuideParser>();
+    }
+}
diff --git a/src/Recyclarr.TrashLib/Config/Services/IConfigTemplateGuideService.cs b/src/Recyclarr.TrashLib.Guide/IConfigTemplateGuideService.cs
similarity index 77%
rename from src/Recyclarr.TrashLib/Config/Services/IConfigTemplateGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/IConfigTemplateGuideService.cs
index 5ed9654c..f9efae68 100644
--- a/src/Recyclarr.TrashLib/Config/Services/IConfigTemplateGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/IConfigTemplateGuideService.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.Config.Services;
+namespace Recyclarr.TrashLib.Guide;
 
 public interface IConfigTemplateGuideService
 {
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/IQualityGuideService.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/IQualitySizeGuideService.cs
similarity index 57%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/Guide/IQualityGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/IQualitySizeGuideService.cs
index b1336d2b..3fbccecb 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/IQualityGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/IQualitySizeGuideService.cs
@@ -1,8 +1,8 @@
 using Recyclarr.TrashLib.Config;
 
-namespace Recyclarr.Cli.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
-public interface IQualityGuideService
+public interface IQualitySizeGuideService
 {
     IReadOnlyList<QualitySizeData> GetQualitySizeData(SupportedServices serviceType);
 }
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualityItem.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/QualityItem.cs
similarity index 95%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualityItem.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/QualityItem.cs
index 785a680b..44cb19cd 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualityItem.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/QualityItem.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace Recyclarr.Cli.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
 public class QualityItem
 {
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeData.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeData.cs
similarity index 79%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeData.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeData.cs
index c8d94c5b..cd5c818d 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeData.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeData.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.Cli.Pipelines.QualitySize;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
 public record QualitySizeData
 {
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizeGuideParser.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeGuideParser.cs
similarity index 96%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizeGuideParser.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeGuideParser.cs
index ad2ac15d..2e23f486 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizeGuideParser.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeGuideParser.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json.Serialization;
 using Recyclarr.Common;
 using Recyclarr.Common.Extensions;
 
-namespace Recyclarr.Cli.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
 public class QualitySizeGuideParser
 {
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualityGuideService.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeGuideService.cs
similarity index 90%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualityGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeGuideService.cs
index 1d00f6a7..ade6f0ca 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualityGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeGuideService.cs
@@ -1,15 +1,15 @@
 using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Repo;
 
-namespace Recyclarr.Cli.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
-public class QualityGuideService : IQualityGuideService
+public class QualitySizeGuideService : IQualitySizeGuideService
 {
     private readonly IRepoMetadataBuilder _metadataBuilder;
     private readonly QualitySizeGuideParser _parser;
     private readonly Dictionary<SupportedServices, IReadOnlyList<QualitySizeData>> _cache = new();
 
-    public QualityGuideService(
+    public QualitySizeGuideService(
         IRepoMetadataBuilder metadataBuilder,
         QualitySizeGuideParser parser)
     {
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeItem.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeItem.cs
similarity index 90%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeItem.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeItem.cs
index da893222..cc466f72 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeItem.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizeItem.cs
@@ -1,6 +1,4 @@
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
-
-namespace Recyclarr.Cli.Pipelines.QualitySize;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
 public class QualitySizeItem : QualityItem
 {
diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizePaths.cs b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizePaths.cs
similarity index 71%
rename from src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizePaths.cs
rename to src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizePaths.cs
index ae755260..634d18fb 100644
--- a/src/Recyclarr.Cli/Pipelines/QualitySize/Guide/QualitySizePaths.cs
+++ b/src/Recyclarr.TrashLib.Guide/QualitySize/QualitySizePaths.cs
@@ -1,6 +1,6 @@
 using System.IO.Abstractions;
 
-namespace Recyclarr.Cli.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.QualitySize;
 
 internal record QualitySizePaths(
     IReadOnlyCollection<IDirectoryInfo> QualitySizeDirectories
diff --git a/src/Recyclarr.TrashLib.Guide/Recyclarr.TrashLib.Guide.csproj b/src/Recyclarr.TrashLib.Guide/Recyclarr.TrashLib.Guide.csproj
new file mode 100644
index 00000000..a68f358f
--- /dev/null
+++ b/src/Recyclarr.TrashLib.Guide/Recyclarr.TrashLib.Guide.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\Recyclarr.TrashLib\Recyclarr.TrashLib.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" />
+  </ItemGroup>
+</Project>
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/IReleaseProfileGuideService.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/IReleaseProfileGuideService.cs
similarity index 66%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/IReleaseProfileGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/IReleaseProfileGuideService.cs
index 661b9bd4..242223be 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/IReleaseProfileGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/IReleaseProfileGuideService.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 public interface IReleaseProfileGuideService
 {
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileData.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileData.cs
similarity index 97%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileData.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileData.cs
index 342551e2..1389e893 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileData.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileData.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 public record TermData
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataValidationFilterer.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileDataValidationFilterer.cs
similarity index 96%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataValidationFilterer.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileDataValidationFilterer.cs
index 8d584df6..55436cf6 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataValidationFilterer.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileDataValidationFilterer.cs
@@ -1,7 +1,7 @@
 using FluentValidation.Results;
 using Recyclarr.Common.FluentValidation;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 public class ReleaseProfileDataValidationFilterer
 {
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileDataValidator.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileDataValidator.cs
similarity index 94%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileDataValidator.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileDataValidator.cs
index d934e3c9..a4616a73 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/ReleaseProfileDataValidator.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileDataValidator.cs
@@ -1,6 +1,6 @@
 using FluentValidation;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 public class TermDataValidator : AbstractValidator<TermData>
 {
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideParser.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileGuideParser.cs
similarity index 93%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideParser.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileGuideParser.cs
index cc58400d..f7246bff 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideParser.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileGuideParser.cs
@@ -1,9 +1,8 @@
 using System.IO.Abstractions;
 using Newtonsoft.Json;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
 using Recyclarr.Common;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 public class ReleaseProfileGuideParser
 {
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideService.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileGuideService.cs
similarity index 92%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideService.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileGuideService.cs
index 77687f17..d4ca04b9 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideService.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/ReleaseProfileGuideService.cs
@@ -1,6 +1,6 @@
 using Recyclarr.TrashLib.Repo;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 public class ReleaseProfileGuideService : IReleaseProfileGuideService
 {
diff --git a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/TermDataConverter.cs b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/TermDataConverter.cs
similarity index 94%
rename from src/Recyclarr.Cli/Pipelines/ReleaseProfile/TermDataConverter.cs
rename to src/Recyclarr.TrashLib.Guide/ReleaseProfile/TermDataConverter.cs
index 4aa15613..7290290e 100644
--- a/src/Recyclarr.Cli/Pipelines/ReleaseProfile/TermDataConverter.cs
+++ b/src/Recyclarr.TrashLib.Guide/ReleaseProfile/TermDataConverter.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Recyclarr.Cli.Pipelines.ReleaseProfile;
+namespace Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 internal class TermDataConverter : JsonConverter
 {
diff --git a/src/Recyclarr.TrashLib/ApiServices/System/IServiceInformation.cs b/src/Recyclarr.TrashLib/ApiServices/System/IServiceInformation.cs
index 7598ad79..f5046db0 100644
--- a/src/Recyclarr.TrashLib/ApiServices/System/IServiceInformation.cs
+++ b/src/Recyclarr.TrashLib/ApiServices/System/IServiceInformation.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.ApiServices.System;
 
diff --git a/src/Recyclarr.TrashLib/ApiServices/System/ISystemApiService.cs b/src/Recyclarr.TrashLib/ApiServices/System/ISystemApiService.cs
index d6655679..7911d62d 100644
--- a/src/Recyclarr.TrashLib/ApiServices/System/ISystemApiService.cs
+++ b/src/Recyclarr.TrashLib/ApiServices/System/ISystemApiService.cs
@@ -1,5 +1,5 @@
 using Recyclarr.TrashLib.ApiServices.System.Dto;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.ApiServices.System;
 
diff --git a/src/Recyclarr.TrashLib/ApiServices/System/ServiceInformation.cs b/src/Recyclarr.TrashLib/ApiServices/System/ServiceInformation.cs
index 934449ea..5b9aae45 100644
--- a/src/Recyclarr.TrashLib/ApiServices/System/ServiceInformation.cs
+++ b/src/Recyclarr.TrashLib/ApiServices/System/ServiceInformation.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.ApiServices.System;
 
diff --git a/src/Recyclarr.TrashLib/ApiServices/System/SystemApiService.cs b/src/Recyclarr.TrashLib/ApiServices/System/SystemApiService.cs
index 4893e883..e033d514 100644
--- a/src/Recyclarr.TrashLib/ApiServices/System/SystemApiService.cs
+++ b/src/Recyclarr.TrashLib/ApiServices/System/SystemApiService.cs
@@ -1,6 +1,6 @@
 using Flurl.Http;
 using Recyclarr.TrashLib.ApiServices.System.Dto;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 
 namespace Recyclarr.TrashLib.ApiServices.System;
diff --git a/src/Recyclarr.TrashLib/Compatibility/Radarr/IRadarrCapabilityFetcher.cs b/src/Recyclarr.TrashLib/Compatibility/Radarr/IRadarrCapabilityFetcher.cs
index 6c473863..4f161714 100644
--- a/src/Recyclarr.TrashLib/Compatibility/Radarr/IRadarrCapabilityFetcher.cs
+++ b/src/Recyclarr.TrashLib/Compatibility/Radarr/IRadarrCapabilityFetcher.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Compatibility.Radarr;
 
diff --git a/src/Recyclarr.TrashLib/Compatibility/Radarr/RadarrCapabilityEnforcer.cs b/src/Recyclarr.TrashLib/Compatibility/Radarr/RadarrCapabilityEnforcer.cs
index 326db829..7c0c67e1 100644
--- a/src/Recyclarr.TrashLib/Compatibility/Radarr/RadarrCapabilityEnforcer.cs
+++ b/src/Recyclarr.TrashLib/Compatibility/Radarr/RadarrCapabilityEnforcer.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Compatibility.Radarr;
 
diff --git a/src/Recyclarr.TrashLib/Compatibility/ServiceAgnosticCapabilityEnforcer.cs b/src/Recyclarr.TrashLib/Compatibility/ServiceAgnosticCapabilityEnforcer.cs
index 7306fd3e..660b5b48 100644
--- a/src/Recyclarr.TrashLib/Compatibility/ServiceAgnosticCapabilityEnforcer.cs
+++ b/src/Recyclarr.TrashLib/Compatibility/ServiceAgnosticCapabilityEnforcer.cs
@@ -1,6 +1,6 @@
 using Recyclarr.TrashLib.Compatibility.Radarr;
 using Recyclarr.TrashLib.Compatibility.Sonarr;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Compatibility;
 
diff --git a/src/Recyclarr.TrashLib/Compatibility/ServiceCapabilityFetcher.cs b/src/Recyclarr.TrashLib/Compatibility/ServiceCapabilityFetcher.cs
index a29a32c6..512b1cdc 100644
--- a/src/Recyclarr.TrashLib/Compatibility/ServiceCapabilityFetcher.cs
+++ b/src/Recyclarr.TrashLib/Compatibility/ServiceCapabilityFetcher.cs
@@ -1,5 +1,5 @@
 using Recyclarr.TrashLib.ApiServices.System;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Compatibility;
 
diff --git a/src/Recyclarr.TrashLib/Compatibility/Sonarr/ISonarrCapabilityFetcher.cs b/src/Recyclarr.TrashLib/Compatibility/Sonarr/ISonarrCapabilityFetcher.cs
index 3bbe8e8e..ac38f8c0 100644
--- a/src/Recyclarr.TrashLib/Compatibility/Sonarr/ISonarrCapabilityFetcher.cs
+++ b/src/Recyclarr.TrashLib/Compatibility/Sonarr/ISonarrCapabilityFetcher.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Compatibility.Sonarr;
 
diff --git a/src/Recyclarr.TrashLib/Compatibility/Sonarr/SonarrCapabilityEnforcer.cs b/src/Recyclarr.TrashLib/Compatibility/Sonarr/SonarrCapabilityEnforcer.cs
index fbf91587..60924cdb 100644
--- a/src/Recyclarr.TrashLib/Compatibility/Sonarr/SonarrCapabilityEnforcer.cs
+++ b/src/Recyclarr.TrashLib/Compatibility/Sonarr/SonarrCapabilityEnforcer.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.ExceptionTypes;
 
 namespace Recyclarr.TrashLib.Compatibility.Sonarr;
diff --git a/src/Recyclarr.TrashLib/Config/Services/IServiceConfiguration.cs b/src/Recyclarr.TrashLib/Config/IServiceConfiguration.cs
similarity index 90%
rename from src/Recyclarr.TrashLib/Config/Services/IServiceConfiguration.cs
rename to src/Recyclarr.TrashLib/Config/IServiceConfiguration.cs
index 6399a292..3d987d9e 100644
--- a/src/Recyclarr.TrashLib/Config/Services/IServiceConfiguration.cs
+++ b/src/Recyclarr.TrashLib/Config/IServiceConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.Config.Services;
+namespace Recyclarr.TrashLib.Config;
 
 public interface IServiceConfiguration
 {
diff --git a/src/Recyclarr.TrashLib/Config/Services/RadarrConfiguration.cs b/src/Recyclarr.TrashLib/Config/RadarrConfiguration.cs
similarity index 75%
rename from src/Recyclarr.TrashLib/Config/Services/RadarrConfiguration.cs
rename to src/Recyclarr.TrashLib/Config/RadarrConfiguration.cs
index 7107a2d5..6cfd63fc 100644
--- a/src/Recyclarr.TrashLib/Config/Services/RadarrConfiguration.cs
+++ b/src/Recyclarr.TrashLib/Config/RadarrConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.Config.Services;
+namespace Recyclarr.TrashLib.Config;
 
 public record RadarrConfiguration : ServiceConfiguration
 {
diff --git a/src/Recyclarr.TrashLib/Config/Services/ServiceConfiguration.cs b/src/Recyclarr.TrashLib/Config/ServiceConfiguration.cs
similarity index 98%
rename from src/Recyclarr.TrashLib/Config/Services/ServiceConfiguration.cs
rename to src/Recyclarr.TrashLib/Config/ServiceConfiguration.cs
index 317ad153..1de861ee 100644
--- a/src/Recyclarr.TrashLib/Config/Services/ServiceConfiguration.cs
+++ b/src/Recyclarr.TrashLib/Config/ServiceConfiguration.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Recyclarr.TrashLib.Config.Services;
+namespace Recyclarr.TrashLib.Config;
 
 public abstract record ServiceConfiguration : IServiceConfiguration
 {
diff --git a/src/Recyclarr.TrashLib/Config/Services/SonarrConfiguration.cs b/src/Recyclarr.TrashLib/Config/SonarrConfiguration.cs
similarity index 95%
rename from src/Recyclarr.TrashLib/Config/Services/SonarrConfiguration.cs
rename to src/Recyclarr.TrashLib/Config/SonarrConfiguration.cs
index 6cae3186..82f1fee9 100644
--- a/src/Recyclarr.TrashLib/Config/Services/SonarrConfiguration.cs
+++ b/src/Recyclarr.TrashLib/Config/SonarrConfiguration.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Recyclarr.TrashLib.Config.Services;
+namespace Recyclarr.TrashLib.Config;
 
 public record SonarrConfiguration : ServiceConfiguration
 {
diff --git a/src/Recyclarr.TrashLib/GlobalUsings.cs b/src/Recyclarr.TrashLib/GlobalUsings.cs
index 53885661..1e3063b8 100644
--- a/src/Recyclarr.TrashLib/GlobalUsings.cs
+++ b/src/Recyclarr.TrashLib/GlobalUsings.cs
@@ -1 +1,2 @@
 global using SuperLinq;
+global using Serilog;
diff --git a/src/Recyclarr.TrashLib/Http/IServiceRequestBuilder.cs b/src/Recyclarr.TrashLib/Http/IServiceRequestBuilder.cs
index 13767f7c..15fcbc0f 100644
--- a/src/Recyclarr.TrashLib/Http/IServiceRequestBuilder.cs
+++ b/src/Recyclarr.TrashLib/Http/IServiceRequestBuilder.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Http;
 
diff --git a/src/Recyclarr.TrashLib/Http/ServiceRequestBuilder.cs b/src/Recyclarr.TrashLib/Http/ServiceRequestBuilder.cs
index 561e5adc..ab1d9fec 100644
--- a/src/Recyclarr.TrashLib/Http/ServiceRequestBuilder.cs
+++ b/src/Recyclarr.TrashLib/Http/ServiceRequestBuilder.cs
@@ -1,5 +1,5 @@
 using Flurl.Http;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Http;
 
diff --git a/src/Recyclarr.TrashLib/Interfaces/ICacheStoragePath.cs b/src/Recyclarr.TrashLib/Interfaces/ICacheStoragePath.cs
index 91a7e527..95f300d8 100644
--- a/src/Recyclarr.TrashLib/Interfaces/ICacheStoragePath.cs
+++ b/src/Recyclarr.TrashLib/Interfaces/ICacheStoragePath.cs
@@ -1,5 +1,5 @@
 using System.IO.Abstractions;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.Interfaces;
 
diff --git a/src/Recyclarr.TrashLib/Recyclarr.TrashLib.csproj b/src/Recyclarr.TrashLib/Recyclarr.TrashLib.csproj
index 0832554c..ed3d5f90 100644
--- a/src/Recyclarr.TrashLib/Recyclarr.TrashLib.csproj
+++ b/src/Recyclarr.TrashLib/Recyclarr.TrashLib.csproj
@@ -24,5 +24,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
+    <ProjectReference Include="..\Recyclarr.Yaml\Recyclarr.Yaml.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Recyclarr.TrashLib/Repo/RepoAutofacModule.cs b/src/Recyclarr.TrashLib/Repo/RepoAutofacModule.cs
index de872561..82b02447 100644
--- a/src/Recyclarr.TrashLib/Repo/RepoAutofacModule.cs
+++ b/src/Recyclarr.TrashLib/Repo/RepoAutofacModule.cs
@@ -14,6 +14,6 @@ public class RepoAutofacModule : Module
 
         builder.RegisterType<RepoUpdater>().As<IRepoUpdater>();
         builder.RegisterType<ConsoleMultiRepoUpdater>().As<IMultiRepoUpdater>();
-        builder.RegisterType<RepoMetadataBuilder>().As<IRepoMetadataBuilder>().InstancePerLifetimeScope();
+        builder.RegisterType<TrashRepoMetadataBuilder>().As<IRepoMetadataBuilder>().InstancePerLifetimeScope();
     }
 }
diff --git a/src/Recyclarr.TrashLib/Repo/RepoMetadataBuilder.cs b/src/Recyclarr.TrashLib/Repo/RepoMetadataBuilder.cs
deleted file mode 100644
index 50763c37..00000000
--- a/src/Recyclarr.TrashLib/Repo/RepoMetadataBuilder.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO.Abstractions;
-
-namespace Recyclarr.TrashLib.Repo;
-
-public class RepoMetadataBuilder : IRepoMetadataBuilder
-{
-    private readonly Lazy<RepoMetadata> _metadata;
-    private readonly IDirectoryInfo _repoPath;
-
-    public RepoMetadataBuilder(ITrashGuidesRepo repo)
-    {
-        _repoPath = repo.Path;
-        _metadata = new Lazy<RepoMetadata>(
-            () => TrashRepoJsonParser.Deserialize<RepoMetadata>(_repoPath.File("metadata.json")));
-    }
-
-    public IReadOnlyList<IDirectoryInfo> ToDirectoryInfoList(IEnumerable<string> listOfDirectories)
-    {
-        return listOfDirectories.Select(x => _repoPath.SubDirectory(x)).ToList();
-    }
-
-    public IDirectoryInfo DocsDirectory => _repoPath.SubDirectory("docs");
-
-    public RepoMetadata GetMetadata()
-    {
-        return _metadata.Value;
-    }
-}
diff --git a/src/Recyclarr.TrashLib/Repo/TrashRepoJsonParser.cs b/src/Recyclarr.TrashLib/Repo/TrashRepoJsonParser.cs
deleted file mode 100644
index b753cfe0..00000000
--- a/src/Recyclarr.TrashLib/Repo/TrashRepoJsonParser.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.IO.Abstractions;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-
-namespace Recyclarr.TrashLib.Repo;
-
-public static class TrashRepoJsonParser
-{
-    public static T Deserialize<T>(IFileInfo jsonFile)
-    {
-        var serializer = JsonSerializer.Create(new JsonSerializerSettings
-        {
-            ContractResolver = new DefaultContractResolver
-            {
-                NamingStrategy = new SnakeCaseNamingStrategy()
-            }
-        });
-
-        using var stream = new JsonTextReader(jsonFile.OpenText());
-
-        var obj = serializer.Deserialize<T>(stream);
-        if (obj is null)
-        {
-            throw new InvalidDataException($"Unable to deserialize {jsonFile}");
-        }
-
-        return obj;
-    }
-}
diff --git a/src/Recyclarr.TrashLib/Repo/TrashRepoMetadataBuilder.cs b/src/Recyclarr.TrashLib/Repo/TrashRepoMetadataBuilder.cs
new file mode 100644
index 00000000..c1a486c2
--- /dev/null
+++ b/src/Recyclarr.TrashLib/Repo/TrashRepoMetadataBuilder.cs
@@ -0,0 +1,44 @@
+using System.IO.Abstractions;
+using Newtonsoft.Json;
+using Recyclarr.TrashLib.Json;
+
+namespace Recyclarr.TrashLib.Repo;
+
+public class TrashRepoMetadataBuilder : IRepoMetadataBuilder
+{
+    private readonly Lazy<RepoMetadata> _metadata;
+    private readonly IDirectoryInfo _repoPath;
+
+    public TrashRepoMetadataBuilder(ITrashGuidesRepo repo)
+    {
+        _repoPath = repo.Path;
+        _metadata = new Lazy<RepoMetadata>(() => Deserialize(_repoPath.File("metadata.json")));
+    }
+
+    private static RepoMetadata Deserialize(IFileInfo jsonFile)
+    {
+        var serializer = JsonSerializer.Create(GlobalJsonSerializerSettings.Guide);
+
+        using var stream = new JsonTextReader(jsonFile.OpenText());
+
+        var obj = serializer.Deserialize<RepoMetadata>(stream);
+        if (obj is null)
+        {
+            throw new InvalidDataException($"Unable to deserialize {jsonFile}");
+        }
+
+        return obj;
+    }
+
+    public IReadOnlyList<IDirectoryInfo> ToDirectoryInfoList(IEnumerable<string> listOfDirectories)
+    {
+        return listOfDirectories.Select(x => _repoPath.SubDirectory(x)).ToList();
+    }
+
+    public IDirectoryInfo DocsDirectory => _repoPath.SubDirectory("docs");
+
+    public RepoMetadata GetMetadata()
+    {
+        return _metadata.Value;
+    }
+}
diff --git a/src/Recyclarr.TrashLib/Settings/SettingsContextualMessages.cs b/src/Recyclarr.TrashLib/Settings/SettingsContextualMessages.cs
new file mode 100644
index 00000000..d5ecf75d
--- /dev/null
+++ b/src/Recyclarr.TrashLib/Settings/SettingsContextualMessages.cs
@@ -0,0 +1,21 @@
+using YamlDotNet.Core;
+
+namespace Recyclarr.TrashLib.Settings;
+
+public static class SettingsContextualMessages
+{
+    public static string? GetContextualErrorFromException(YamlException e)
+    {
+        if (e.Message.Contains(
+                "Property 'repository' not found on type " +
+                $"'{typeof(SettingsValues).FullName}'"))
+        {
+            return
+                "Usage of 'repository' setting is no " +
+                "longer supported. Use 'trash_guides' under 'repositories' instead." +
+                "See: https://recyclarr.dev/wiki/upgrade-guide/v5.0/#settings-repository-changes";
+        }
+
+        return null;
+    }
+}
diff --git a/src/Recyclarr.TrashLib/Settings/SettingsProvider.cs b/src/Recyclarr.TrashLib/Settings/SettingsProvider.cs
index 0bad1e72..a4ec80fb 100644
--- a/src/Recyclarr.TrashLib/Settings/SettingsProvider.cs
+++ b/src/Recyclarr.TrashLib/Settings/SettingsProvider.cs
@@ -1,8 +1,7 @@
 using System.IO.Abstractions;
 using Recyclarr.Common.Extensions;
-using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
-using Recyclarr.TrashLib.Config.Yaml;
 using Recyclarr.TrashLib.Startup;
+using Recyclarr.Yaml;
 using YamlDotNet.Core;
 
 namespace Recyclarr.TrashLib.Settings;
@@ -41,7 +40,7 @@ public class SettingsProvider : ISettingsProvider
             _log.Debug(e, "Exception while parsing settings file");
 
             var line = e.Start.Line;
-            var msg = ContextualMessages.GetContextualErrorFromException(e);
+            var msg = SettingsContextualMessages.GetContextualErrorFromException(e);
             _log.Error("Exception while parsing settings.yml at line {Line}: {Msg}", line, msg);
 
             throw;
diff --git a/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs b/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs
index fa506de2..3bd4dd05 100644
--- a/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs
+++ b/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs
@@ -1,26 +1,20 @@
-using System.Reflection;
 using Autofac;
 using Autofac.Extras.Ordering;
-using AutoMapper.Contrib.Autofac.DependencyInjection;
-using AutoMapper.EquivalencyExpression;
 using Recyclarr.Common;
 using Recyclarr.Common.FluentValidation;
 using Recyclarr.TrashLib.ApiServices;
 using Recyclarr.TrashLib.Compatibility;
-using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Http;
 using Recyclarr.TrashLib.Json;
 using Recyclarr.TrashLib.Repo;
 using Recyclarr.TrashLib.Repo.VersionControl;
+using Recyclarr.TrashLib.Settings;
 using Recyclarr.TrashLib.Startup;
-using Module = Autofac.Module;
 
 namespace Recyclarr.TrashLib;
 
 public class TrashLibAutofacModule : Module
 {
-    public Assembly? AdditionalMapperProfileAssembly { get; init; }
-
     protected override void Load(ContainerBuilder builder)
     {
         base.Load(builder);
@@ -31,22 +25,14 @@ public class TrashLibAutofacModule : Module
         // Needed for Autofac.Extras.Ordering
         builder.RegisterSource<OrderedRegistrationSource>();
 
+        builder.RegisterType<SettingsProvider>().As<ISettingsProvider>().SingleInstance();
         builder.RegisterModule<VersionControlAutofacModule>();
         builder.RegisterModule<RepoAutofacModule>();
         builder.RegisterModule<CompatibilityAutofacModule>();
         builder.RegisterModule<ApiServicesAutofacModule>();
-        builder.RegisterModule<ConfigAutofacModule>();
         builder.RegisterType<ServiceRequestBuilder>().As<IServiceRequestBuilder>();
         builder.RegisterType<FlurlClientFactory>().As<IFlurlClientFactory>().SingleInstance();
         builder.RegisterType<BulkJsonLoader>();
-
-        var mapperAssemblies = new List<Assembly> {ThisAssembly};
-        if (AdditionalMapperProfileAssembly is not null)
-        {
-            mapperAssemblies.Add(AdditionalMapperProfileAssembly);
-        }
-
-        builder.RegisterAutoMapper(c => c.AddCollectionMappers(), false, mapperAssemblies.ToArray());
     }
 
     private static void CommonRegistrations(ContainerBuilder builder)
diff --git a/src/Recyclarr.Yaml/GlobalUsings.cs b/src/Recyclarr.Yaml/GlobalUsings.cs
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/src/Recyclarr.Yaml/GlobalUsings.cs
@@ -0,0 +1 @@
+
diff --git a/src/Recyclarr.TrashLib/Config/Yaml/IYamlBehavior.cs b/src/Recyclarr.Yaml/IYamlBehavior.cs
similarity index 73%
rename from src/Recyclarr.TrashLib/Config/Yaml/IYamlBehavior.cs
rename to src/Recyclarr.Yaml/IYamlBehavior.cs
index ff219025..ebfe8609 100644
--- a/src/Recyclarr.TrashLib/Config/Yaml/IYamlBehavior.cs
+++ b/src/Recyclarr.Yaml/IYamlBehavior.cs
@@ -1,6 +1,6 @@
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.TrashLib.Config.Yaml;
+namespace Recyclarr.Yaml;
 
 public interface IYamlBehavior
 {
diff --git a/src/Recyclarr.TrashLib/Config/Yaml/IYamlSerializerFactory.cs b/src/Recyclarr.Yaml/IYamlSerializerFactory.cs
similarity index 78%
rename from src/Recyclarr.TrashLib/Config/Yaml/IYamlSerializerFactory.cs
rename to src/Recyclarr.Yaml/IYamlSerializerFactory.cs
index 824e9462..5b7ac463 100644
--- a/src/Recyclarr.TrashLib/Config/Yaml/IYamlSerializerFactory.cs
+++ b/src/Recyclarr.Yaml/IYamlSerializerFactory.cs
@@ -1,6 +1,6 @@
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.TrashLib.Config.Yaml;
+namespace Recyclarr.Yaml;
 
 public interface IYamlSerializerFactory
 {
diff --git a/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj b/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj
new file mode 100644
index 00000000..229ab5f6
--- /dev/null
+++ b/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="Autofac" />
+    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="YamlDotNet" />
+  </ItemGroup>
+</Project>
diff --git a/src/Recyclarr.TrashLib/Config/Yaml/UnknownYamlException.cs b/src/Recyclarr.Yaml/UnknownYamlException.cs
similarity index 75%
rename from src/Recyclarr.TrashLib/Config/Yaml/UnknownYamlException.cs
rename to src/Recyclarr.Yaml/UnknownYamlException.cs
index 35c92d5a..b03a2834 100644
--- a/src/Recyclarr.TrashLib/Config/Yaml/UnknownYamlException.cs
+++ b/src/Recyclarr.Yaml/UnknownYamlException.cs
@@ -1,4 +1,4 @@
-namespace Recyclarr.TrashLib.Config.Yaml;
+namespace Recyclarr.Yaml;
 
 public class UnknownYamlException : Exception
 {
diff --git a/src/Recyclarr.Yaml/YamlAutofacModule.cs b/src/Recyclarr.Yaml/YamlAutofacModule.cs
new file mode 100644
index 00000000..17c6dbb4
--- /dev/null
+++ b/src/Recyclarr.Yaml/YamlAutofacModule.cs
@@ -0,0 +1,14 @@
+using Autofac;
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.ObjectFactories;
+
+namespace Recyclarr.Yaml;
+
+public class YamlAutofacModule : Module
+{
+    protected override void Load(ContainerBuilder builder)
+    {
+        builder.RegisterType<YamlSerializerFactory>().As<IYamlSerializerFactory>();
+        builder.RegisterType<DefaultObjectFactory>().As<IObjectFactory>();
+    }
+}
diff --git a/src/Recyclarr.Common/YamlDotNet/CannotBeEmptyAttribute.cs b/src/Recyclarr.Yaml/YamlDotNet/CannotBeEmptyAttribute.cs
similarity index 91%
rename from src/Recyclarr.Common/YamlDotNet/CannotBeEmptyAttribute.cs
rename to src/Recyclarr.Yaml/YamlDotNet/CannotBeEmptyAttribute.cs
index 4a120dc1..16543c76 100644
--- a/src/Recyclarr.Common/YamlDotNet/CannotBeEmptyAttribute.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/CannotBeEmptyAttribute.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.ComponentModel.DataAnnotations;
 
-namespace Recyclarr.Common.YamlDotNet;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 [AttributeUsage(AttributeTargets.Property)]
 // ReSharper disable once UnusedType.Global
diff --git a/src/Recyclarr.Common/YamlDotNet/ForceEmptySequences.cs b/src/Recyclarr.Yaml/YamlDotNet/ForceEmptySequences.cs
similarity index 97%
rename from src/Recyclarr.Common/YamlDotNet/ForceEmptySequences.cs
rename to src/Recyclarr.Yaml/YamlDotNet/ForceEmptySequences.cs
index ac1d7f21..e7156ce7 100644
--- a/src/Recyclarr.Common/YamlDotNet/ForceEmptySequences.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/ForceEmptySequences.cs
@@ -3,7 +3,7 @@ using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.Common.YamlDotNet;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 // Borrowed from: https://github.com/aaubry/YamlDotNet/issues/443#issuecomment-544449498
 public sealed class ForceEmptySequences : INodeDeserializer
diff --git a/src/Recyclarr.Common/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs b/src/Recyclarr.Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs
similarity index 96%
rename from src/Recyclarr.Common/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs
rename to src/Recyclarr.Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs
index 14344e43..0fcca2f8 100644
--- a/src/Recyclarr.Common/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs
@@ -1,7 +1,7 @@
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.Common.YamlDotNet;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 // from: https://github.com/aaubry/YamlDotNet/issues/236#issuecomment-632054372
 public sealed class ReadOnlyCollectionNodeTypeResolver : INodeTypeResolver
diff --git a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/SyntaxErrorHelper.cs b/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs
similarity index 95%
rename from src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/SyntaxErrorHelper.cs
rename to src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs
index bf60e077..70bb5043 100644
--- a/src/Recyclarr.TrashLib/Config/Parsing/ErrorHandling/SyntaxErrorHelper.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs
@@ -3,7 +3,7 @@ using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 public sealed class SyntaxErrorHelper : INodeTypeResolver
 {
diff --git a/src/Recyclarr.Common/YamlDotNet/ValidatingDeserializer.cs b/src/Recyclarr.Yaml/YamlDotNet/ValidatingDeserializer.cs
similarity index 96%
rename from src/Recyclarr.Common/YamlDotNet/ValidatingDeserializer.cs
rename to src/Recyclarr.Yaml/YamlDotNet/ValidatingDeserializer.cs
index 3496aeda..3730c9bc 100644
--- a/src/Recyclarr.Common/YamlDotNet/ValidatingDeserializer.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/ValidatingDeserializer.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.Common.YamlDotNet;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 internal class ValidatingDeserializer : INodeDeserializer
 {
diff --git a/src/Recyclarr.Common/YamlDotNet/YamlDotNetExtensions.cs b/src/Recyclarr.Yaml/YamlDotNet/YamlDotNetExtensions.cs
similarity index 95%
rename from src/Recyclarr.Common/YamlDotNet/YamlDotNetExtensions.cs
rename to src/Recyclarr.Yaml/YamlDotNet/YamlDotNetExtensions.cs
index b64903bd..209f63e4 100644
--- a/src/Recyclarr.Common/YamlDotNet/YamlDotNetExtensions.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/YamlDotNetExtensions.cs
@@ -4,7 +4,7 @@ using YamlDotNet.Serialization.NodeDeserializers;
 
 // ReSharper disable UnusedMember.Global
 
-namespace Recyclarr.Common.YamlDotNet;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 public static class YamlDotNetExtensions
 {
diff --git a/src/Recyclarr.Common/YamlDotNet/YamlNullableEnumTypeConverter.cs b/src/Recyclarr.Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs
similarity index 98%
rename from src/Recyclarr.Common/YamlDotNet/YamlNullableEnumTypeConverter.cs
rename to src/Recyclarr.Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs
index ae3db151..efc44a4a 100644
--- a/src/Recyclarr.Common/YamlDotNet/YamlNullableEnumTypeConverter.cs
+++ b/src/Recyclarr.Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs
@@ -2,7 +2,7 @@ using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
 
-namespace Recyclarr.Common.YamlDotNet;
+namespace Recyclarr.Yaml.YamlDotNet;
 
 // A workaround for nullable enums in YamlDotNet taken from:
 // https://github.com/aaubry/YamlDotNet/issues/544#issuecomment-778062351
diff --git a/src/Recyclarr.TrashLib/Config/Yaml/YamlSerializerFactory.cs b/src/Recyclarr.Yaml/YamlSerializerFactory.cs
similarity index 89%
rename from src/Recyclarr.TrashLib/Config/Yaml/YamlSerializerFactory.cs
rename to src/Recyclarr.Yaml/YamlSerializerFactory.cs
index 0f09197f..cb074de5 100644
--- a/src/Recyclarr.TrashLib/Config/Yaml/YamlSerializerFactory.cs
+++ b/src/Recyclarr.Yaml/YamlSerializerFactory.cs
@@ -1,16 +1,15 @@
-using Recyclarr.Common.YamlDotNet;
-using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
+using Recyclarr.Yaml.YamlDotNet;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace Recyclarr.TrashLib.Config.Yaml;
+namespace Recyclarr.Yaml;
 
 public class YamlSerializerFactory : IYamlSerializerFactory
 {
     private readonly IObjectFactory _objectFactory;
-    private readonly IEnumerable<IYamlBehavior> _behaviors;
+    private readonly IReadOnlyCollection<IYamlBehavior> _behaviors;
 
-    public YamlSerializerFactory(IObjectFactory objectFactory, IEnumerable<IYamlBehavior> behaviors)
+    public YamlSerializerFactory(IObjectFactory objectFactory, IReadOnlyCollection<IYamlBehavior> behaviors)
     {
         _objectFactory = objectFactory;
         _behaviors = behaviors;
diff --git a/src/Recyclarr.sln b/src/Recyclarr.sln
index 3ddc94da..f37b1aea 100644
--- a/src/Recyclarr.sln
+++ b/src/Recyclarr.sln
@@ -40,6 +40,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{18E17C53
 		tests\Directory.Build.props = tests\Directory.Build.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashLib.Config", "Recyclarr.TrashLib.Config\Recyclarr.TrashLib.Config.csproj", "{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Yaml", "Recyclarr.Yaml\Recyclarr.Yaml.csproj", "{62D0B120-75A0-4C86-B088-FD42E3FA1508}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashLib.Guide", "Recyclarr.TrashLib.Guide\Recyclarr.TrashLib.Guide.csproj", "{37220364-7C1E-4561-A369-C32BA195A0C3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashLib.Guide.Tests", "tests\Recyclarr.TrashLib.Guide.Tests\Recyclarr.TrashLib.Guide.Tests.csproj", "{0E5C6E86-F899-4743-8DCF-7812E717C604}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashLib.Config.Tests", "tests\Recyclarr.TrashLib.Config.Tests\Recyclarr.TrashLib.Config.Tests.csproj", "{2B4CAFB7-02D7-4909-98C4-7393C1366C39}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashLib.Config.TestLibrary", "tests\Recyclarr.TrashLib.Config.TestLibrary\Recyclarr.TrashLib.Config.TestLibrary.csproj", "{533299C5-71A9-4461-90BB-05C3404F2143}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashLib.Guide.TestLibrary", "tests\Recyclarr.TrashLib.Guide.TestLibrary\Recyclarr.TrashLib.Guide.TestLibrary.csproj", "{B3FC265C-36EF-4815-9EB1-CB878FBEE6D6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -94,6 +108,34 @@ Global
 		{A92321B5-2796-467B-B5A5-2BFC41167A25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A92321B5-2796-467B-B5A5-2BFC41167A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A92321B5-2796-467B-B5A5-2BFC41167A25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62D0B120-75A0-4C86-B088-FD42E3FA1508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62D0B120-75A0-4C86-B088-FD42E3FA1508}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62D0B120-75A0-4C86-B088-FD42E3FA1508}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62D0B120-75A0-4C86-B088-FD42E3FA1508}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37220364-7C1E-4561-A369-C32BA195A0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37220364-7C1E-4561-A369-C32BA195A0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37220364-7C1E-4561-A369-C32BA195A0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37220364-7C1E-4561-A369-C32BA195A0C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E5C6E86-F899-4743-8DCF-7812E717C604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E5C6E86-F899-4743-8DCF-7812E717C604}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E5C6E86-F899-4743-8DCF-7812E717C604}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E5C6E86-F899-4743-8DCF-7812E717C604}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B4CAFB7-02D7-4909-98C4-7393C1366C39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B4CAFB7-02D7-4909-98C4-7393C1366C39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B4CAFB7-02D7-4909-98C4-7393C1366C39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B4CAFB7-02D7-4909-98C4-7393C1366C39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{533299C5-71A9-4461-90BB-05C3404F2143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{533299C5-71A9-4461-90BB-05C3404F2143}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{533299C5-71A9-4461-90BB-05C3404F2143}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{533299C5-71A9-4461-90BB-05C3404F2143}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3FC265C-36EF-4815-9EB1-CB878FBEE6D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3FC265C-36EF-4815-9EB1-CB878FBEE6D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3FC265C-36EF-4815-9EB1-CB878FBEE6D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3FC265C-36EF-4815-9EB1-CB878FBEE6D6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -110,5 +152,9 @@ Global
 		{BF105B2F-8E13-48AD-BF72-DF7EFEB018B6} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
 		{33226068-65E3-4890-8671-59A56BA3F6F0} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
 		{A4EC7E0D-C591-4874-B9AC-EB12A96F3E83} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
+		{0E5C6E86-F899-4743-8DCF-7812E717C604} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
+		{2B4CAFB7-02D7-4909-98C4-7393C1366C39} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
+		{533299C5-71A9-4461-90BB-05C3404F2143} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
+		{B3FC265C-36EF-4815-9EB1-CB878FBEE6D6} = {18E17C53-F600-40AE-82C1-3CD1E547C307}
 	EndGlobalSection
 EndGlobal
diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props
index 99fbf8c7..f68a4a3f 100644
--- a/src/tests/Directory.Build.props
+++ b/src/tests/Directory.Build.props
@@ -31,10 +31,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Using Include="NUnit.Framework" />
-    <Using Include="NSubstitute" />
-    <Using Include="FluentAssertions" />
     <Using Include="AutoFixture.NUnit3" />
+    <Using Include="FluentAssertions" />
+    <Using Include="NSubstitute" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="Serilog" />
     <Using Include="System.IO.Abstractions.TestingHelpers" />
   </ItemGroup>
 
diff --git a/src/tests/Recyclarr.Cli.TestLibrary/NewQp.cs b/src/tests/Recyclarr.Cli.TestLibrary/NewQp.cs
index aa04e70e..6706af11 100644
--- a/src/tests/Recyclarr.Cli.TestLibrary/NewQp.cs
+++ b/src/tests/Recyclarr.Cli.TestLibrary/NewQp.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.TestLibrary;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs b/src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs
index 4fe7a265..7721f074 100644
--- a/src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using Recyclarr.Cli.Cache;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Cache;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs b/src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs
index f291a4dd..3c8cceb8 100644
--- a/src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using Recyclarr.Cli.Cache;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Interfaces;
 
 namespace Recyclarr.Cli.Tests.Cache;
@@ -9,6 +10,8 @@ namespace Recyclarr.Cli.Tests.Cache;
 [Parallelizable(ParallelScope.All)]
 public class ServiceCacheTest
 {
+    [SuppressMessage("SonarLint", "S2094", Justification =
+        "Used for unit test scenario")]
     private sealed class ObjectWithoutAttribute
     {
     }
diff --git a/src/tests/Recyclarr.Cli.Tests/Console/Helpers/CacheStoragePathTest.cs b/src/tests/Recyclarr.Cli.Tests/Console/Helpers/CacheStoragePathTest.cs
index c5cdb0b8..df81aa21 100644
--- a/src/tests/Recyclarr.Cli.Tests/Console/Helpers/CacheStoragePathTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Console/Helpers/CacheStoragePathTest.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Console.Helpers;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Console.Helpers;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Api/CustomFormatServiceTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Api/CustomFormatServiceTest.cs
index 5acda9ea..4de01bfe 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Api/CustomFormatServiceTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Api/CustomFormatServiceTest.cs
@@ -2,7 +2,7 @@ using Flurl.Http.Testing;
 using Recyclarr.Cli.Pipelines.CustomFormat.Api;
 using Recyclarr.Cli.TestLibrary;
 using Recyclarr.Common;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Pipelines.CustomFormat.Api;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatDataListerTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/CustomFormatDataListerTest.cs
similarity index 86%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatDataListerTest.cs
rename to src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/CustomFormatDataListerTest.cs
index 6f1e39ca..f245d3da 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatDataListerTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/CustomFormatDataListerTest.cs
@@ -1,9 +1,10 @@
 using Recyclarr.Cli.Console.Settings;
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+using Recyclarr.Cli.Pipelines.CustomFormat;
+using Recyclarr.TrashLib.Guide.CustomFormat;
 using Recyclarr.TrashLib.TestLibrary;
 using Spectre.Console.Testing;
 
-namespace Recyclarr.Cli.Tests.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.Cli.Tests.Pipelines.CustomFormat;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhaseTest.cs
index 54bf3f27..cbd0901b 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatConfigPhaseTest.cs
@@ -1,6 +1,6 @@
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
 using Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.CustomFormat;
 using Recyclarr.TrashLib.TestLibrary;
 
 namespace Recyclarr.Cli.Tests.Pipelines.CustomFormat.PipelinePhases;
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhaseTest.cs
index fb636e64..c7bb30f1 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileConfigPhaseTest.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.CustomFormat.Models;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Cli.TestLibrary;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.TestLibrary;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile.PipelinePhases;
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 b619158f..7c38ace8 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/PipelinePhases/QualityProfileTransactionPhaseTest.cs
@@ -2,7 +2,7 @@ using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Cli.TestLibrary;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 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 97330b68..1b435e79 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityItemOrganizerTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/QualityItemOrganizerTest.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Cli.TestLibrary;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs
index fe5a8bf7..773546a1 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileTest.cs
@@ -2,7 +2,7 @@ using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Cli.TestLibrary;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 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 81c1aa5b..386fc307 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileValidatorTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualityProfile/UpdatedQualityProfileValidatorTest.cs
@@ -3,7 +3,7 @@ using Recyclarr.Cli.Pipelines.QualityProfile;
 using Recyclarr.Cli.Pipelines.QualityProfile.Api;
 using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases;
 using Recyclarr.Cli.TestLibrary;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualityProfile;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhaseTest.cs
index 37ad38ec..a736edd0 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeGuidePhaseTest.cs
@@ -1,8 +1,7 @@
 using NSubstitute.ReturnsExtensions;
-using Recyclarr.Cli.Pipelines.QualitySize;
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
 using Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.QualitySize;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualitySize.PipelinePhases;
 
@@ -23,7 +22,7 @@ public class QualitySizeGuidePhaseTest
 
     [Test, AutoMockData]
     public void Do_nothing_if_no_matching_quality_definition(
-        [Frozen] IQualityGuideService guide,
+        [Frozen] IQualitySizeGuideService guide,
         QualitySizeGuidePhase sut)
     {
         var config = Substitute.For<IServiceConfiguration>();
@@ -45,7 +44,7 @@ public class QualitySizeGuidePhaseTest
     public void Preferred_ratio_clamping_works(
         string testPreferred,
         string expectedPreferred,
-        [Frozen] IQualityGuideService guide,
+        [Frozen] IQualitySizeGuideService guide,
         QualitySizeGuidePhase sut)
     {
         var config = Substitute.For<IServiceConfiguration>();
@@ -68,7 +67,7 @@ public class QualitySizeGuidePhaseTest
 
     [Test, AutoMockData]
     public void Preferred_is_set_via_ratio(
-        [Frozen] IQualityGuideService guide,
+        [Frozen] IQualitySizeGuideService guide,
         QualitySizeGuidePhase sut)
     {
         var config = Substitute.For<IServiceConfiguration>();
@@ -105,7 +104,7 @@ public class QualitySizeGuidePhaseTest
 
     [Test, AutoMockData]
     public void Preferred_is_set_via_guide(
-        [Frozen] IQualityGuideService guide,
+        [Frozen] IQualitySizeGuideService guide,
         QualitySizeGuidePhase sut)
     {
         var config = Substitute.For<IServiceConfiguration>();
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 ecc0e28b..534e08d5 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/PipelinePhases/QualitySizeTransactionPhaseTest.cs
@@ -1,6 +1,6 @@
-using Recyclarr.Cli.Pipelines.QualitySize;
 using Recyclarr.Cli.Pipelines.QualitySize.Api;
 using Recyclarr.Cli.Pipelines.QualitySize.PipelinePhases;
+using Recyclarr.TrashLib.Guide.QualitySize;
 
 namespace Recyclarr.Cli.Tests.Pipelines.QualitySize.PipelinePhases;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandlerTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandlerTest.cs
index 1a90ee8b..22efe868 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandlerTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Api/SonarrReleaseProfileCompatibilityHandlerTest.cs
@@ -7,7 +7,7 @@ using Recyclarr.Cli.Pipelines.ReleaseProfile.Api.Objects;
 using Recyclarr.Cli.TestLibrary;
 using Recyclarr.TestLibrary.Autofac;
 using Recyclarr.TrashLib.Compatibility.Sonarr;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile.Api;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFiltererTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFiltererTest.cs
index 91e553b8..3c9345ee 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFiltererTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataFiltererTest.cs
@@ -1,6 +1,6 @@
-using Recyclarr.Cli.Pipelines.ReleaseProfile;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilterTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilterTest.cs
index 166fda7e..e64de8b0 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilterTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/StrictNegativeScoresFilterTest.cs
@@ -1,6 +1,6 @@
-using Recyclarr.Cli.Pipelines.ReleaseProfile;
 using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
 namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile.Filters;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Guide/ReleaseProfileDataListerTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/ReleaseProfileDataListerTest.cs
similarity index 95%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Guide/ReleaseProfileDataListerTest.cs
rename to src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/ReleaseProfileDataListerTest.cs
index 31decc1b..d4c3d2b6 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Guide/ReleaseProfileDataListerTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/ReleaseProfileDataListerTest.cs
@@ -1,8 +1,8 @@
 using Recyclarr.Cli.Pipelines.ReleaseProfile;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 using Spectre.Console.Testing;
 
-namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile.Guide;
+namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
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 916db899..eda52c56 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiPersistencePhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagApiPersistencePhaseTest.cs
@@ -1,7 +1,7 @@
 using Recyclarr.Cli.Pipelines.Tags;
 using Recyclarr.Cli.Pipelines.Tags.Api;
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagConfigPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagConfigPhaseTest.cs
index ec4992b2..7c0c39d0 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagConfigPhaseTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/Tags/PipelinePhases/TagConfigPhaseTest.cs
@@ -1,5 +1,5 @@
 using Recyclarr.Cli.Pipelines.Tags.PipelinePhases;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.TestLibrary;
 
 namespace Recyclarr.Cli.Tests.Pipelines.Tags.PipelinePhases;
diff --git a/src/tests/Recyclarr.Cli.Tests/Processors/Config/TemplateConfigCreatorTest.cs b/src/tests/Recyclarr.Cli.Tests/Processors/Config/TemplateConfigCreatorTest.cs
index 11ca40a7..6a80bd29 100644
--- a/src/tests/Recyclarr.Cli.Tests/Processors/Config/TemplateConfigCreatorTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Processors/Config/TemplateConfigCreatorTest.cs
@@ -2,7 +2,7 @@ using System.IO.Abstractions;
 using Recyclarr.Cli.Console.Settings;
 using Recyclarr.Cli.Processors.Config;
 using Recyclarr.Cli.TestLibrary;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Guide;
 using Recyclarr.TrashLib.Startup;
 
 namespace Recyclarr.Cli.Tests.Processors.Config;
diff --git a/src/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs b/src/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs
index 25ba3bec..69c48901 100644
--- a/src/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs
+++ b/src/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs
@@ -2,7 +2,7 @@ using System.IO.Abstractions;
 using Recyclarr.Cli.Console.Commands;
 using Recyclarr.Cli.Processors.Config;
 using Recyclarr.TrashLib.Config;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Guide;
 using Recyclarr.TrashLib.TestLibrary;
 using Spectre.Console.Testing;
 
diff --git a/src/tests/Recyclarr.TrashLib.Config.TestLibrary/ConfigIntegrationFixture.cs b/src/tests/Recyclarr.TrashLib.Config.TestLibrary/ConfigIntegrationFixture.cs
new file mode 100644
index 00000000..ea839f58
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Config.TestLibrary/ConfigIntegrationFixture.cs
@@ -0,0 +1,20 @@
+using Autofac;
+using Recyclarr.TrashLib.Guide;
+using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.Yaml;
+
+namespace Recyclarr.TrashLib.Config.TestLibrary;
+
+[FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
+public abstract class ConfigIntegrationFixture : TrashLibIntegrationFixture
+{
+    protected override void RegisterTypes(ContainerBuilder builder)
+    {
+        base.RegisterTypes(builder);
+        builder.RegisterModule<ConfigAutofacModule>();
+
+        // dependencies
+        builder.RegisterModule<GuideAutofacModule>();
+        builder.RegisterModule<YamlAutofacModule>();
+    }
+}
diff --git a/src/tests/Recyclarr.TrashLib.Config.TestLibrary/Recyclarr.TrashLib.Config.TestLibrary.csproj b/src/tests/Recyclarr.TrashLib.Config.TestLibrary/Recyclarr.TrashLib.Config.TestLibrary.csproj
new file mode 100644
index 00000000..b0d92994
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Config.TestLibrary/Recyclarr.TrashLib.Config.TestLibrary.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\Recyclarr.TrashLib.Config\Recyclarr.TrashLib.Config.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.TestLibrary\Recyclarr.TrashLib.TestLibrary.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/ConfigExtensionsTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/ConfigExtensionsTest.cs
similarity index 97%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/ConfigExtensionsTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/ConfigExtensionsTest.cs
index 778da5c6..f460e5c3 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/ConfigExtensionsTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/ConfigExtensionsTest.cs
@@ -1,7 +1,4 @@
-using Recyclarr.TrashLib.Config;
-using Recyclarr.TrashLib.Config.Services;
-
-namespace Recyclarr.TrashLib.Tests.Config;
+namespace Recyclarr.TrashLib.Config.Tests;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/ConfigurationRegistryTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/ConfigurationRegistryTest.cs
similarity index 93%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/ConfigurationRegistryTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/ConfigurationRegistryTest.cs
index 16bd9469..97754336 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/ConfigurationRegistryTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/ConfigurationRegistryTest.cs
@@ -1,14 +1,12 @@
-using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Config.ExceptionTypes;
 using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
-using Recyclarr.TrashLib.Config.Services;
-using Recyclarr.TrashLib.ExceptionTypes;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config;
+namespace Recyclarr.TrashLib.Config.Tests;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class ConfigurationRegistryTest : TrashLibIntegrationFixture
+public class ConfigurationRegistryTest : ConfigIntegrationFixture
 {
     [Test]
     public void Use_explicit_paths_instead_of_default()
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/EnvironmentVariables/EnvironmentVariableNotDefinedExceptionTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/EnvironmentVariables/EnvironmentVariableNotDefinedExceptionTest.cs
similarity index 86%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/EnvironmentVariables/EnvironmentVariableNotDefinedExceptionTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/EnvironmentVariables/EnvironmentVariableNotDefinedExceptionTest.cs
index 5544bcd1..09bdcc80 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/EnvironmentVariables/EnvironmentVariableNotDefinedExceptionTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/EnvironmentVariables/EnvironmentVariableNotDefinedExceptionTest.cs
@@ -1,6 +1,6 @@
 using Recyclarr.TrashLib.Config.EnvironmentVariables;
 
-namespace Recyclarr.TrashLib.Tests.Config.EnvironmentVariables;
+namespace Recyclarr.TrashLib.Config.Tests.EnvironmentVariables;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Config.Tests/GlobalUsings.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/GlobalUsings.cs
new file mode 100644
index 00000000..ddaecfaa
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/GlobalUsings.cs
@@ -0,0 +1,3 @@
+// Global using directives
+
+global using Recyclarr.TestLibrary.AutoFixture;
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigSaverTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigSaverTest.cs
similarity index 92%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigSaverTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigSaverTest.cs
index 6d69325a..a391dc49 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigSaverTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigSaverTest.cs
@@ -1,13 +1,13 @@
 using System.IO.Abstractions;
 using Recyclarr.Common.Extensions;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class ConfigSaverTest : TrashLibIntegrationFixture
+public class ConfigSaverTest : ConfigIntegrationFixture
 {
     [Test]
     public void Replace_file_when_already_exists()
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigValidationExecutorTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigValidationExecutorTest.cs
similarity index 96%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigValidationExecutorTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigValidationExecutorTest.cs
index e1edbb10..8025aa46 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigValidationExecutorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigValidationExecutorTest.cs
@@ -4,7 +4,7 @@ using Recyclarr.Common.FluentValidation;
 using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigYamlDataObjectsValidationTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigYamlDataObjectsValidationTest.cs
similarity index 99%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigYamlDataObjectsValidationTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigYamlDataObjectsValidationTest.cs
index 188e0157..4c32f78b 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigYamlDataObjectsValidationTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigYamlDataObjectsValidationTest.cs
@@ -1,7 +1,7 @@
 using FluentValidation.TestHelper;
 using Recyclarr.TrashLib.Config.Parsing;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigYamlMapperProfileTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigYamlMapperProfileTest.cs
similarity index 93%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigYamlMapperProfileTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigYamlMapperProfileTest.cs
index 517b9d51..a110b5b6 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigYamlMapperProfileTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigYamlMapperProfileTest.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.Config.Services;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationFinderTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationFinderTest.cs
similarity index 98%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationFinderTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationFinderTest.cs
index 47c803ab..5772e46c 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationFinderTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationFinderTest.cs
@@ -3,7 +3,7 @@ using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.ErrorHandling;
 using Recyclarr.TrashLib.Startup;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderEnvVarTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderEnvVarTest.cs
similarity index 96%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderEnvVarTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderEnvVarTest.cs
index 56f40829..a6c256af 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderEnvVarTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderEnvVarTest.cs
@@ -1,12 +1,12 @@
 using Recyclarr.Common;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class ConfigurationLoaderEnvVarTest : TrashLibIntegrationFixture
+public class ConfigurationLoaderEnvVarTest : ConfigIntegrationFixture
 {
     [Test]
     public void Test_successful_environment_variable_loading()
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderSecretsTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderSecretsTest.cs
similarity index 95%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderSecretsTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderSecretsTest.cs
index 97d52b3e..fedaf5d3 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderSecretsTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderSecretsTest.cs
@@ -1,13 +1,12 @@
 using System.IO.Abstractions;
-using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class ConfigurationLoaderSecretsTest : TrashLibIntegrationFixture
+public class ConfigurationLoaderSecretsTest : ConfigIntegrationFixture
 {
     [Test]
     public void Test_secret_loading()
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderTest.cs
similarity index 93%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderTest.cs
index ad764d9b..85a48407 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/ConfigurationLoaderTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/ConfigurationLoaderTest.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using System.Text;
 using Autofac;
@@ -5,16 +6,14 @@ using FluentValidation;
 using Recyclarr.Common;
 using Recyclarr.Common.Extensions;
 using Recyclarr.TestLibrary.Autofac;
-using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.Config.Services;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class ConfigurationLoaderTest : TrashLibIntegrationFixture
+public class ConfigurationLoaderTest : ConfigIntegrationFixture
 {
     private static Func<TextReader> GetResourceData(string file)
     {
@@ -30,6 +29,8 @@ public class ConfigurationLoaderTest : TrashLibIntegrationFixture
     }
 
     [Test]
+    [SuppressMessage("SonarLint", "S3626", Justification =
+        "'return' used here is for separating local methods")]
     public void Load_many_iterations_of_config()
     {
         var baseDir = Fs.CurrentDirectory();
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/Data/Load_UsingStream_CorrectParsing.yml b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/Data/Load_UsingStream_CorrectParsing.yml
similarity index 100%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/Data/Load_UsingStream_CorrectParsing.yml
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/Data/Load_UsingStream_CorrectParsing.yml
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessorTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessorTest.cs
similarity index 97%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessorTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessorTest.cs
index 5e0fa540..c4e34c92 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessorTest.cs
@@ -2,7 +2,7 @@ using System.IO.Abstractions;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
 using Recyclarr.TrashLib.Startup;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing.ConfigMerging;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing.ConfigMerging;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMergerTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/ServiceConfigMergerTest.cs
similarity index 99%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMergerTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/ServiceConfigMergerTest.cs
index 99455cd6..c926261d 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMergerTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/ServiceConfigMergerTest.cs
@@ -2,9 +2,8 @@ using System.Diagnostics.CodeAnalysis;
 using FluentAssertions.Execution;
 using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
-using Recyclarr.TrashLib.Config.Services;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing.ConfigMerging;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing.ConfigMerging;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMergerTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/SonarrConfigMergerTest.cs
similarity index 98%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMergerTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/SonarrConfigMergerTest.cs
index 9b8d494d..999dabca 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMergerTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/SonarrConfigMergerTest.cs
@@ -3,7 +3,7 @@ using FluentAssertions.Execution;
 using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing.ConfigMerging;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing.ConfigMerging;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs
similarity index 95%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs
index ece164cf..600a3ad1 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs
@@ -1,9 +1,8 @@
 using System.IO.Abstractions;
-using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Guide;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing.ConfigMerging;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing.ConfigMerging;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs
similarity index 95%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs
index ea0385b4..bff293d5 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs
@@ -1,8 +1,7 @@
 using System.IO.Abstractions;
-using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing.ConfigMerging;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing.ConfigMerging;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessorTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessorTest.cs
similarity index 99%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessorTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessorTest.cs
index 9e1148ab..9bd757f0 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessorTest.cs
@@ -2,7 +2,7 @@ using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing;
 using Recyclarr.TrashLib.Config.Secrets;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/IncludePostProcessorIntegrationTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/IncludePostProcessorIntegrationTest.cs
similarity index 96%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/IncludePostProcessorIntegrationTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/IncludePostProcessorIntegrationTest.cs
index 9d8848ab..802096e5 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/PostProcessing/IncludePostProcessorIntegrationTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/PostProcessing/IncludePostProcessorIntegrationTest.cs
@@ -2,13 +2,13 @@ using System.IO.Abstractions;
 using Recyclarr.TrashLib.Config.Parsing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing;
 using Recyclarr.TrashLib.Config.Parsing.PostProcessing.ConfigMerging;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing.PostProcessing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing.PostProcessing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class IncludePostProcessorIntegrationTest : TrashLibIntegrationFixture
+public class IncludePostProcessorIntegrationTest : ConfigIntegrationFixture
 {
     [Test]
     public void No_change_when_no_includes()
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/SonarrConfigYamlValidatorTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/SonarrConfigYamlValidatorTest.cs
similarity index 96%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/SonarrConfigYamlValidatorTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/SonarrConfigYamlValidatorTest.cs
index 66079a02..a7c31bdf 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Parsing/SonarrConfigYamlValidatorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Parsing/SonarrConfigYamlValidatorTest.cs
@@ -1,8 +1,7 @@
 using FluentValidation.TestHelper;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.Config.Services;
 
-namespace Recyclarr.TrashLib.Tests.Config.Parsing;
+namespace Recyclarr.TrashLib.Config.Tests.Parsing;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Config.Tests/Recyclarr.TrashLib.Config.Tests.csproj b/src/tests/Recyclarr.TrashLib.Config.Tests/Recyclarr.TrashLib.Config.Tests.csproj
new file mode 100644
index 00000000..79c518a7
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Recyclarr.TrashLib.Config.Tests.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\Recyclarr.TrashLib.Config\Recyclarr.TrashLib.Config.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.Config.TestLibrary\Recyclarr.TrashLib.Config.TestLibrary.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Secrets/SecretNotFoundExceptionTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Secrets/SecretNotFoundExceptionTest.cs
similarity index 86%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Secrets/SecretNotFoundExceptionTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Secrets/SecretNotFoundExceptionTest.cs
index fbc04050..bc8d5639 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Secrets/SecretNotFoundExceptionTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Secrets/SecretNotFoundExceptionTest.cs
@@ -1,6 +1,6 @@
 using Recyclarr.TrashLib.Config.Secrets;
 
-namespace Recyclarr.TrashLib.Tests.Config.Secrets;
+namespace Recyclarr.TrashLib.Config.Tests.Secrets;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Services/ConfigTemplateGuideServiceTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Services/ConfigTemplateGuideServiceTest.cs
similarity index 87%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Services/ConfigTemplateGuideServiceTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Services/ConfigTemplateGuideServiceTest.cs
index 8ec5270b..ce6b29f6 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Services/ConfigTemplateGuideServiceTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Services/ConfigTemplateGuideServiceTest.cs
@@ -1,15 +1,14 @@
 using System.IO.Abstractions;
 using Recyclarr.Common.TestLibrary;
-using Recyclarr.TrashLib.Config;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config.TestLibrary;
+using Recyclarr.TrashLib.Guide;
 using Recyclarr.TrashLib.Repo;
-using Recyclarr.TrashLib.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config.Services;
+namespace Recyclarr.TrashLib.Config.Tests.Services;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class ConfigTemplateGuideServiceTest : TrashLibIntegrationFixture
+public class ConfigTemplateGuideServiceTest : ConfigIntegrationFixture
 {
     [Test, AutoMockData]
     public void Throw_when_templates_dir_does_not_exist(
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Services/Data/templates.json b/src/tests/Recyclarr.TrashLib.Config.Tests/Services/Data/templates.json
similarity index 100%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Services/Data/templates.json
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Services/Data/templates.json
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/Settings/SettingsPersisterTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/Settings/SettingsPersisterTest.cs
similarity index 91%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/Settings/SettingsPersisterTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/Settings/SettingsPersisterTest.cs
index 8821186a..1cd93ef6 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/Settings/SettingsPersisterTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/Settings/SettingsPersisterTest.cs
@@ -1,9 +1,9 @@
 using System.IO.Abstractions;
-using Recyclarr.TrashLib.Config.Yaml;
 using Recyclarr.TrashLib.Settings;
 using Recyclarr.TrashLib.Startup;
+using Recyclarr.Yaml;
 
-namespace Recyclarr.TrashLib.Tests.Config.Settings;
+namespace Recyclarr.TrashLib.Config.Tests.Settings;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Config/YamlConfigValidatorTest.cs b/src/tests/Recyclarr.TrashLib.Config.Tests/YamlConfigValidatorTest.cs
similarity index 97%
rename from src/tests/Recyclarr.TrashLib.Tests/Config/YamlConfigValidatorTest.cs
rename to src/tests/Recyclarr.TrashLib.Config.Tests/YamlConfigValidatorTest.cs
index 8fe11d23..06ce208d 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Config/YamlConfigValidatorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Config.Tests/YamlConfigValidatorTest.cs
@@ -1,13 +1,12 @@
 using FluentValidation.TestHelper;
 using Recyclarr.TrashLib.Config.Parsing;
-using Recyclarr.TrashLib.Config.Services;
-using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.TrashLib.Config.TestLibrary;
 
-namespace Recyclarr.TrashLib.Tests.Config;
+namespace Recyclarr.TrashLib.Config.Tests;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class YamlConfigValidatorTest : TrashLibIntegrationFixture
+public class YamlConfigValidatorTest : ConfigIntegrationFixture
 {
     [Test]
     public void Validation_succeeds()
diff --git a/src/tests/Recyclarr.TrashLib.Guide.TestLibrary/GuideIntegrationFixture.cs b/src/tests/Recyclarr.TrashLib.Guide.TestLibrary/GuideIntegrationFixture.cs
new file mode 100644
index 00000000..4a6ee5ec
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Guide.TestLibrary/GuideIntegrationFixture.cs
@@ -0,0 +1,18 @@
+using Autofac;
+using Recyclarr.TrashLib.TestLibrary;
+using Recyclarr.Yaml;
+
+namespace Recyclarr.TrashLib.Guide.TestLibrary;
+
+[FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
+public abstract class GuideIntegrationFixture : TrashLibIntegrationFixture
+{
+    protected override void RegisterTypes(ContainerBuilder builder)
+    {
+        base.RegisterTypes(builder);
+        builder.RegisterModule<GuideAutofacModule>();
+
+        // dependencies
+        builder.RegisterModule<YamlAutofacModule>();
+    }
+}
diff --git a/src/tests/Recyclarr.TrashLib.Guide.TestLibrary/Recyclarr.TrashLib.Guide.TestLibrary.csproj b/src/tests/Recyclarr.TrashLib.Guide.TestLibrary/Recyclarr.TrashLib.Guide.TestLibrary.csproj
new file mode 100644
index 00000000..e1bb39bb
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Guide.TestLibrary/Recyclarr.TrashLib.Guide.TestLibrary.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\Recyclarr.TrashLib.Guide\Recyclarr.TrashLib.Guide.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.TestLibrary\Recyclarr.TrashLib.TestLibrary.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatCategoryParserTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatCategoryParserTest.cs
similarity index 97%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatCategoryParserTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatCategoryParserTest.cs
index ed0fa1fe..9778cce2 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatCategoryParserTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatCategoryParserTest.cs
@@ -1,8 +1,9 @@
 using System.IO.Abstractions;
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
+using Recyclarr.TestLibrary.AutoFixture;
+using Recyclarr.TrashLib.Guide.CustomFormat;
 using Recyclarr.TrashLib.Startup;
 
-namespace Recyclarr.Cli.Tests.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.Tests.CustomFormat;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatLoaderIntegrationTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs
similarity index 80%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatLoaderIntegrationTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs
index 2df24084..723afdc4 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Guide/CustomFormatLoaderIntegrationTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs
@@ -1,14 +1,14 @@
 using System.IO.Abstractions;
 using Newtonsoft.Json.Linq;
-using Recyclarr.Cli.Pipelines.CustomFormat.Guide;
-using Recyclarr.Cli.TestLibrary;
+using Recyclarr.TrashLib.Guide.CustomFormat;
+using Recyclarr.TrashLib.Guide.TestLibrary;
 using Recyclarr.TrashLib.TestLibrary;
 
-namespace Recyclarr.Cli.Tests.Pipelines.CustomFormat.Guide;
+namespace Recyclarr.TrashLib.Guide.Tests.CustomFormat;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class CustomFormatLoaderIntegrationTest : CliIntegrationFixture
+public class CustomFormatLoaderIntegrationTest : GuideIntegrationFixture
 {
     [Test]
     public void Get_custom_format_json_works()
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/Data/invalid_quality_size.json b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/Data/invalid_quality_size.json
similarity index 100%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/Data/invalid_quality_size.json
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/Data/invalid_quality_size.json
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/Data/quality_size.json b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/Data/quality_size.json
similarity index 100%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/Data/quality_size.json
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/Data/quality_size.json
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualityItemTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualityItemTest.cs
similarity index 96%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualityItemTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualityItemTest.cs
index d96c64b6..2f6577d1 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualityItemTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualityItemTest.cs
@@ -1,6 +1,6 @@
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
+using Recyclarr.TrashLib.Guide.QualitySize;
 
-namespace Recyclarr.Cli.Tests.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.Tests.QualitySize;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualitySizeGuideParserTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeGuideParserTest.cs
similarity index 83%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualitySizeGuideParserTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeGuideParserTest.cs
index f2cf2556..0c030982 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualitySizeGuideParserTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeGuideParserTest.cs
@@ -1,15 +1,14 @@
 using System.IO.Abstractions;
-using Recyclarr.Cli.Pipelines.QualitySize;
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
-using Recyclarr.Cli.TestLibrary;
 using Recyclarr.Common.Extensions;
 using Recyclarr.Common.TestLibrary;
+using Recyclarr.TrashLib.Guide.QualitySize;
+using Recyclarr.TrashLib.Guide.TestLibrary;
 
-namespace Recyclarr.Cli.Tests.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.Tests.QualitySize;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class QualitySizeGuideParserTest : CliIntegrationFixture
+public class QualitySizeGuideParserTest : GuideIntegrationFixture
 {
     [Test]
     public void Get_valid_data()
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualityGuideServiceTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeGuideServiceTest.cs
similarity index 82%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualityGuideServiceTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeGuideServiceTest.cs
index c857475e..c624d89a 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/Guide/QualityGuideServiceTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeGuideServiceTest.cs
@@ -1,16 +1,16 @@
 using System.IO.Abstractions;
-using Recyclarr.Cli.Pipelines.QualitySize.Guide;
-using Recyclarr.Cli.TestLibrary;
 using Recyclarr.Common.Extensions;
 using Recyclarr.Common.TestLibrary;
 using Recyclarr.TrashLib.Config;
+using Recyclarr.TrashLib.Guide.QualitySize;
+using Recyclarr.TrashLib.Guide.TestLibrary;
 using Recyclarr.TrashLib.Repo;
 
-namespace Recyclarr.Cli.Tests.Pipelines.QualitySize.Guide;
+namespace Recyclarr.TrashLib.Guide.Tests.QualitySize;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class QualityGuideServiceTest : CliIntegrationFixture
+public class QualitySizeGuideServiceTest : GuideIntegrationFixture
 {
     [TestCase(SupportedServices.Sonarr, "sonarr")]
     [TestCase(SupportedServices.Radarr, "radarr")]
@@ -38,7 +38,7 @@ public class QualityGuideServiceTest : CliIntegrationFixture
             GetType(),
             "Data.quality_size.json");
 
-        var sut = Resolve<QualityGuideService>();
+        var sut = Resolve<QualitySizeGuideService>();
 
         var result = sut.GetQualitySizeData(service);
 
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/QualitySizeItemTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeItemTest.cs
similarity index 97%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/QualitySizeItemTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeItemTest.cs
index 9b124076..6c012acc 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/QualitySize/QualitySizeItemTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/QualitySize/QualitySizeItemTest.cs
@@ -1,6 +1,6 @@
-using Recyclarr.Cli.Pipelines.QualitySize;
+using Recyclarr.TrashLib.Guide.QualitySize;
 
-namespace Recyclarr.Cli.Tests.Pipelines.QualitySize;
+namespace Recyclarr.TrashLib.Guide.Tests.QualitySize;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.Guide.Tests/Recyclarr.TrashLib.Guide.Tests.csproj b/src/tests/Recyclarr.TrashLib.Guide.Tests/Recyclarr.TrashLib.Guide.Tests.csproj
new file mode 100644
index 00000000..1ead0be0
--- /dev/null
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/Recyclarr.TrashLib.Guide.Tests.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\Recyclarr.TrashLib.Guide\Recyclarr.TrashLib.Guide.csproj" />
+    <ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
+    <ProjectReference Include="..\Recyclarr.TrashLib.Guide.TestLibrary\Recyclarr.TrashLib.Guide.TestLibrary.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataValidationFiltererTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileDataValidationFiltererTest.cs
similarity index 93%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataValidationFiltererTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileDataValidationFiltererTest.cs
index 9e050735..c7aed919 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Filters/ReleaseProfileDataValidationFiltererTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileDataValidationFiltererTest.cs
@@ -1,7 +1,7 @@
-using Recyclarr.Cli.Pipelines.ReleaseProfile;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Filters;
+using Recyclarr.TestLibrary.AutoFixture;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
-namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile.Filters;
+namespace Recyclarr.TrashLib.Guide.Tests.ReleaseProfile;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/ReleaseProfileDataValidatorTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileDataValidatorTest.cs
similarity index 96%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/ReleaseProfileDataValidatorTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileDataValidatorTest.cs
index ce353132..c7752e2e 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/ReleaseProfileDataValidatorTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileDataValidatorTest.cs
@@ -1,7 +1,7 @@
 using FluentValidation.TestHelper;
-using Recyclarr.Cli.Pipelines.ReleaseProfile;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 
-namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile;
+namespace Recyclarr.TrashLib.Guide.Tests.ReleaseProfile;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideServiceTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileGuideServiceTest.cs
similarity index 94%
rename from src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideServiceTest.cs
rename to src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileGuideServiceTest.cs
index ab1d6f8b..2aac9ff1 100644
--- a/src/tests/Recyclarr.Cli.Tests/Pipelines/ReleaseProfile/Guide/ReleaseProfileGuideServiceTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/ReleaseProfile/ReleaseProfileGuideServiceTest.cs
@@ -1,11 +1,11 @@
 using System.IO.Abstractions;
 using Newtonsoft.Json;
-using Recyclarr.Cli.Pipelines.ReleaseProfile;
-using Recyclarr.Cli.Pipelines.ReleaseProfile.Guide;
 using Recyclarr.TestLibrary;
+using Recyclarr.TestLibrary.AutoFixture;
+using Recyclarr.TrashLib.Guide.ReleaseProfile;
 using Recyclarr.TrashLib.Repo;
 
-namespace Recyclarr.Cli.Tests.Pipelines.ReleaseProfile.Guide;
+namespace Recyclarr.TrashLib.Guide.Tests.ReleaseProfile;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
diff --git a/src/tests/Recyclarr.TrashLib.TestLibrary/NewConfig.cs b/src/tests/Recyclarr.TrashLib.TestLibrary/NewConfig.cs
index c9e5516a..9ba0af8b 100644
--- a/src/tests/Recyclarr.TrashLib.TestLibrary/NewConfig.cs
+++ b/src/tests/Recyclarr.TrashLib.TestLibrary/NewConfig.cs
@@ -1,4 +1,4 @@
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 
 namespace Recyclarr.TrashLib.TestLibrary;
 
diff --git a/src/tests/Recyclarr.TrashLib.TestLibrary/TrashLibIntegrationFixture.cs b/src/tests/Recyclarr.TrashLib.TestLibrary/TrashLibIntegrationFixture.cs
index c88f8e04..2abfc6a6 100644
--- a/src/tests/Recyclarr.TrashLib.TestLibrary/TrashLibIntegrationFixture.cs
+++ b/src/tests/Recyclarr.TrashLib.TestLibrary/TrashLibIntegrationFixture.cs
@@ -55,10 +55,6 @@ public abstract class TrashLibIntegrationFixture : IDisposable
     protected virtual void RegisterTypes(ContainerBuilder builder)
     {
         builder.RegisterModule<TrashLibAutofacModule>();
-
-        // Normally, the CLI's composition root registers this (because we can only do it once, and it must include
-        // dependent assemblies). The TrashLib assembly does have its own mapping profiles. We register those here, but
-        // not in the TrashLibAutofacModule.
     }
 
     // ReSharper disable MemberCanBePrivate.Global
diff --git a/src/tests/Recyclarr.TrashLib.Tests/Compatibility/Sonarr/SonarrCapabilityEnforcerTest.cs b/src/tests/Recyclarr.TrashLib.Tests/Compatibility/Sonarr/SonarrCapabilityEnforcerTest.cs
index 4531c914..b60dd1dd 100644
--- a/src/tests/Recyclarr.TrashLib.Tests/Compatibility/Sonarr/SonarrCapabilityEnforcerTest.cs
+++ b/src/tests/Recyclarr.TrashLib.Tests/Compatibility/Sonarr/SonarrCapabilityEnforcerTest.cs
@@ -1,5 +1,5 @@
 using Recyclarr.TrashLib.Compatibility.Sonarr;
-using Recyclarr.TrashLib.Config.Services;
+using Recyclarr.TrashLib.Config;
 using Recyclarr.TrashLib.ExceptionTypes;
 using Recyclarr.TrashLib.TestLibrary;