diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Azure/AzureAppServiceSslBindingCertificatePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Azure/AzureAppServiceSslBindingCertificatePersistenceStrategy.cs
index c16af28..f41ee86 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Azure/AzureAppServiceSslBindingCertificatePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Azure/AzureAppServiceSslBindingCertificatePersistenceStrategy.cs
@@ -1,4 +1,5 @@
 using System;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Azure.Management.AppService.Fluent.Models;
 using Microsoft.Azure.Management.Fluent;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Azure/RegistrationExtensions.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Azure/RegistrationExtensions.cs
index 26b9493..9f35aad 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Azure/RegistrationExtensions.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Azure/RegistrationExtensions.cs
@@ -1,4 +1,5 @@
 using FluffySpoon.AspNet.LetsEncrypt.Azure;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using FluffySpoon.LetsEncrypt.Azure;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Program.cs b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Program.cs
index 5ea2357..702b8e5 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Program.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Program.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Startup.cs b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Startup.cs
index 508a8cb..0feec5c 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Startup.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Startup.cs
@@ -2,7 +2,8 @@
 using System.IO;
 using System.Linq;
 using Certes;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/EntityFrameworkChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/EntityFrameworkChallengePersistenceStrategy.cs
index 3de238a..7f9cc54 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/EntityFrameworkChallengePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/EntityFrameworkChallengePersistenceStrategy.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/RegistrationExtensions.cs b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/RegistrationExtensions.cs
index 2603528..d86e5cc 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/RegistrationExtensions.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/RegistrationExtensions.cs
@@ -1,6 +1,5 @@
 using FluffySpoon.AspNet.LetsEncrypt.EntityFramework;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Redis/DistributedCacheChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Redis/DistributedCacheChallengePersistenceStrategy.cs
index a772e3b..05f8ce6 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Redis/DistributedCacheChallengePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Redis/DistributedCacheChallengePersistenceStrategy.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Program.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Program.cs
index 13f226f..b7322b1 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Program.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Program.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+ using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Startup.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Startup.cs
index 059b2fb..f901e76 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Startup.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Sample/Startup.cs
@@ -1,5 +1,6 @@
 using System;
 using Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/CertificateValidatorTests.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/CertificateValidatorTests.cs
index 23548b7..ae4452a 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/CertificateValidatorTests.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/CertificateValidatorTests.cs
@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using FluentAssertions.Extensions;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/FluffySpoon.AspNet.LetsEncrypt.Tests.csproj b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/FluffySpoon.AspNet.LetsEncrypt.Tests.csproj
index ea2b09a..48fd82e 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/FluffySpoon.AspNet.LetsEncrypt.Tests.csproj
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/FluffySpoon.AspNet.LetsEncrypt.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/LetsEncryptClientTests.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/LetsEncryptClientTests.cs
index 03bc748..922fac9 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/LetsEncryptClientTests.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/LetsEncryptClientTests.cs
@@ -6,14 +6,13 @@
 using Certes.Acme;
 using FluentAssertions;
 using FluentAssertions.Extensions;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
