diff --git a/CHANGELIST.md b/CHANGELIST.md
index d896f16a..0e020562 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -40,6 +40,7 @@
 - Remove unused byte array constant
 - Fix net20, net35, and net40
 - Reduce processing queue sleep time
+- Move EnumConverter to Core.Data
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.Core/Data/Drive.cs b/MPF.Core/Data/Drive.cs
index 473b2ebe..08877f83 100644
--- a/MPF.Core/Data/Drive.cs
+++ b/MPF.Core/Data/Drive.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using Microsoft.Management.Infrastructure;
 using Microsoft.Management.Infrastructure.Generic;
 #endif
-using MPF.Core.Converters;
 using SabreTools.IO;
 using SabreTools.RedumpLib.Data;
 
diff --git a/MPF.Core/Converters/EnumConverter.cs b/MPF.Core/Data/EnumConverter.cs
similarity index 99%
rename from MPF.Core/Converters/EnumConverter.cs
rename to MPF.Core/Data/EnumConverter.cs
index 5151a229..e3bf2482 100644
--- a/MPF.Core/Converters/EnumConverter.cs
+++ b/MPF.Core/Data/EnumConverter.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 using MPF.Core.Data;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Core.Converters
+namespace MPF.Core.Data
 {
     public static class EnumConverter
     {
diff --git a/MPF.Core/Data/Options.cs b/MPF.Core/Data/Options.cs
index cea8a852..0056e9bf 100644
--- a/MPF.Core/Data/Options.cs
+++ b/MPF.Core/Data/Options.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using MPF.Core.Converters;
 using SabreTools.RedumpLib.Data;
 
 namespace MPF.Core.Data
diff --git a/MPF.Core/Processors/Aaru.cs b/MPF.Core/Processors/Aaru.cs
index 581d2648..016f7c81 100644
--- a/MPF.Core/Processors/Aaru.cs
+++ b/MPF.Core/Processors/Aaru.cs
@@ -6,7 +6,6 @@ using System.Text;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.Models.CueSheets;
 using SabreTools.Models.Logiqx;
diff --git a/MPF.Core/Processors/CleanRip.cs b/MPF.Core/Processors/CleanRip.cs
index e69aabd8..ad9d2d0f 100644
--- a/MPF.Core/Processors/CleanRip.cs
+++ b/MPF.Core/Processors/CleanRip.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.Hashing;
 using SabreTools.Models.Logiqx;
diff --git a/MPF.Core/Processors/DiscImageCreator.cs b/MPF.Core/Processors/DiscImageCreator.cs
index 7e816d8e..059acf73 100644
--- a/MPF.Core/Processors/DiscImageCreator.cs
+++ b/MPF.Core/Processors/DiscImageCreator.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using MPF.Core.Utilities;
 using SabreTools.Models.Logiqx;
diff --git a/MPF.Core/Processors/PS3CFW.cs b/MPF.Core/Processors/PS3CFW.cs
index 3533fb95..0878846b 100644
--- a/MPF.Core/Processors/PS3CFW.cs
+++ b/MPF.Core/Processors/PS3CFW.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.Hashing;
 using SabreTools.Models.Logiqx;
diff --git a/MPF.Core/Processors/Redumper.cs b/MPF.Core/Processors/Redumper.cs
index 88a6a158..f92a2cc9 100644
--- a/MPF.Core/Processors/Redumper.cs
+++ b/MPF.Core/Processors/Redumper.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.Models.CueSheets;
 using SabreTools.RedumpLib;
diff --git a/MPF.Core/Processors/UmdImageCreator.cs b/MPF.Core/Processors/UmdImageCreator.cs
index ede97926..4e56a4c2 100644
--- a/MPF.Core/Processors/UmdImageCreator.cs
+++ b/MPF.Core/Processors/UmdImageCreator.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.Hashing;
 using SabreTools.Models.Logiqx;
diff --git a/MPF.Core/Processors/XboxBackupCreator.cs b/MPF.Core/Processors/XboxBackupCreator.cs
index aa899032..8df32f43 100644
--- a/MPF.Core/Processors/XboxBackupCreator.cs
+++ b/MPF.Core/Processors/XboxBackupCreator.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using MPF.Core.Utilities;
 using SabreTools.Hashing;
diff --git a/MPF.Core/UI/ComboBoxItems/Element.cs b/MPF.Core/UI/ComboBoxItems/Element.cs
index 181ae27f..72cd163d 100644
--- a/MPF.Core/UI/ComboBoxItems/Element.cs
+++ b/MPF.Core/UI/ComboBoxItems/Element.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MPF.Core.Converters;
 
 namespace MPF.Core.UI.ComboBoxItems
 {
diff --git a/MPF.Core/UI/ViewModels/MainViewModel.cs b/MPF.Core/UI/ViewModels/MainViewModel.cs
index 7e6dd987..82f74068 100644
--- a/MPF.Core/UI/ViewModels/MainViewModel.cs
+++ b/MPF.Core/UI/ViewModels/MainViewModel.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BinaryObjectScanner;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using MPF.Core.UI.ComboBoxItems;
 using MPF.Core.Utilities;
diff --git a/MPF.Core/Utilities/EnumExtensions.cs b/MPF.Core/Utilities/EnumExtensions.cs
index d44acfb2..68d24b03 100644
--- a/MPF.Core/Utilities/EnumExtensions.cs
+++ b/MPF.Core/Utilities/EnumExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.RedumpLib.Data;
 
diff --git a/MPF.Core/Utilities/OptionsLoader.cs b/MPF.Core/Utilities/OptionsLoader.cs
index 48ebd20c..5c60a41b 100644
--- a/MPF.Core/Utilities/OptionsLoader.cs
+++ b/MPF.Core/Utilities/OptionsLoader.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using Newtonsoft.Json;
 using SabreTools.RedumpLib;
diff --git a/MPF.Test/Core/Converters/EnumConverterTests.cs b/MPF.Test/Core/Converters/EnumConverterTests.cs
index 8db25ca5..e40d08a8 100644
--- a/MPF.Test/Core/Converters/EnumConverterTests.cs
+++ b/MPF.Test/Core/Converters/EnumConverterTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MPF.Core.Converters;
 using MPF.Core.Data;
 using Xunit;