diff --git a/CHANGELIST.md b/CHANGELIST.md
index 1987943f..d1f4c996 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -156,6 +156,7 @@
 - Decouple execution contexts from Options class
 - Combine remaining Core into Frontend
 - Remove Core library, fix build
+- Create Frontend.Tools namespace
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs
index d7a50502..f79a4852 100644
--- a/MPF.Check/Program.cs
+++ b/MPF.Check/Program.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using BinaryObjectScanner;
 using MPF.Frontend;
+using MPF.Frontend.Tools;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
 
diff --git a/MPF.Frontend/DumpEnvironment.cs b/MPF.Frontend/DumpEnvironment.cs
index 113dd231..b7af8b63 100644
--- a/MPF.Frontend/DumpEnvironment.cs
+++ b/MPF.Frontend/DumpEnvironment.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using BinaryObjectScanner;
 using MPF.ExecutionContexts;
+using MPF.Frontend.Tools;
 using MPF.Processors;
 using Newtonsoft.Json;
 using SabreTools.RedumpLib;
diff --git a/MPF.Frontend/FrontendTool.cs b/MPF.Frontend/Tools/FrontendTool.cs
similarity index 99%
rename from MPF.Frontend/FrontendTool.cs
rename to MPF.Frontend/Tools/FrontendTool.cs
index d997a6a1..fa43de9e 100644
--- a/MPF.Frontend/FrontendTool.cs
+++ b/MPF.Frontend/Tools/FrontendTool.cs
@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Frontend
+namespace MPF.Frontend.Tools
 {
     public static class FrontendTool
     {
diff --git a/MPF.Frontend/OptionsLoader.cs b/MPF.Frontend/Tools/OptionsLoader.cs
similarity index 99%
rename from MPF.Frontend/OptionsLoader.cs
rename to MPF.Frontend/Tools/OptionsLoader.cs
index 33112d6f..562986e0 100644
--- a/MPF.Frontend/OptionsLoader.cs
+++ b/MPF.Frontend/Tools/OptionsLoader.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Frontend
+namespace MPF.Frontend.Tools
 {
     public static class OptionsLoader
     {
diff --git a/MPF.Frontend/ProtectionTool.cs b/MPF.Frontend/Tools/ProtectionTool.cs
similarity index 99%
rename from MPF.Frontend/ProtectionTool.cs
rename to MPF.Frontend/Tools/ProtectionTool.cs
index 330807a7..6be17dd9 100644
--- a/MPF.Frontend/ProtectionTool.cs
+++ b/MPF.Frontend/Tools/ProtectionTool.cs
@@ -8,7 +8,7 @@ using BinaryObjectScanner;
 
 #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
 
-namespace MPF.Frontend
+namespace MPF.Frontend.Tools
 {
     public static class ProtectionTool
     {
diff --git a/MPF.Frontend/SubmissionGenerator.cs b/MPF.Frontend/Tools/SubmissionGenerator.cs
similarity index 99%
rename from MPF.Frontend/SubmissionGenerator.cs
rename to MPF.Frontend/Tools/SubmissionGenerator.cs
index 6d6af3e8..2067d554 100644
--- a/MPF.Frontend/SubmissionGenerator.cs
+++ b/MPF.Frontend/Tools/SubmissionGenerator.cs
@@ -9,7 +9,7 @@ using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
 
-namespace MPF.Frontend
+namespace MPF.Frontend.Tools
 {
     /// <summary>
     /// Generator for SubmissionInfo objects
diff --git a/MPF.Frontend/ViewModels/CheckDumpViewModel.cs b/MPF.Frontend/ViewModels/CheckDumpViewModel.cs
index dbfa2a17..73e5e8ee 100644
--- a/MPF.Frontend/ViewModels/CheckDumpViewModel.cs
+++ b/MPF.Frontend/ViewModels/CheckDumpViewModel.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using BinaryObjectScanner;
 using MPF.Frontend.ComboBoxItems;
+using MPF.Frontend.Tools;
 using SabreTools.RedumpLib.Data;
 
 namespace MPF.Frontend.ViewModels
diff --git a/MPF.Frontend/ViewModels/CreateIRDViewModel.cs b/MPF.Frontend/ViewModels/CreateIRDViewModel.cs
index d55c67e3..9ac76af2 100644
--- a/MPF.Frontend/ViewModels/CreateIRDViewModel.cs
+++ b/MPF.Frontend/ViewModels/CreateIRDViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.IO;
+using MPF.Frontend.Tools;
 using MPF.Processors;
 
 namespace MPF.Frontend.ViewModels
diff --git a/MPF.Frontend/ViewModels/DiscInformationViewModel.cs b/MPF.Frontend/ViewModels/DiscInformationViewModel.cs
index bfcf86b8..1a831b18 100644
--- a/MPF.Frontend/ViewModels/DiscInformationViewModel.cs
+++ b/MPF.Frontend/ViewModels/DiscInformationViewModel.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using MPF.Frontend.ComboBoxItems;
+using MPF.Frontend.Tools;
 using SabreTools.RedumpLib.Data;
 
 namespace MPF.Frontend.ViewModels
diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs
index e4b39d1a..65b36fb4 100644
--- a/MPF.Frontend/ViewModels/MainViewModel.cs
+++ b/MPF.Frontend/ViewModels/MainViewModel.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using BinaryObjectScanner;
 using MPF.Frontend.ComboBoxItems;
+using MPF.Frontend.Tools;
 using SabreTools.IO;
 using SabreTools.RedumpLib.Data;
 
diff --git a/MPF.Test/Library/InfoToolTests.cs b/MPF.Test/Library/InfoToolTests.cs
index d03c1f60..fe56df51 100644
--- a/MPF.Test/Library/InfoToolTests.cs
+++ b/MPF.Test/Library/InfoToolTests.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
-using MPF.Frontend;
+using MPF.Frontend.Tools;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 using Xunit;
diff --git a/MPF.Test/Library/ProtectionTests.cs b/MPF.Test/Library/ProtectionTests.cs
index 830ea076..f18b1a10 100644
--- a/MPF.Test/Library/ProtectionTests.cs
+++ b/MPF.Test/Library/ProtectionTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MPF.Frontend;
+using MPF.Frontend.Tools;
 using Xunit;
 
 namespace MPF.Test.Library