diff --git a/src/FilterLists.Agent/Core/Interfaces/Repositories/IGitHubIssuesRepository.cs b/src/FilterLists.Agent/Core/IGitHubIssuesRepository.cs
similarity index 87%
rename from src/FilterLists.Agent/Core/Interfaces/Repositories/IGitHubIssuesRepository.cs
rename to src/FilterLists.Agent/Core/IGitHubIssuesRepository.cs
index f199e7035..48a89b13f 100644
--- a/src/FilterLists.Agent/Core/Interfaces/Repositories/IGitHubIssuesRepository.cs
+++ b/src/FilterLists.Agent/Core/IGitHubIssuesRepository.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Octokit;
 
-namespace FilterLists.Agent.Core.Interfaces.Repositories
+namespace FilterLists.Agent.Core
 {
     public interface IGitHubIssuesRepository
     {
diff --git a/src/FilterLists.Agent/Core/Interfaces/Repositories/IListRepository.cs b/src/FilterLists.Agent/Core/IListRepository.cs
similarity index 67%
rename from src/FilterLists.Agent/Core/Interfaces/Repositories/IListRepository.cs
rename to src/FilterLists.Agent/Core/IListRepository.cs
index 3f1046404..5f83ce311 100644
--- a/src/FilterLists.Agent/Core/Interfaces/Repositories/IListRepository.cs
+++ b/src/FilterLists.Agent/Core/IListRepository.cs
@@ -1,6 +1,6 @@
 using System.Net.Http;
 
-namespace FilterLists.Agent.Core.Interfaces.Repositories
+namespace FilterLists.Agent.Core
 {
     public interface IListRepository
     {
diff --git a/src/FilterLists.Agent/Core/Interfaces/Repositories/IUrlRepository.cs b/src/FilterLists.Agent/Core/IUrlRepository.cs
similarity index 87%
rename from src/FilterLists.Agent/Core/Interfaces/Repositories/IUrlRepository.cs
rename to src/FilterLists.Agent/Core/IUrlRepository.cs
index 4ece488dd..7d71a1431 100644
--- a/src/FilterLists.Agent/Core/Interfaces/Repositories/IUrlRepository.cs
+++ b/src/FilterLists.Agent/Core/IUrlRepository.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;
 
-namespace FilterLists.Agent.Core.Interfaces.Repositories
+namespace FilterLists.Agent.Core
 {
     public interface IUrlRepository
     {
diff --git a/src/FilterLists.Agent/Core/Interfaces/Repositories/IListInfoRepository.cs b/src/FilterLists.Agent/Core/ListInfo/IListInfoRepository.cs
similarity index 70%
rename from src/FilterLists.Agent/Core/Interfaces/Repositories/IListInfoRepository.cs
rename to src/FilterLists.Agent/Core/ListInfo/IListInfoRepository.cs
index bc5dc3efc..2d1c0b649 100644
--- a/src/FilterLists.Agent/Core/Interfaces/Repositories/IListInfoRepository.cs
+++ b/src/FilterLists.Agent/Core/ListInfo/IListInfoRepository.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Entities;
 
-namespace FilterLists.Agent.Core.Interfaces.Repositories
+namespace FilterLists.Agent.Core.ListInfo
 {
     public interface IListInfoRepository
     {
diff --git a/src/FilterLists.Agent/Core/Entities/ListInfo.cs b/src/FilterLists.Agent/Core/ListInfo/ListInfo.cs
similarity index 84%
rename from src/FilterLists.Agent/Core/Entities/ListInfo.cs
rename to src/FilterLists.Agent/Core/ListInfo/ListInfo.cs
index e32ea478c..465f061d9 100644
--- a/src/FilterLists.Agent/Core/Entities/ListInfo.cs
+++ b/src/FilterLists.Agent/Core/ListInfo/ListInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Core.Entities
+namespace FilterLists.Agent.Core.ListInfo
 {
     [UsedImplicitly]
     public class ListInfo
diff --git a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
index bafc95c6f..a19f0267d 100644
--- a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
+++ b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
@@ -3,7 +3,8 @@
 using System.Net.Http;
 using CommandLine;
 using FilterLists.Agent.AppSettings;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
+using FilterLists.Agent.Core.ListInfo;
 using FilterLists.Agent.Infrastructure.Repositories;
 using LibGit2Sharp;
 using MediatR;
diff --git a/src/FilterLists.Agent/Extensions/UriExtensions.cs b/src/FilterLists.Agent/Extensions/UriExtensions.cs
index 2ad278c0a..ce1b2508e 100644
--- a/src/FilterLists.Agent/Extensions/UriExtensions.cs
+++ b/src/FilterLists.Agent/Extensions/UriExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using FilterLists.Agent.Core.Entities;
+using FilterLists.Agent.Core.ListInfo;
 
 namespace FilterLists.Agent.Extensions
 {
diff --git a/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs b/src/FilterLists.Agent/Features/Lists/ArchiveLists.cs
index 1dc6228fa..80254d41d 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.Repositories;
+using FilterLists.Agent.Core.ListInfo;
 using MediatR;
 
 namespace FilterLists.Agent.Features.Lists
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadLists.cs b/src/FilterLists.Agent/Features/Lists/DownloadLists.cs
index 931c5253b..56e2ce649 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadLists.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadLists.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
-using FilterLists.Agent.Core.Entities;
+using FilterLists.Agent.Core.ListInfo;
 using FilterLists.Agent.Extensions;
 using MediatR;
 using Microsoft.Extensions.Logging;
diff --git a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs b/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
index 705dcf5b4..442771250 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadRawText.cs
@@ -3,8 +3,8 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
+using FilterLists.Agent.Core.ListInfo;
 using FilterLists.Agent.Extensions;
 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 30be14ce2..1c81ff8c3 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadSevenZip.cs
@@ -2,8 +2,8 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
+using FilterLists.Agent.Core.ListInfo;
 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 4c4aaabe9..ea3087bcf 100644
--- a/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
+++ b/src/FilterLists.Agent/Features/Lists/DownloadZip.cs
@@ -2,8 +2,8 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
+using FilterLists.Agent.Core.ListInfo;
 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 93225c5bd..c5b7f2835 100644
--- a/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs
+++ b/src/FilterLists.Agent/Features/Urls/CloseUrlValidationIssue.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
 using FilterLists.Agent.Extensions;
 using MediatR;
 using Octokit;
diff --git a/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs b/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs
index 95a8507cd..185be8958 100644
--- a/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs
+++ b/src/FilterLists.Agent/Features/Urls/CreateOrUpdateUrlValidationIssue.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
 using FilterLists.Agent.Extensions;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;
 using MediatR;
diff --git a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
index 14e7dd564..a4eb1bb62 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.Repositories;
+using FilterLists.Agent.Core;
 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 4473b2640..facb4216b 100644
--- a/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
 using FilterLists.Agent.Extensions;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;
 using MediatR;
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/GitHubIssuesRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/GitHubIssuesRepository.cs
index 6a02d5f00..24e655f7b 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/GitHubIssuesRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/GitHubIssuesRepository.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FilterLists.Agent.AppSettings;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
index 705b3a0da..10a5f4bec 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Entities;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core.ListInfo;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using RestSharp;
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs
index 25e33c521..fd8c9dc6c 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/ListRepository.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
 using JetBrains.Annotations;
 
 namespace FilterLists.Agent.Infrastructure.Repositories
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs
index 575fc6d24..6c8bd890a 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs
@@ -6,7 +6,7 @@
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Interfaces.Repositories;
+using FilterLists.Agent.Core;
 using FilterLists.Agent.Extensions;
 using FilterLists.Agent.Features.Urls.Models.DataFileUrls;
 using FilterLists.Agent.Features.Urls.Models.ValidationResults;