diff --git a/src/main/kotlin/app/revanced/patcher/util/dex/DexFile.kt b/src/main/kotlin/app/revanced/patcher/util/dex/DexFile.kt
index f11456d..ec8ef00 100644
--- a/src/main/kotlin/app/revanced/patcher/util/dex/DexFile.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/dex/DexFile.kt
@@ -5,6 +5,6 @@ import java.io.InputStream
 /**
  * Wrapper for dex files.
  * @param name The original name of the dex file.
- * @param dexFileInputStream The dex file as [InputStream].
+ * @param stream The dex file as [InputStream].
  */
-data class DexFile(val name: String, val dexFileInputStream: InputStream)
\ No newline at end of file
+data class DexFile(val name: String, val stream: InputStream)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patcher/util/patch/base/PatchBundle.kt b/src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt
similarity index 60%
rename from src/main/kotlin/app/revanced/patcher/util/patch/base/PatchBundle.kt
rename to src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt
index b3133f8..a33b42d 100644
--- a/src/main/kotlin/app/revanced/patcher/util/patch/base/PatchBundle.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt
@@ -1,17 +1,17 @@
-package app.revanced.patcher.util.patch.base
+package app.revanced.patcher.util.patch
 
 import app.revanced.patcher.data.Data
 import app.revanced.patcher.patch.Patch
 import java.io.File
 
 /**
- * @param patchBundlePath The path to the patch bundle.
+ * @param path The path to the patch bundle.
  */
-abstract class PatchBundle(patchBundlePath: String) : File(patchBundlePath) {
+abstract class PatchBundle(path: String) : File(path) {
     internal fun loadPatches(classLoader: ClassLoader, classNames: Iterator<String>) = buildList {
-        classNames.forEach { className ->
+        for (className in classNames) {
             val clazz = classLoader.loadClass(className)
-            if (!clazz.isAnnotationPresent(app.revanced.patcher.patch.annotations.Patch::class.java)) return@forEach
+            if (!clazz.isAnnotationPresent(app.revanced.patcher.patch.annotations.Patch::class.java)) continue
             @Suppress("UNCHECKED_CAST") this.add(clazz as Class<out Patch<Data>>)
         }
     }
diff --git a/src/main/kotlin/app/revanced/patcher/util/patch/util/StringIterator.kt b/src/main/kotlin/app/revanced/patcher/util/patch/StringIterator.kt
similarity index 84%
rename from src/main/kotlin/app/revanced/patcher/util/patch/util/StringIterator.kt
rename to src/main/kotlin/app/revanced/patcher/util/patch/StringIterator.kt
index af389e1..26c55bd 100644
--- a/src/main/kotlin/app/revanced/patcher/util/patch/util/StringIterator.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/patch/StringIterator.kt
@@ -1,4 +1,4 @@
-package app.revanced.patcher.util.patch.util
+package app.revanced.patcher.util.patch
 
 internal class StringIterator<T, I : Iterator<T>>(
     private val iterator: I,
diff --git a/src/main/kotlin/app/revanced/patcher/util/patch/implementation/DexPatchBundle.kt b/src/main/kotlin/app/revanced/patcher/util/patch/impl/DexPatchBundle.kt
similarity index 77%
rename from src/main/kotlin/app/revanced/patcher/util/patch/implementation/DexPatchBundle.kt
rename to src/main/kotlin/app/revanced/patcher/util/patch/impl/DexPatchBundle.kt
index fe4848d..dce61fd 100644
--- a/src/main/kotlin/app/revanced/patcher/util/patch/implementation/DexPatchBundle.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/patch/impl/DexPatchBundle.kt
@@ -1,7 +1,7 @@
-package app.revanced.patcher.util.patch.implementation
+package app.revanced.patcher.util.patch.impl
 
-import app.revanced.patcher.util.patch.base.PatchBundle
-import app.revanced.patcher.util.patch.util.StringIterator
+import app.revanced.patcher.util.patch.PatchBundle
+import app.revanced.patcher.util.patch.StringIterator
 import org.jf.dexlib2.DexFileFactory
 
 /**
diff --git a/src/main/kotlin/app/revanced/patcher/util/patch/implementation/JarPatchBundle.kt b/src/main/kotlin/app/revanced/patcher/util/patch/impl/JarPatchBundle.kt
similarity index 83%
rename from src/main/kotlin/app/revanced/patcher/util/patch/implementation/JarPatchBundle.kt
rename to src/main/kotlin/app/revanced/patcher/util/patch/impl/JarPatchBundle.kt
index 7e18c4a..c6fb83e 100644
--- a/src/main/kotlin/app/revanced/patcher/util/patch/implementation/JarPatchBundle.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/patch/impl/JarPatchBundle.kt
@@ -1,7 +1,7 @@
-package app.revanced.patcher.util.patch.implementation
+package app.revanced.patcher.util.patch.impl
 
-import app.revanced.patcher.util.patch.base.PatchBundle
-import app.revanced.patcher.util.patch.util.StringIterator
+import app.revanced.patcher.util.patch.PatchBundle
+import app.revanced.patcher.util.patch.StringIterator
 import java.net.URLClassLoader
 import java.util.jar.JarFile