diff --git a/FilterLists.sln.DotSettings b/FilterLists.sln.DotSettings
index c6d6a679f..08064f116 100644
--- a/FilterLists.sln.DotSettings
+++ b/FilterLists.sln.DotSettings
@@ -1,8 +1,14 @@
-<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">
+<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/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	</wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/FilterLists.Api/V1/Controllers/ForksController.cs b/src/FilterLists.Api/V1/Controllers/ForksController.cs
index d8516274c..e62a0322e 100644
--- a/src/FilterLists.Api/V1/Controllers/ForksController.cs
+++ b/src/FilterLists.Api/V1/Controllers/ForksController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.Models.Seed.Junctions;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/LanguagesController.cs b/src/FilterLists.Api/V1/Controllers/LanguagesController.cs
index 8aecc619b..2d2b0533e 100644
--- a/src/FilterLists.Api/V1/Controllers/LanguagesController.cs
+++ b/src/FilterLists.Api/V1/Controllers/LanguagesController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models.Seed;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/LicensesController.cs b/src/FilterLists.Api/V1/Controllers/LicensesController.cs
index 86791de2a..1241412bc 100644
--- a/src/FilterLists.Api/V1/Controllers/LicensesController.cs
+++ b/src/FilterLists.Api/V1/Controllers/LicensesController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models.Seed;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs
index 7e1c14bf4..b07d3673b 100644
--- a/src/FilterLists.Api/V1/Controllers/ListsController.cs
+++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs
@@ -1,7 +1,8 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models.Seed;
-using FilterLists.Services.Services;
+using FilterLists.Services.FilterListService;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs b/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs
index 1db69d365..0fe61dbac 100644
--- a/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs
+++ b/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.Models.Seed.Junctions;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs b/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs
index 8f99ba821..c4b2e35c9 100644
--- a/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs
+++ b/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.Models.Seed.Junctions;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/MaintainersController.cs b/src/FilterLists.Api/V1/Controllers/MaintainersController.cs
index fcb2a3bc9..f790f8575 100644
--- a/src/FilterLists.Api/V1/Controllers/MaintainersController.cs
+++ b/src/FilterLists.Api/V1/Controllers/MaintainersController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models.Seed;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/MergesController.cs b/src/FilterLists.Api/V1/Controllers/MergesController.cs
index 926f289aa..59897bded 100644
--- a/src/FilterLists.Api/V1/Controllers/MergesController.cs
+++ b/src/FilterLists.Api/V1/Controllers/MergesController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.Models.Seed.Junctions;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/ScrapeController.cs b/src/FilterLists.Api/V1/Controllers/ScrapeController.cs
index 99eccf22f..baecb63ee 100644
--- a/src/FilterLists.Api/V1/Controllers/ScrapeController.cs
+++ b/src/FilterLists.Api/V1/Controllers/ScrapeController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using FilterLists.Services.Services;
+using FilterLists.Services.ScrapeService;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/SoftwareController.cs b/src/FilterLists.Api/V1/Controllers/SoftwareController.cs
index fc03693ff..111f7e5e2 100644
--- a/src/FilterLists.Api/V1/Controllers/SoftwareController.cs
+++ b/src/FilterLists.Api/V1/Controllers/SoftwareController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models.Seed;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs b/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs
index 0d96758f4..61442d813 100644
--- a/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs
+++ b/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.Models.Seed.Junctions;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs b/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs
index 72211a963..b145f3dbc 100644
--- a/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs
+++ b/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models.Seed;
-using FilterLists.Services.Services;
+using FilterLists.Services.SeedService;
+using FilterLists.Services.SeedService.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers
diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 7a2bba75b..b8bb7eeff 100644
--- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -1,6 +1,5 @@
 using AutoMapper;
 using FilterLists.Data;
-using FilterLists.Services.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -16,9 +15,9 @@ public static void AddFilterListsServices(this IServiceCollection services, ICon
             services.AddEntityFrameworkMySql().AddDbContextPool<FilterListsDbContext>(options =>
                 options.UseMySql(configuration.GetConnectionString("FilterListsConnection"),
                     b => b.MigrationsAssembly("FilterLists.Api")));
-            services.TryAddScoped<SeedService>();
-            services.TryAddScoped<FilterListService>();
-            services.TryAddScoped<ScrapeService>();
+            services.TryAddScoped<SeedService.SeedService>();
+            services.TryAddScoped<FilterListService.FilterListService>();
+            services.TryAddScoped<ScrapeService.ScrapeService>();
             services.AddAutoMapper();
         }
     }
