diff --git a/AssemblyRemapper/Models/ELogLevel.cs b/AssemblyRemapper/Enums/ELogLevel.cs
similarity index 72%
rename from AssemblyRemapper/Models/ELogLevel.cs
rename to AssemblyRemapper/Enums/ELogLevel.cs
index eb2b590..6ca234a 100644
--- a/AssemblyRemapper/Models/ELogLevel.cs
+++ b/AssemblyRemapper/Enums/ELogLevel.cs
@@ -1,4 +1,4 @@
-namespace AssemblyRemapper.Models;
+namespace AssemblyRemapper.Enums;
 
 internal enum ELogLevel
 {
diff --git a/AssemblyRemapper/Models/EMatchResult.cs b/AssemblyRemapper/Enums/EMatchResult.cs
similarity index 73%
rename from AssemblyRemapper/Models/EMatchResult.cs
rename to AssemblyRemapper/Enums/EMatchResult.cs
index 7fe4512..b1457f2 100644
--- a/AssemblyRemapper/Models/EMatchResult.cs
+++ b/AssemblyRemapper/Enums/EMatchResult.cs
@@ -1,4 +1,4 @@
-namespace AssemblyRemapper.Models;
+namespace AssemblyRemapper.Enums;
 
 internal enum EMatchResult
 {
diff --git a/AssemblyRemapper/Models/ScoringModel.cs b/AssemblyRemapper/Models/ScoringModel.cs
index 7621bfd..49be8c1 100644
--- a/AssemblyRemapper/Models/ScoringModel.cs
+++ b/AssemblyRemapper/Models/ScoringModel.cs
@@ -6,7 +6,7 @@ namespace AssemblyRemapper.Models;
 internal class ScoringModel
 {
     public string ProposedNewName { get; set; }
-    public Remap Remap { get; set; }
+    public RemapModel Remap { get; set; }
     public int Score { get; set; } = 0;
 
     public TypeDefinition Definition { get; set; }
diff --git a/AssemblyRemapper/Reflection/Remapper.cs b/AssemblyRemapper/Reflection/Remapper.cs
index b6cb230..bd7fd1b 100644
--- a/AssemblyRemapper/Reflection/Remapper.cs
+++ b/AssemblyRemapper/Reflection/Remapper.cs
@@ -1,4 +1,5 @@
-using AssemblyRemapper.Models;
+using AssemblyRemapper.Enums;
+using AssemblyRemapper.Models;
 using AssemblyRemapper.Utils;
 using Mono.Cecil;
 
diff --git a/AssemblyRemapper/Reflection/SearchProvider.cs b/AssemblyRemapper/Reflection/SearchProvider.cs
index c0d9020..b515295 100644
--- a/AssemblyRemapper/Reflection/SearchProvider.cs
+++ b/AssemblyRemapper/Reflection/SearchProvider.cs
@@ -1,4 +1,5 @@
-using AssemblyRemapper.Models;
+using AssemblyRemapper.Enums;
+using AssemblyRemapper.Models;
 using Mono.Cecil;
 using Mono.Cecil.Rocks;