diff --git a/src/main/kotlin/app/revanced/patcher/cache/Cache.kt b/src/main/kotlin/app/revanced/patcher/cache/Cache.kt
index b660191..aec78e8 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/Cache.kt
+++ b/src/main/kotlin/app/revanced/patcher/cache/Cache.kt
@@ -1,6 +1,6 @@
 package app.revanced.patcher.cache
 
-import app.revanced.patcher.cache.proxy.ClassProxy
+import app.revanced.patcher.proxy.ClassProxy
 import app.revanced.patcher.signature.MethodSignatureScanResult
 import org.jf.dexlib2.iface.ClassDef
 
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/ClassProxy.kt b/src/main/kotlin/app/revanced/patcher/proxy/ClassProxy.kt
similarity index 79%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/ClassProxy.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/ClassProxy.kt
index 79d2ab1..8e02d46 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/ClassProxy.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/ClassProxy.kt
@@ -1,6 +1,6 @@
-package app.revanced.patcher.cache.proxy
+package app.revanced.patcher.proxy
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.proxy.mutableTypes.MutableClass
 import org.jf.dexlib2.iface.ClassDef
 
 
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableAnnotation.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableAnnotation.kt
similarity index 82%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableAnnotation.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableAnnotation.kt
index 1a73b70..09b1579 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableAnnotation.kt
@@ -1,6 +1,6 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
 import org.jf.dexlib2.base.BaseAnnotation
 import org.jf.dexlib2.iface.Annotation
 
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableAnnotationElement.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableAnnotationElement.kt
similarity index 84%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableAnnotationElement.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableAnnotationElement.kt
index d587ba2..87f3120 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableAnnotationElement.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableAnnotationElement.kt
@@ -1,6 +1,6 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableEncodedValue.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableEncodedValue.Companion.toMutable
 import org.jf.dexlib2.base.BaseAnnotationElement
 import org.jf.dexlib2.iface.AnnotationElement
 import org.jf.dexlib2.iface.value.EncodedValue
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableClass.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableClass.kt
similarity index 89%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableClass.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableClass.kt
index 7e33fad..87420e6 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableClass.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableClass.kt
@@ -1,8 +1,8 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableField.Companion.toMutable
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableField.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import org.jf.dexlib2.base.reference.BaseTypeReference
 import org.jf.dexlib2.iface.ClassDef
 
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableEncodedValue.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableEncodedValue.kt
similarity index 91%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableEncodedValue.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableEncodedValue.kt
index 52cba9c..34f5d83 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableEncodedValue.kt
@@ -1,4 +1,4 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
 import org.jf.dexlib2.iface.value.EncodedValue
 
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableField.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableField.kt
similarity index 86%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableField.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableField.kt
index 66c75e3..512b2cf 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableField.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableField.kt
@@ -1,7 +1,7 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableEncodedValue.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableEncodedValue.Companion.toMutable
 import org.jf.dexlib2.base.reference.BaseFieldReference
 import org.jf.dexlib2.iface.Field
 
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableMethod.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableMethod.kt
similarity index 87%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableMethod.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableMethod.kt
index e21ce80..a168bd1 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableMethod.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableMethod.kt
@@ -1,7 +1,7 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableMethodParameter.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableMethodParameter.Companion.toMutable
 import org.jf.dexlib2.base.reference.BaseMethodReference
 import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.iface.Method
diff --git a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableMethodParameter.kt b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableMethodParameter.kt
similarity index 86%
rename from src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableMethodParameter.kt
rename to src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableMethodParameter.kt
index 023d9f9..ddef680 100644
--- a/src/main/kotlin/app/revanced/patcher/cache/proxy/mutableTypes/MutableMethodParameter.kt
+++ b/src/main/kotlin/app/revanced/patcher/proxy/mutableTypes/MutableMethodParameter.kt
@@ -1,6 +1,6 @@
-package app.revanced.patcher.cache.proxy.mutableTypes
+package app.revanced.patcher.proxy.mutableTypes
 
-import app.revanced.patcher.cache.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
+import app.revanced.patcher.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import org.jf.dexlib2.base.BaseMethodParameter
 import org.jf.dexlib2.iface.MethodParameter