-using FluffySpoon.AspNet.LetsEncrypt.Logic.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NSubstitute;
-using static FluffySpoon.AspNet.LetsEncrypt.Logic.Models.CertificateRenewalStatus;
+using static FluffySpoon.AspNet.LetsEncrypt.Certificates.CertificateRenewalStatus;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Tests
 {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/ResolutionTests.cs b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/ResolutionTests.cs
index 23a267a..3c9f1bb 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt.Tests/ResolutionTests.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.Tests/ResolutionTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt.sln.DotSettings b/src/FluffySpoon.AspNet.LetsEncrypt.sln.DotSettings
new file mode 100644
index 0000000..d24156f
--- /dev/null
+++ b/src/FluffySpoon.AspNet.LetsEncrypt.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">DO_NOT_SHOW</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptChallengeApprovalMiddleware.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptChallengeApprovalMiddleware.cs
similarity index 78%
rename from src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptChallengeApprovalMiddleware.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptChallengeApprovalMiddleware.cs
index debb9f4..302160b 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptChallengeApprovalMiddleware.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptChallengeApprovalMiddleware.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public interface ILetsEncryptChallengeApprovalMiddleware
 	{
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptRenewalService.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptRenewalService.cs
similarity index 82%
rename from src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptRenewalService.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptRenewalService.cs
index c2fa014..1b4b470 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptRenewalService.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptRenewalService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public interface ILetsEncryptRenewalService: IHostedService, IDisposable
 	{
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptChallengeApprovalMiddleware.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptChallengeApprovalMiddleware.cs
similarity index 97%
rename from src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptChallengeApprovalMiddleware.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptChallengeApprovalMiddleware.cs
index c671f43..c8ea9e9 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptChallengeApprovalMiddleware.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptChallengeApprovalMiddleware.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public class LetsEncryptChallengeApprovalMiddleware : ILetsEncryptChallengeApprovalMiddleware
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClient.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClient.cs
similarity index 96%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClient.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClient.cs
index 3676b48..b4ab0ec 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClient.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClient.cs
@@ -5,11 +5,10 @@
 using Certes.Acme;
 using Certes.Acme.Resource;
 using FluffySpoon.AspNet.LetsEncrypt.Exceptions;
-using FluffySpoon.AspNet.LetsEncrypt.Logic.Models;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public interface ILetsEncryptClient
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClientFactory.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClientFactory.cs
similarity index 97%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClientFactory.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClientFactory.cs
index 6115b6f..284f5b8 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClientFactory.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClientFactory.cs
@@ -3,7 +3,7 @@
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public interface ILetsEncryptClientFactory
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptOptions.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptOptions.cs
similarity index 97%
rename from src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptOptions.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptOptions.cs
index 1b2d573..6c8fdb6 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptOptions.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptOptions.cs
@@ -3,7 +3,7 @@
 using Certes;
 using Certes.Acme;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public class LetsEncryptOptions
 	{
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptRenewalService.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptRenewalService.cs
similarity index 95%
rename from src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptRenewalService.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptRenewalService.cs
index 14b98b6..745175e 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptRenewalService.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptRenewalService.cs
@@ -3,11 +3,11 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 using Microsoft.Extensions.Logging;
-using static FluffySpoon.AspNet.LetsEncrypt.Logic.Models.CertificateRenewalStatus;
+using static FluffySpoon.AspNet.LetsEncrypt.Certificates.CertificateRenewalStatus;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public class LetsEncryptRenewalService : ILetsEncryptRenewalService
 	{
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PfxCertificate.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/PfxCertificate.cs
similarity index 76%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PfxCertificate.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/PfxCertificate.cs
index cd31695..5ef607a 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PfxCertificate.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/PfxCertificate.cs
@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public class PfxCertificate
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PlacedOrder.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/PlacedOrder.cs
similarity index 82%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PlacedOrder.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/PlacedOrder.cs
index 8fba61b..bb749d4 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PlacedOrder.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/PlacedOrder.cs
@@ -1,7 +1,7 @@
 using Certes.Acme;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public class PlacedOrder
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/RenewalFailMode.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/RenewalFailMode.cs
similarity index 91%
rename from src/FluffySpoon.AspNet.LetsEncrypt/RenewalFailMode.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certes/RenewalFailMode.cs
index 2d35bdb..631f6aa 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/RenewalFailMode.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certes/RenewalFailMode.cs
@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	/// <summary>
 	/// Defines the ways errors are handle by the <see cref="ILetsEncryptRenewalService" />.
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateProvider.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateProvider.cs
similarity index 93%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateProvider.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateProvider.cs
index 27e8b0f..c5f9770 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateProvider.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateProvider.cs
@@ -2,23 +2,21 @@
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Logic.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
-    public interface ICertificateProvider
-    {
-        Task<CertificateRenewalResult> RenewCertificateIfNeeded(X509Certificate2 current = null);
-    }
-    
+
     public class CertificateProvider : ICertificateProvider
     {
         private readonly IPersistenceService _persistenceService;
         private readonly ILetsEncryptClientFactory _clientFactory;
         private readonly ICertificateValidator _certificateValidator;
+
         private readonly ILogger<CertificateProvider> _logger;
+
         private readonly string[] _domains;
 
         public CertificateProvider(
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalResult.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalResult.cs
similarity index 88%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalResult.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalResult.cs
index b9e8b3a..15de216 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalResult.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalResult.cs
@@ -1,6 +1,6 @@
 using System.Security.Cryptography.X509Certificates;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
     public class CertificateRenewalResult
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalStatus.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalStatus.cs
similarity index 68%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalStatus.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalStatus.cs
index 44a8ec4..da81c7d 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalStatus.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalStatus.cs
@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
     public enum CertificateRenewalStatus
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateValidator.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateValidator.cs
similarity index 94%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateValidator.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateValidator.cs
index ed80cf1..7964c7b 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateValidator.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateValidator.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
     public interface ICertificateValidator
     {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/ICertificateProvider.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/ICertificateProvider.cs
new file mode 100644
index 0000000..ce9213e
--- /dev/null
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Certificates/ICertificateProvider.cs
@@ -0,0 +1,10 @@
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
+{
+    public interface ICertificateProvider
+    {
+        Task<CertificateRenewalResult> RenewCertificateIfNeeded(X509Certificate2 current = null);
+    }
+}
\ No newline at end of file
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/Models/ChallengeDto.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/ChallengeDto.cs
similarity index 70%
rename from src/FluffySpoon.AspNet.LetsEncrypt/Persistence/Models/ChallengeDto.cs
rename to src/FluffySpoon.AspNet.LetsEncrypt/Persistence/ChallengeDto.cs
index 07e1cd4..146c5a7 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/Models/ChallengeDto.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/ChallengeDto.cs
@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt.Persistence.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
 {
 	public class ChallengeDto
 	{
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/CustomChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/CustomChallengePersistenceStrategy.cs
index 0f97380..08afd66 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/CustomChallengePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/CustomChallengePersistenceStrategy.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
 {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/FileChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/FileChallengePersistenceStrategy.cs
index 992ccc9..26073da 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/FileChallengePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/FileChallengePersistenceStrategy.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IChallengePersistenceStrategy.cs
index 348aaa5..c4d29ce 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IChallengePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IChallengePersistenceStrategy.cs
@@ -1,5 +1,4 @@
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IPersistenceService.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IPersistenceService.cs
index b68b208..ba76a39 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IPersistenceService.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IPersistenceService.cs
@@ -1,7 +1,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Certes;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
 {
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/MemoryChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/MemoryChallengePersistenceStrategy.cs
index f6cbdb5..f2fa37a 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/MemoryChallengePersistenceStrategy.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/MemoryChallengePersistenceStrategy.cs
@@ -1,5 +1,4 @@
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/PersistenceService.cs b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/PersistenceService.cs
index 44ade80..6c2ea61 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/PersistenceService.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/Persistence/PersistenceService.cs
@@ -6,7 +6,6 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Certes;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
diff --git a/src/FluffySpoon.AspNet.LetsEncrypt/RegistrationExtensions.cs b/src/FluffySpoon.AspNet.LetsEncrypt/RegistrationExtensions.cs
index ed02522..a55cbd3 100644
--- a/src/FluffySpoon.AspNet.LetsEncrypt/RegistrationExtensions.cs
+++ b/src/FluffySpoon.AspNet.LetsEncrypt/RegistrationExtensions.cs
@@ -5,7 +5,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 
 namespace FluffySpoon.AspNet.LetsEncrypt
 {