diff --git a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.java b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.java
index 2b5de72a83..2d68cb914a 100644
--- a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.java
+++ b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.java
@@ -10,7 +10,8 @@ import java.util.Map;
 import dev.openrs2.asm.Library;
 import dev.openrs2.asm.Transformer;
 import dev.openrs2.asm.classpath.ClassPath;
-import dev.openrs2.deob.classpath.TypedRemapper;
+import dev.openrs2.deob.remap.ClassNamePrefixer;
+import dev.openrs2.deob.remap.TypedRemapper;
 import dev.openrs2.deob.transform.BitShiftTransformer;
 import dev.openrs2.deob.transform.CanvasTransformer;
 import dev.openrs2.deob.transform.ClassForNameTransformer;
diff --git a/deob/src/main/java/dev/openrs2/deob/ClassNamePrefixer.java b/deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefixer.java
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/ClassNamePrefixer.java
rename to deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefixer.java
index a4d200afb4..9d56218b0c 100644
--- a/deob/src/main/java/dev/openrs2/deob/ClassNamePrefixer.java
+++ b/deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefixer.java
@@ -1,9 +1,8 @@
-package dev.openrs2.deob;
+package dev.openrs2.deob.remap;
 
 import java.util.HashMap;
 
 import dev.openrs2.asm.Library;
-import dev.openrs2.deob.classpath.TypedRemapper;
 import dev.openrs2.deob.transform.ClassForNameTransformer;
 import org.objectweb.asm.commons.ClassRemapper;
 import org.objectweb.asm.commons.SimpleRemapper;
diff --git a/deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java b/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.java
similarity index 99%
rename from deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java
rename to deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.java
index 8e891b099e..3cf19c19d0 100644
--- a/deob/src/main/java/dev/openrs2/deob/classpath/TypedRemapper.java
+++ b/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.java
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.classpath;
+package dev.openrs2.deob.remap;
 
 import java.util.HashMap;
 import java.util.List;