diff --git a/src/FilterLists.Services/Services/FilterListService.cs b/src/FilterLists.Services/FilterListService/FilterListService.cs
similarity index 87%
rename from src/FilterLists.Services/Services/FilterListService.cs
rename to src/FilterLists.Services/FilterListService/FilterListService.cs
index 76301e607..2e9acfac4 100644
--- a/src/FilterLists.Services/Services/FilterListService.cs
+++ b/src/FilterLists.Services/FilterListService/FilterListService.cs
@@ -3,10 +3,10 @@
 using AutoMapper.QueryableExtensions;
 using FilterLists.Data;
 using FilterLists.Data.Entities;
-using FilterLists.Services.Models;
+using FilterLists.Services.FilterListService.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Services.Services
+namespace FilterLists.Services.FilterListService
 {
     public class FilterListService
     {
diff --git a/src/FilterLists.Services/Models/FilterListSummaryDto.cs b/src/FilterLists.Services/FilterListService/Models/FilterListSummaryDto.cs
similarity index 75%
rename from src/FilterLists.Services/Models/FilterListSummaryDto.cs
rename to src/FilterLists.Services/FilterListService/Models/FilterListSummaryDto.cs
index 141901ae9..610dbeade 100644
--- a/src/FilterLists.Services/Models/FilterListSummaryDto.cs
+++ b/src/FilterLists.Services/FilterListService/Models/FilterListSummaryDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models
+namespace FilterLists.Services.FilterListService.Models
 {
     public class FilterListSummaryDto
     {
diff --git a/src/FilterLists.Services/ScrapeService/Models/FilterListViewUrlDto.cs b/src/FilterLists.Services/ScrapeService/Models/FilterListViewUrlDto.cs
new file mode 100644
index 000000000..9084d11e6
--- /dev/null
+++ b/src/FilterLists.Services/ScrapeService/Models/FilterListViewUrlDto.cs
@@ -0,0 +1,8 @@
+namespace FilterLists.Services.ScrapeService.Models
+{
+    public class FilterListViewUrlDto
+    {
+        public int Id { get; set; }
+        public string ViewUrl { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Services/ScrapeService/Models/Snapshot.cs b/src/FilterLists.Services/ScrapeService/Models/Snapshot.cs
new file mode 100644
index 000000000..c1a9c0580
--- /dev/null
+++ b/src/FilterLists.Services/ScrapeService/Models/Snapshot.cs
@@ -0,0 +1,34 @@
+using System;
+
+namespace FilterLists.Services.ScrapeService.Models
+{
+    public class Snapshot
+    {
+        public string Content
+        {
+            set
+            {
+                if (value == null) return;
+                var rawRules = value.Split(new[] {"\r\n", "\r", "\n"}, StringSplitOptions.RemoveEmptyEntries);
+                for (var i = 0; i < rawRules.Length; i++)
+                    rawRules[i] = LintStringForMySql(rawRules[i]);
+                RawRules = rawRules;
+            }
+        }
+
+        public int FilterListId { get; set; }
+
+        public string[] RawRules { get; private set; }
+
+        private static string LintStringForMySql(string rule)
+        {
+            rule = TrimSingleBackslashFromEnd(rule);
+            return rule;
+        }
+
+        private static string TrimSingleBackslashFromEnd(string rule)
+        {
+            return rule.EndsWith(@"\") && !rule.EndsWith(@"\\") ? rule.Remove(rule.Length - 1) : rule;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Services/Services/ScrapeService.cs b/src/FilterLists.Services/ScrapeService/ScrapeService.cs
similarity index 79%
rename from src/FilterLists.Services/Services/ScrapeService.cs
rename to src/FilterLists.Services/ScrapeService/ScrapeService.cs
index d8a920341..4d73ab1b8 100644
--- a/src/FilterLists.Services/Services/ScrapeService.cs
+++ b/src/FilterLists.Services/ScrapeService/ScrapeService.cs
@@ -7,9 +7,10 @@
 using FilterLists.Data;
 using FilterLists.Data.Entities;
 using FilterLists.Data.Entities.Junctions;
+using FilterLists.Services.ScrapeService.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Services.Services
+namespace FilterLists.Services.ScrapeService
 {
     public class ScrapeService
     {
@@ -114,41 +115,5 @@ private async Task AddOrUpdateRules(Snapshot snapshot)
 
             await dbContext.SaveChangesAsync();
         }
-
-        private class FilterListViewUrlDto
-        {
-            public int Id { get; set; }
-            public string ViewUrl { get; set; }
-        }
-
-        private class Snapshot
-        {
-            public string Content
-            {
-                set
-                {
-                    if (value == null) return;
-                    var rawRules = value.Split(new[] {"\r\n", "\r", "\n"}, StringSplitOptions.RemoveEmptyEntries);
-                    for (var i = 0; i < rawRules.Length; i++)
-                        rawRules[i] = LintStringForMySql(rawRules[i]);
-                    RawRules = rawRules;
-                }
-            }
-
-            public int FilterListId { get; set; }
-
-            public string[] RawRules { get; private set; }
-
-            private static string LintStringForMySql(string rule)
-            {
-                rule = TrimSingleBackslashFromEnd(rule);
-                return rule;
-            }
-
-            private static string TrimSingleBackslashFromEnd(string rule)
-            {
-                return rule.EndsWith(@"\") && !rule.EndsWith(@"\\") ? rule.Remove(rule.Length - 1) : rule;
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Models/Seed/FilterListSeedDto.cs b/src/FilterLists.Services/SeedService/Models/FilterListSeedDto.cs
similarity index 93%
rename from src/FilterLists.Services/Models/Seed/FilterListSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/FilterListSeedDto.cs
index 7d2738bdd..877f64548 100644
--- a/src/FilterLists.Services/Models/Seed/FilterListSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/FilterListSeedDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FilterLists.Services.Models.Seed
+namespace FilterLists.Services.SeedService.Models
 {
     public class FilterListSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/Junctions/FilterListLanguageSeedDto.cs b/src/FilterLists.Services/SeedService/Models/Junctions/FilterListLanguageSeedDto.cs
similarity index 70%
rename from src/FilterLists.Services/Models/Seed/Junctions/FilterListLanguageSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/Junctions/FilterListLanguageSeedDto.cs
index d929ad43b..63d2d5076 100644
--- a/src/FilterLists.Services/Models/Seed/Junctions/FilterListLanguageSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/Junctions/FilterListLanguageSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed.Junctions
+namespace FilterLists.Services.SeedService.Models.Junctions
 {
     public class FilterListLanguageSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/Junctions/FilterListMaintainerSeedDto.cs b/src/FilterLists.Services/SeedService/Models/Junctions/FilterListMaintainerSeedDto.cs
similarity index 70%
rename from src/FilterLists.Services/Models/Seed/Junctions/FilterListMaintainerSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/Junctions/FilterListMaintainerSeedDto.cs
index 097e50476..0e5f2e898 100644
--- a/src/FilterLists.Services/Models/Seed/Junctions/FilterListMaintainerSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/Junctions/FilterListMaintainerSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed.Junctions
+namespace FilterLists.Services.SeedService.Models.Junctions
 {
     public class FilterListMaintainerSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/Junctions/ForkSeedDto.cs b/src/FilterLists.Services/SeedService/Models/Junctions/ForkSeedDto.cs
similarity index 70%
rename from src/FilterLists.Services/Models/Seed/Junctions/ForkSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/Junctions/ForkSeedDto.cs
index 1f1b852a9..f50a8b12a 100644
--- a/src/FilterLists.Services/Models/Seed/Junctions/ForkSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/Junctions/ForkSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed.Junctions
+namespace FilterLists.Services.SeedService.Models.Junctions
 {
     public class ForkSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/Junctions/MergeSeedDto.cs b/src/FilterLists.Services/SeedService/Models/Junctions/MergeSeedDto.cs
similarity index 70%
rename from src/FilterLists.Services/Models/Seed/Junctions/MergeSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/Junctions/MergeSeedDto.cs
index 3a7430cdc..258c7bcf3 100644
--- a/src/FilterLists.Services/Models/Seed/Junctions/MergeSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/Junctions/MergeSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed.Junctions
+namespace FilterLists.Services.SeedService.Models.Junctions
 {
     public class MergeSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/Junctions/SoftwareSyntaxSeedDto.cs b/src/FilterLists.Services/SeedService/Models/Junctions/SoftwareSyntaxSeedDto.cs
similarity index 68%
rename from src/FilterLists.Services/Models/Seed/Junctions/SoftwareSyntaxSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/Junctions/SoftwareSyntaxSeedDto.cs
index df3bb92ee..822fc4c8e 100644
--- a/src/FilterLists.Services/Models/Seed/Junctions/SoftwareSyntaxSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/Junctions/SoftwareSyntaxSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed.Junctions
+namespace FilterLists.Services.SeedService.Models.Junctions
 {
     public class SoftwareSyntaxSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/LanguageSeedDto.cs b/src/FilterLists.Services/SeedService/Models/LanguageSeedDto.cs
similarity index 88%
rename from src/FilterLists.Services/Models/Seed/LanguageSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/LanguageSeedDto.cs
index a10155acd..0cc8a7ac5 100644
--- a/src/FilterLists.Services/Models/Seed/LanguageSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/LanguageSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed
+namespace FilterLists.Services.SeedService.Models
 {
     public class LanguageSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/LicenseSeedDto.cs b/src/FilterLists.Services/SeedService/Models/LicenseSeedDto.cs
similarity index 84%
rename from src/FilterLists.Services/Models/Seed/LicenseSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/LicenseSeedDto.cs
index ec3c65991..dfcd3ef4a 100644
--- a/src/FilterLists.Services/Models/Seed/LicenseSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/LicenseSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed
+namespace FilterLists.Services.SeedService.Models
 {
     public class LicenseSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/MaintainerSeedDto.cs b/src/FilterLists.Services/SeedService/Models/MaintainerSeedDto.cs
similarity index 83%
rename from src/FilterLists.Services/Models/Seed/MaintainerSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/MaintainerSeedDto.cs
index 8912bf3b2..ad1234978 100644
--- a/src/FilterLists.Services/Models/Seed/MaintainerSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/MaintainerSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed
+namespace FilterLists.Services.SeedService.Models
 {
     public class MaintainerSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/SoftwareSeedDto.cs b/src/FilterLists.Services/SeedService/Models/SoftwareSeedDto.cs
similarity index 80%
rename from src/FilterLists.Services/Models/Seed/SoftwareSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/SoftwareSeedDto.cs
index e8c7ff235..45651b267 100644
--- a/src/FilterLists.Services/Models/Seed/SoftwareSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/SoftwareSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed
+namespace FilterLists.Services.SeedService.Models
 {
     public class SoftwareSeedDto
     {
diff --git a/src/FilterLists.Services/Models/Seed/SyntaxSeedDto.cs b/src/FilterLists.Services/SeedService/Models/SyntaxSeedDto.cs
similarity index 76%
rename from src/FilterLists.Services/Models/Seed/SyntaxSeedDto.cs
rename to src/FilterLists.Services/SeedService/Models/SyntaxSeedDto.cs
index 326011b1a..dd98a5dbd 100644
--- a/src/FilterLists.Services/Models/Seed/SyntaxSeedDto.cs
+++ b/src/FilterLists.Services/SeedService/Models/SyntaxSeedDto.cs
@@ -1,4 +1,4 @@
-namespace FilterLists.Services.Models.Seed
+namespace FilterLists.Services.SeedService.Models
 {
     public class SyntaxSeedDto
     {
diff --git a/src/FilterLists.Services/Services/SeedService.cs b/src/FilterLists.Services/SeedService/SeedService.cs
similarity index 93%
rename from src/FilterLists.Services/Services/SeedService.cs
rename to src/FilterLists.Services/SeedService/SeedService.cs
index ddecda9eb..f806a657a 100644
--- a/src/FilterLists.Services/Services/SeedService.cs
+++ b/src/FilterLists.Services/SeedService/SeedService.cs
@@ -4,7 +4,7 @@
 using FilterLists.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Services.Services
+namespace FilterLists.Services.SeedService
 {
     public class SeedService
     {