diff --git a/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs b/src/FilterLists.Agent/Core/Urls/EntityUrls/LicenseUrls.cs
similarity index 83%
rename from src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs
rename to src/FilterLists.Agent/Core/Urls/EntityUrls/LicenseUrls.cs
index 16aab193a..3a8476d74 100644
--- a/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs
+++ b/src/FilterLists.Agent/Core/Urls/EntityUrls/LicenseUrls.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Features.Urls.Models
+namespace FilterLists.Agent.Core.Urls.EntityUrls
 {
     [UsedImplicitly]
     public class LicenseUrls
diff --git a/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs b/src/FilterLists.Agent/Core/Urls/EntityUrls/ListUrls.cs
similarity index 95%
rename from src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs
rename to src/FilterLists.Agent/Core/Urls/EntityUrls/ListUrls.cs
index 17f60f328..99c3488f8 100644
--- a/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs
+++ b/src/FilterLists.Agent/Core/Urls/EntityUrls/ListUrls.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Features.Urls.Models
+namespace FilterLists.Agent.Core.Urls.EntityUrls
 {
     [UsedImplicitly]
     public class ListUrls
diff --git a/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs b/src/FilterLists.Agent/Core/Urls/EntityUrls/MaintainerUrls.cs
similarity index 83%
rename from src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs
rename to src/FilterLists.Agent/Core/Urls/EntityUrls/MaintainerUrls.cs
index 23ffbae0c..d09f5a36c 100644
--- a/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs
+++ b/src/FilterLists.Agent/Core/Urls/EntityUrls/MaintainerUrls.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Features.Urls.Models
+namespace FilterLists.Agent.Core.Urls.EntityUrls
 {
     [UsedImplicitly]
     public class MaintainerUrls
diff --git a/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs b/src/FilterLists.Agent/Core/Urls/EntityUrls/SoftwareUrls.cs
similarity index 86%
rename from src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs
rename to src/FilterLists.Agent/Core/Urls/EntityUrls/SoftwareUrls.cs
index 992707212..c674b17f5 100644
--- a/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs
+++ b/src/FilterLists.Agent/Core/Urls/EntityUrls/SoftwareUrls.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Features.Urls.Models
+namespace FilterLists.Agent.Core.Urls.EntityUrls
 {
     [UsedImplicitly]
     public class SoftwareUrls
diff --git a/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs b/src/FilterLists.Agent/Core/Urls/EntityUrls/SyntaxUrls.cs
similarity index 83%
rename from src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs
rename to src/FilterLists.Agent/Core/Urls/EntityUrls/SyntaxUrls.cs
index 416277742..b7f847e38 100644
--- a/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs
+++ b/src/FilterLists.Agent/Core/Urls/EntityUrls/SyntaxUrls.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Features.Urls.Models
+namespace FilterLists.Agent.Core.Urls.EntityUrls
 {
     [UsedImplicitly]
     public class SyntaxUrls
diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs b/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs
index 353f42047..3a737d8e4 100644
--- a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Urls;
-using FilterLists.Agent.Features.Urls.Models;
+using FilterLists.Agent.Core.Urls.EntityUrls;
 using JetBrains.Annotations;
 using RestSharp;