diff --git a/src/FilterLists.Agent/Core/Interfaces/Clients/IAgentGitHubClient.cs b/src/FilterLists.Agent/Core/Interfaces/Clients/IAgentGitHubClient.cs
new file mode 100644
index 000000000..66de03d05
--- /dev/null
+++ b/src/FilterLists.Agent/Core/Interfaces/Clients/IAgentGitHubClient.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Octokit;
+
+namespace FilterLists.Agent.Core.Interfaces.Clients
+{
+    public interface IAgentGitHubClient
+    {
+        Task<IReadOnlyList<Issue>> GetAllIssues(RepositoryIssueRequest repositoryIssueRequest);
+
+        Task<Issue> CreateIssue(NewIssue newIssue);
+
+        Task<Issue> UpdateIssue(int issueNumber, IssueUpdate issueUpdate);
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Core/Interfaces/Clients/IAgentHttpClient.cs b/src/FilterLists.Agent/Core/Interfaces/Clients/IAgentHttpClient.cs
new file mode 100644
index 000000000..ef79565e2
--- /dev/null
+++ b/src/FilterLists.Agent/Core/Interfaces/Clients/IAgentHttpClient.cs
@@ -0,0 +1,9 @@
+using System.Net.Http;
+
+namespace FilterLists.Agent.Core.Interfaces.Clients
+{
+    public interface IAgentHttpClient
+    {
+        HttpClient HttpClient { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Core/Interfaces/Clients/IFilterListsApiClient.cs b/src/FilterLists.Agent/Core/Interfaces/Clients/IFilterListsApiClient.cs
new file mode 100644
index 000000000..cee0fa8f2
--- /dev/null
+++ b/src/FilterLists.Agent/Core/Interfaces/Clients/IFilterListsApiClient.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using RestSharp;
+
+namespace FilterLists.Agent.Core.Interfaces.Clients
+{
+    public interface IFilterListsApiClient
+    {
+        Task<TResponse> ExecuteAsync<TResponse>(IRestRequest request);
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs b/src/FilterLists.Agent/Core/Interfaces/Repositories/IListInfoRepository.cs
similarity index 78%
rename from src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs
rename to src/FilterLists.Agent/Core/Interfaces/Repositories/IListInfoRepository.cs
index 8e500aecd..e28dc61de 100644
--- a/src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs
+++ b/src/FilterLists.Agent/Core/Interfaces/Repositories/IListInfoRepository.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
 
-namespace FilterLists.Agent.Core.Interfaces
+namespace FilterLists.Agent.Core.Interfaces.Repositories
 {
     public interface IListInfoRepository
     {
diff --git a/src/FilterLists.Agent/Core/Interfaces/IUrlRepository.cs b/src/FilterLists.Agent/Core/Interfaces/Repositories/IUrlRepository.cs
similarity index 76%
rename from src/FilterLists.Agent/Core/Interfaces/IUrlRepository.cs
rename to src/FilterLists.Agent/Core/Interfaces/Repositories/IUrlRepository.cs
index 71b01fef8..f9bdf66fa 100644
--- a/src/FilterLists.Agent/Core/Interfaces/IUrlRepository.cs
+++ b/src/FilterLists.Agent/Core/Interfaces/Repositories/IUrlRepository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace FilterLists.Agent.Core.Interfaces
+namespace FilterLists.Agent.Core.Interfaces.Repositories
 {
     public interface IUrlRepository
     {
diff --git a/src/FilterLists.Agent/Extensions/ReadOnlyListExtensions.cs b/src/FilterLists.Agent/Extensions/ReadOnlyListExtensions.cs
index 46345eb4f..7ec543640 100644
--- a/src/FilterLists.Agent/Extensions/ReadOnlyListExtensions.cs
+++ b/src/FilterLists.Agent/Extensions/ReadOnlyListExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace FilterLists.Agent.Extensions
 {
diff --git a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
index 512436565..04bdd59c7 100644
--- a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
+++ b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
@@ -2,7 +2,8 @@
 using System.Net.Http;
 using CommandLine;
 using FilterLists.Agent.AppSettings;
-using FilterLists.Agent.Core.Interfaces;
+using FilterLists.Agent.Core.Interfaces.Clients;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using FilterLists.Agent.Infrastructure.Clients;
 using FilterLists.Agent.Infrastructure.Repositories;
 using LibGit2Sharp;
diff --git a/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs b/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs
index f8931100b..615ec40a4 100644
--- a/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs
+++ b/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Interfaces;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using MediatR;
 
 namespace FilterLists.Agent.Features.Lists
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs b/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
index e1deb7c23..0f309ffe3 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
@@ -4,8 +4,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using FilterLists.Agent.Extensions;
-using FilterLists.Agent.Infrastructure.Clients;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs b/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
index 5432f17cc..c0dec3f6d 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Infrastructure.Clients;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using MediatR;
 using Microsoft.Extensions.Logging;
 using SharpCompress.Archives;
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadZip.cs b/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
index cac13116e..d8c13b883 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Infrastructure.Clients;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using MediatR;
 using Microsoft.Extensions.Logging;
 using SharpCompress.Common;
diff --git a/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs b/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs
index b4c088c8b..df8009061 100644
--- a/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs
+++ b/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using FilterLists.Agent.Extensions;
-using FilterLists.Agent.Infrastructure.Clients;
 using MediatR;
 using Octokit;
 
diff --git a/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs b/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs
index f9d0fb8db..771aeb941 100644
--- a/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs
+++ b/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using FilterLists.Agent.Extensions;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;
-using FilterLists.Agent.Infrastructure.Clients;
 using MediatR;
 using Octokit;
 
diff --git a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
index f1a7eb668..42cf42fbf 100644
--- a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Interfaces;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using FilterLists.Agent.Features.Urls.Models.DataFileUrls;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;
 using MediatR;
diff --git a/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs b/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs
index 74adc104f..9a3d9c00f 100644
--- a/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs
@@ -5,9 +5,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using FilterLists.Agent.Extensions;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;
-using FilterLists.Agent.Infrastructure.Clients;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs b/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs
index b1f39a48f..68673fa09 100644
--- a/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs
+++ b/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FilterLists.Agent.AppSettings;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -8,15 +9,6 @@
 
 namespace FilterLists.Agent.Infrastructure.Clients
 {
-    public interface IAgentGitHubClient
-    {
-        Task<IReadOnlyList<Issue>> GetAllIssues(RepositoryIssueRequest repositoryIssueRequest);
-
-        Task<Issue> CreateIssue(NewIssue newIssue);
-
-        Task<Issue> UpdateIssue(int issueNumber, IssueUpdate issueUpdate);
-    }
-
     public class AgentGitHubClient : IAgentGitHubClient
     {
         private readonly IGitHubClient _gitHubClient;
diff --git a/src/FilterLists.Agent/Infrastructure/Clients/AgentHttpClient.cs b/src/FilterLists.Agent/Infrastructure/Clients/AgentHttpClient.cs
index 04cd36cbc..fb38aa8dd 100644
--- a/src/FilterLists.Agent/Infrastructure/Clients/AgentHttpClient.cs
+++ b/src/FilterLists.Agent/Infrastructure/Clients/AgentHttpClient.cs
@@ -1,15 +1,11 @@
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using JetBrains.Annotations;
 
 namespace FilterLists.Agent.Infrastructure.Clients
 {
-    public interface IAgentHttpClient
-    {
-        HttpClient HttpClient { get; }
-    }
-
     [UsedImplicitly]
     public class AgentHttpClient : IAgentHttpClient
     {
diff --git a/src/FilterLists.Agent/Infrastructure/Clients/FilterListsApiClient.cs b/src/FilterLists.Agent/Infrastructure/Clients/FilterListsApiClient.cs
index 7d0f9a6ca..ca86378de 100644
--- a/src/FilterLists.Agent/Infrastructure/Clients/FilterListsApiClient.cs
+++ b/src/FilterLists.Agent/Infrastructure/Clients/FilterListsApiClient.cs
@@ -1,15 +1,11 @@
 using System;
 using System.Threading.Tasks;
+using FilterLists.Agent.Core.Interfaces.Clients;
 using Microsoft.Extensions.Localization;
 using RestSharp;
 
 namespace FilterLists.Agent.Infrastructure.Clients
 {
-    public interface IFilterListsApiClient
-    {
-        Task<TResponse> ExecuteAsync<TResponse>(IRestRequest request);
-    }
-
     public class FilterListsApiClient : IFilterListsApiClient
     {
         private const string FilterListsApiBaseUrl = "https://filterlists.com/api/v1";
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
index 1499c307a..0d87e2d46 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces;
-using FilterLists.Agent.Infrastructure.Clients;
+using FilterLists.Agent.Core.Interfaces.Clients;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using RestSharp;
 
 namespace FilterLists.Agent.Infrastructure.Repositories
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs
index 25722bb2d..b7490f575 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs
@@ -3,9 +3,9 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Interfaces;
+using FilterLists.Agent.Core.Interfaces.Clients;
+using FilterLists.Agent.Core.Interfaces.Repositories;
 using FilterLists.Agent.Features.Urls.Models.DataFileUrls;
-using FilterLists.Agent.Infrastructure.Clients;
 using Microsoft.Extensions.Localization;
 using RestSharp;