From 3cb7ee13f932cb30ca550ae691c96f6a476d2685 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Fri, 25 Dec 2020 12:29:04 +0000
Subject: [PATCH] Rename deob to deob-bytecode

This is in preparation for adding a new deob module which invokes the
bytecode deobfuscator, decompiler and AST deobfuscator in turn.

Signed-off-by: Graham <gpe@openrs2.org>
---
 ...bfuscator.xml => BytecodeDeobfuscator.xml} |  6 +-
 all/build.gradle.kts                          |  2 +-
 all/src/main/kotlin/org/openrs2/Command.kt    |  4 +-
 {deob => deob-bytecode}/build.gradle.kts      |  2 +-
 .../openrs2/deob/bytecode}/ArgPartition.kt    |  2 +-
 .../org/openrs2/deob/bytecode}/ArgRef.kt      |  2 +-
 .../deob/bytecode/BytecodeDeobfuscator.kt     |  8 +--
 .../bytecode/BytecodeDeobfuscatorModule.kt    | 62 +++++++++----------
 .../bytecode/DeobfuscateBytecodeCommand.kt    | 18 ++++++
 .../deob/bytecode}/DeobfuscatorQualifier.kt   |  2 +-
 .../openrs2/deob/bytecode}/OriginalPcTable.kt |  2 +-
 .../org/openrs2/deob/bytecode}/Profile.kt     |  2 +-
 .../openrs2/deob/bytecode}/ProfileProvider.kt |  2 +-
 .../deob/bytecode}/SignedClassUtils.kt        |  2 +-
 .../analysis/ConstSourceInterpreter.kt        |  2 +-
 .../bytecode}/analysis/ConstSourceValue.kt    |  2 +-
 .../bytecode}/analysis/ControlFlowAnalyzer.kt |  2 +-
 .../deob/bytecode}/analysis/CopyAssignment.kt |  2 +-
 .../analysis/CopyPropagationAnalyzer.kt       |  2 +-
 .../bytecode}/analysis/DataFlowAnalyzer.kt    |  2 +-
 .../bytecode}/analysis/FieldWriteAnalyzer.kt  |  2 +-
 .../bytecode}/analysis/FieldWriteCount.kt     |  2 +-
 .../deob/bytecode}/analysis/IntBranch.kt      |  2 +-
 .../bytecode}/analysis/IntBranchResult.kt     |  2 +-
 .../deob/bytecode}/analysis/IntInterpreter.kt |  2 +-
 .../deob/bytecode}/analysis/IntValue.kt       |  2 +-
 .../deob/bytecode}/analysis/IntValueSet.kt    |  2 +-
 .../analysis/LiveVariableAnalyzer.kt          |  2 +-
 .../bytecode}/analysis/ThisInterpreter.kt     |  2 +-
 .../deob/bytecode}/analysis/ThisValue.kt      |  2 +-
 .../filter/ReflectedConstructorFilter.kt      |  2 +-
 .../remap/ArgumentMappingGenerator.kt         |  4 +-
 .../bytecode}/remap/ClassMappingGenerator.kt  |  2 +-
 .../deob/bytecode}/remap/ClassNamePrefix.kt   |  2 +-
 .../bytecode}/remap/FieldMappingGenerator.kt  |  2 +-
 .../bytecode}/remap/MethodMappingGenerator.kt |  2 +-
 .../deob/bytecode}/remap/NameGenerator.kt     |  2 +-
 .../bytecode}/remap/StaticClassMapping.kt     |  2 +-
 .../deob/bytecode}/remap/StaticField.kt       |  2 +-
 .../bytecode}/remap/StaticFieldUnscrambler.kt |  2 +-
 .../remap/StaticMethodUnscrambler.kt          |  2 +-
 .../deob/bytecode}/remap/TypedRemapper.kt     |  6 +-
 .../transform/BitShiftTransformer.kt          |  2 +-
 .../transform/BitwiseOpTransformer.kt         |  2 +-
 .../bytecode}/transform/CanvasTransformer.kt  |  2 +-
 .../transform/ClassLiteralTransformer.kt      |  2 +-
 .../transform/ConstantArgTransformer.kt       | 20 +++---
 .../transform/CopyPropagationTransformer.kt   |  4 +-
 .../bytecode}/transform/CounterTransformer.kt |  2 +-
 .../transform/EmptyClassTransformer.kt        |  2 +-
 .../transform/ExceptionTracingTransformer.kt  |  2 +-
 .../FernflowerExceptionTransformer.kt         |  2 +-
 .../transform/FieldOrderTransformer.kt        |  2 +-
 .../transform/FinalFieldTransformer.kt        |  8 +--
 .../bytecode}/transform/FinalTransformer.kt   |  2 +-
 .../transform/InvokeSpecialTransformer.kt     |  2 +-
 .../transform/MethodOrderTransformer.kt       |  2 +-
 .../bytecode}/transform/MonitorTransformer.kt |  2 +-
 .../transform/OpaquePredicateTransformer.kt   |  2 +-
 .../transform/OriginalNameTransformer.kt      |  2 +-
 .../transform/OriginalPcRestoreTransformer.kt |  4 +-
 .../transform/OriginalPcSaveTransformer.kt    |  2 +-
 .../transform/OverrideTransformer.kt          |  2 +-
 .../bytecode}/transform/PatcherTransformer.kt |  2 +-
 .../transform/RedundantGotoTransformer.kt     |  2 +-
 .../bytecode}/transform/RemapTransformer.kt   |  6 +-
 .../bytecode}/transform/ResetTransformer.kt   |  2 +-
 .../transform/UnusedArgTransformer.kt         | 12 ++--
 .../transform/UnusedLocalTransformer.kt       |  4 +-
 .../transform/UnusedMethodTransformer.kt      |  6 +-
 .../transform/VisibilityTransformer.kt        |  8 +--
 .../org/openrs2/deob/DeobfuscateCommand.kt    | 18 ------
 settings.gradle.kts                           |  2 +-
 73 files changed, 155 insertions(+), 155 deletions(-)
 rename .idea/runConfigurations/{Deobfuscator.xml => BytecodeDeobfuscator.xml} (63%)
 rename {deob => deob-bytecode}/build.gradle.kts (93%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/ArgPartition.kt (83%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/ArgRef.kt (74%)
 rename deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt (95%)
 rename deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscatorModule.kt (57%)
 create mode 100644 deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/DeobfuscatorQualifier.kt (86%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/OriginalPcTable.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/Profile.kt (92%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/ProfileProvider.kt (94%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/SignedClassUtils.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/ConstSourceInterpreter.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/ConstSourceValue.kt (93%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/ControlFlowAnalyzer.kt (96%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/CopyAssignment.kt (62%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/CopyPropagationAnalyzer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/DataFlowAnalyzer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/FieldWriteAnalyzer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/FieldWriteCount.kt (66%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/IntBranch.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/IntBranchResult.kt (90%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/IntInterpreter.kt (99%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/IntValue.kt (86%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/IntValueSet.kt (96%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/LiveVariableAnalyzer.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/ThisInterpreter.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/analysis/ThisValue.kt (85%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/filter/ReflectedConstructorFilter.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/ArgumentMappingGenerator.kt (86%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/ClassMappingGenerator.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/ClassNamePrefix.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/FieldMappingGenerator.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/MethodMappingGenerator.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/NameGenerator.kt (90%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/StaticClassMapping.kt (87%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/StaticField.kt (78%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/StaticFieldUnscrambler.kt (99%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/StaticMethodUnscrambler.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/remap/TypedRemapper.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/BitShiftTransformer.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/BitwiseOpTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/CanvasTransformer.kt (94%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/ClassLiteralTransformer.kt (99%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/ConstantArgTransformer.kt (95%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/CopyPropagationTransformer.kt (95%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/CounterTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/EmptyClassTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/ExceptionTracingTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/FernflowerExceptionTransformer.kt (96%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/FieldOrderTransformer.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/FinalFieldTransformer.kt (96%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/FinalTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/InvokeSpecialTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/MethodOrderTransformer.kt (96%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/MonitorTransformer.kt (99%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/OpaquePredicateTransformer.kt (99%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/OriginalNameTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/OriginalPcRestoreTransformer.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/OriginalPcSaveTransformer.kt (95%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/OverrideTransformer.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/PatcherTransformer.kt (94%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/RedundantGotoTransformer.kt (97%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/RemapTransformer.kt (77%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/ResetTransformer.kt (98%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/UnusedArgTransformer.kt (95%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/UnusedLocalTransformer.kt (94%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/UnusedMethodTransformer.kt (95%)
 rename {deob/src/main/kotlin/org/openrs2/deob => deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode}/transform/VisibilityTransformer.kt (96%)
 delete mode 100644 deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt

diff --git a/.idea/runConfigurations/Deobfuscator.xml b/.idea/runConfigurations/BytecodeDeobfuscator.xml
similarity index 63%
rename from .idea/runConfigurations/Deobfuscator.xml
rename to .idea/runConfigurations/BytecodeDeobfuscator.xml
index f466df5d..374eeee9 100644
--- a/.idea/runConfigurations/Deobfuscator.xml
+++ b/.idea/runConfigurations/BytecodeDeobfuscator.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Deobfuscator" type="JetRunConfigurationType">
-    <module name="openrs2.deob.main" />
+  <configuration default="false" name="BytecodeDeobfuscator" type="JetRunConfigurationType">
+    <module name="openrs2.deob-bytecode.main" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.DeobfuscateCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.bytecode.DeobfuscateBytecodeCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/all/build.gradle.kts b/all/build.gradle.kts
index 65a8d691..b5969bf1 100644
--- a/all/build.gradle.kts
+++ b/all/build.gradle.kts
@@ -19,8 +19,8 @@ dependencies {
     implementation(project(":compress-cli"))
     implementation(project(":crc32"))
     implementation(project(":decompiler"))
-    implementation(project(":deob"))
     implementation(project(":deob-ast"))
+    implementation(project(":deob-bytecode"))
     implementation(project(":game"))
     implementation(project(":patcher"))
 }
diff --git a/all/src/main/kotlin/org/openrs2/Command.kt b/all/src/main/kotlin/org/openrs2/Command.kt
index 79c8b2af..faa90fd5 100644
--- a/all/src/main/kotlin/org/openrs2/Command.kt
+++ b/all/src/main/kotlin/org/openrs2/Command.kt
@@ -6,8 +6,8 @@ import org.openrs2.archive.ArchiveCommand
 import org.openrs2.compress.cli.CompressCommand
 import org.openrs2.crc32.Crc32Command
 import org.openrs2.decompiler.DecompileCommand
-import org.openrs2.deob.DeobfuscateCommand
 import org.openrs2.deob.ast.DeobfuscateAstCommand
+import org.openrs2.deob.bytecode.DeobfuscateBytecodeCommand
 import org.openrs2.game.GameCommand
 import org.openrs2.patcher.PatchCommand
 
@@ -20,8 +20,8 @@ public class Command : NoOpCliktCommand(name = "openrs2") {
             CompressCommand(),
             Crc32Command(),
             DecompileCommand(),
-            DeobfuscateCommand(),
             DeobfuscateAstCommand(),
+            DeobfuscateBytecodeCommand(),
             GameCommand(),
             PatchCommand()
         )
diff --git a/deob/build.gradle.kts b/deob-bytecode/build.gradle.kts
similarity index 93%
rename from deob/build.gradle.kts
rename to deob-bytecode/build.gradle.kts
index cb47c45d..a5de3ad2 100644
--- a/deob/build.gradle.kts
+++ b/deob-bytecode/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClass.set("org.openrs2.deob.DeobfuscateCommandKt")
+    mainClass.set("org.openrs2.deob.bytecode.DeobfuscateBytecodeCommandKt")
 }
 
 dependencies {
diff --git a/deob/src/main/kotlin/org/openrs2/deob/ArgPartition.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgPartition.kt
similarity index 83%
rename from deob/src/main/kotlin/org/openrs2/deob/ArgPartition.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgPartition.kt
index 882ad3e8..299cd18c 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/ArgPartition.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgPartition.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import org.openrs2.asm.MemberRef
 import org.openrs2.util.collect.DisjointSet
diff --git a/deob/src/main/kotlin/org/openrs2/deob/ArgRef.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgRef.kt
similarity index 74%
rename from deob/src/main/kotlin/org/openrs2/deob/ArgRef.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgRef.kt
index 90687889..d5f35b2e 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/ArgRef.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgRef.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import org.openrs2.asm.MemberRef
 
diff --git a/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt
similarity index 95%
rename from deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt
index fd9fcd50..5d952e4a 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
@@ -7,15 +7,15 @@ import org.openrs2.asm.io.JarLibraryReader
 import org.openrs2.asm.io.JarLibraryWriter
 import org.openrs2.asm.io.Pack200LibraryReader
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.remap.ClassNamePrefixRemapper
-import org.openrs2.deob.remap.StripClassNamePrefixRemapper
+import org.openrs2.deob.bytecode.remap.ClassNamePrefixRemapper
+import org.openrs2.deob.bytecode.remap.StripClassNamePrefixRemapper
 import java.nio.file.Files
 import java.nio.file.Path
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-public class Deobfuscator @Inject constructor(
+public class BytecodeDeobfuscator @Inject constructor(
     @DeobfuscatorQualifier private val transformers: Set<Transformer>
 ) {
     public fun run(input: Path, output: Path) {
diff --git a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscatorModule.kt
similarity index 57%
rename from deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscatorModule.kt
index 8a128c30..701a8d64 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscatorModule.kt
@@ -1,43 +1,43 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
 import com.google.inject.multibindings.Multibinder
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.transform.BitShiftTransformer
-import org.openrs2.deob.transform.BitwiseOpTransformer
-import org.openrs2.deob.transform.CanvasTransformer
-import org.openrs2.deob.transform.ClassLiteralTransformer
-import org.openrs2.deob.transform.ConstantArgTransformer
-import org.openrs2.deob.transform.CopyPropagationTransformer
-import org.openrs2.deob.transform.CounterTransformer
-import org.openrs2.deob.transform.EmptyClassTransformer
-import org.openrs2.deob.transform.ExceptionTracingTransformer
-import org.openrs2.deob.transform.FernflowerExceptionTransformer
-import org.openrs2.deob.transform.FieldOrderTransformer
-import org.openrs2.deob.transform.FinalFieldTransformer
-import org.openrs2.deob.transform.FinalTransformer
-import org.openrs2.deob.transform.InvokeSpecialTransformer
-import org.openrs2.deob.transform.MethodOrderTransformer
-import org.openrs2.deob.transform.MonitorTransformer
-import org.openrs2.deob.transform.OpaquePredicateTransformer
-import org.openrs2.deob.transform.OriginalNameTransformer
-import org.openrs2.deob.transform.OriginalPcRestoreTransformer
-import org.openrs2.deob.transform.OriginalPcSaveTransformer
-import org.openrs2.deob.transform.OverrideTransformer
-import org.openrs2.deob.transform.PatcherTransformer
-import org.openrs2.deob.transform.RedundantGotoTransformer
-import org.openrs2.deob.transform.RemapTransformer
-import org.openrs2.deob.transform.ResetTransformer
-import org.openrs2.deob.transform.UnusedArgTransformer
-import org.openrs2.deob.transform.UnusedLocalTransformer
-import org.openrs2.deob.transform.UnusedMethodTransformer
-import org.openrs2.deob.transform.VisibilityTransformer
+import org.openrs2.deob.bytecode.transform.BitShiftTransformer
+import org.openrs2.deob.bytecode.transform.BitwiseOpTransformer
+import org.openrs2.deob.bytecode.transform.CanvasTransformer
+import org.openrs2.deob.bytecode.transform.ClassLiteralTransformer
+import org.openrs2.deob.bytecode.transform.ConstantArgTransformer
+import org.openrs2.deob.bytecode.transform.CopyPropagationTransformer
+import org.openrs2.deob.bytecode.transform.CounterTransformer
+import org.openrs2.deob.bytecode.transform.EmptyClassTransformer
+import org.openrs2.deob.bytecode.transform.ExceptionTracingTransformer
+import org.openrs2.deob.bytecode.transform.FernflowerExceptionTransformer
+import org.openrs2.deob.bytecode.transform.FieldOrderTransformer
+import org.openrs2.deob.bytecode.transform.FinalFieldTransformer
+import org.openrs2.deob.bytecode.transform.FinalTransformer
+import org.openrs2.deob.bytecode.transform.InvokeSpecialTransformer
+import org.openrs2.deob.bytecode.transform.MethodOrderTransformer
+import org.openrs2.deob.bytecode.transform.MonitorTransformer
+import org.openrs2.deob.bytecode.transform.OpaquePredicateTransformer
+import org.openrs2.deob.bytecode.transform.OriginalNameTransformer
+import org.openrs2.deob.bytecode.transform.OriginalPcRestoreTransformer
+import org.openrs2.deob.bytecode.transform.OriginalPcSaveTransformer
+import org.openrs2.deob.bytecode.transform.OverrideTransformer
+import org.openrs2.deob.bytecode.transform.PatcherTransformer
+import org.openrs2.deob.bytecode.transform.RedundantGotoTransformer
+import org.openrs2.deob.bytecode.transform.RemapTransformer
+import org.openrs2.deob.bytecode.transform.ResetTransformer
+import org.openrs2.deob.bytecode.transform.UnusedArgTransformer
+import org.openrs2.deob.bytecode.transform.UnusedLocalTransformer
+import org.openrs2.deob.bytecode.transform.UnusedMethodTransformer
+import org.openrs2.deob.bytecode.transform.VisibilityTransformer
 import org.openrs2.deob.util.DeobfuscatorUtilModule
 import org.openrs2.patcher.PatcherModule
 import org.openrs2.patcher.transform.ResourceTransformer
 
-public object DeobfuscatorModule : AbstractModule() {
+public object BytecodeDeobfuscatorModule : AbstractModule() {
     override fun configure() {
         install(PatcherModule)
         install(DeobfuscatorUtilModule)
diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
new file mode 100644
index 00000000..5b8adb17
--- /dev/null
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
@@ -0,0 +1,18 @@
+package org.openrs2.deob.bytecode
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.google.inject.Guice
+import java.nio.file.Paths
+
+public fun main(args: Array<String>): Unit = DeobfuscateBytecodeCommand().main(args)
+
+public class DeobfuscateBytecodeCommand : CliktCommand(name = "deob-bytecode") {
+    override fun run() {
+        val injector = Guice.createInjector(BytecodeDeobfuscatorModule)
+        val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java)
+        deobfuscator.run(
+            input = Paths.get("nonfree/share/client"),
+            output = Paths.get("nonfree/var/cache/deob")
+        )
+    }
+}
diff --git a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorQualifier.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt
similarity index 86%
rename from deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorQualifier.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt
index 69297874..5575a7c9 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorQualifier.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import javax.inject.Qualifier
 
diff --git a/deob/src/main/kotlin/org/openrs2/deob/OriginalPcTable.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/OriginalPcTable.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/OriginalPcTable.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/OriginalPcTable.kt
index 07c8b241..8626a7f2 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/OriginalPcTable.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/OriginalPcTable.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import org.objectweb.asm.Attribute
 import org.objectweb.asm.ByteVector
diff --git a/deob/src/main/kotlin/org/openrs2/deob/Profile.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/Profile.kt
similarity index 92%
rename from deob/src/main/kotlin/org/openrs2/deob/Profile.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/Profile.kt
index b7ac50fe..7097f06c 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/Profile.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/Profile.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import org.openrs2.asm.filter.GlobClassFilter
 import org.openrs2.asm.filter.GlobMemberFilter
diff --git a/deob/src/main/kotlin/org/openrs2/deob/ProfileProvider.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt
similarity index 94%
rename from deob/src/main/kotlin/org/openrs2/deob/ProfileProvider.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt
index fff53555..a3be4bf0 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/ProfileProvider.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.openrs2.yaml.Yaml
diff --git a/deob/src/main/kotlin/org/openrs2/deob/SignedClassUtils.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/SignedClassUtils.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/SignedClassUtils.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/SignedClassUtils.kt
index 523faf2e..5fbe7037 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/SignedClassUtils.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/SignedClassUtils.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Type
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/ConstSourceInterpreter.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceInterpreter.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/ConstSourceInterpreter.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceInterpreter.kt
index fc9905f4..efbe11de 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/ConstSourceInterpreter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceInterpreter.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/ConstSourceValue.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceValue.kt
similarity index 93%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/ConstSourceValue.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceValue.kt
index a6297bc3..6f03c30b 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/ConstSourceValue.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceValue.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.analysis.BasicValue
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/ControlFlowAnalyzer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ControlFlowAnalyzer.kt
similarity index 96%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/ControlFlowAnalyzer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ControlFlowAnalyzer.kt
index fd0d1842..adbcbb63 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/ControlFlowAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ControlFlowAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.jgrapht.Graph
 import org.jgrapht.graph.AsUnmodifiableGraph
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/CopyAssignment.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyAssignment.kt
similarity index 62%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/CopyAssignment.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyAssignment.kt
index 2f338a65..d13c78de 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/CopyAssignment.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyAssignment.kt
@@ -1,3 +1,3 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 public data class CopyAssignment(val destination: Int, val source: Int)
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/CopyPropagationAnalyzer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyPropagationAnalyzer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyPropagationAnalyzer.kt
index 44c75538..63df506c 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyPropagationAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/DataFlowAnalyzer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/DataFlowAnalyzer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/DataFlowAnalyzer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/DataFlowAnalyzer.kt
index 97a85e11..48b81dbe 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/DataFlowAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/DataFlowAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.jgrapht.Graph
 import org.jgrapht.graph.DefaultEdge
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/FieldWriteAnalyzer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteAnalyzer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/FieldWriteAnalyzer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteAnalyzer.kt
index f4aec7f7..c42a6e5a 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/FieldWriteAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/FieldWriteCount.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteCount.kt
similarity index 66%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/FieldWriteCount.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteCount.kt
index 73551912..ecad5be9 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/FieldWriteCount.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteCount.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 public enum class FieldWriteCount {
     NEVER,
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntBranch.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranch.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/IntBranch.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranch.kt
index 9425eb6f..1cd6c379 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntBranch.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranch.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.Opcodes.IFEQ
 import org.objectweb.asm.Opcodes.IFGE
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntBranchResult.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranchResult.kt
similarity index 90%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/IntBranchResult.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranchResult.kt
index 301d2a3e..c91e1360 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntBranchResult.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranchResult.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 public enum class IntBranchResult {
     ALWAYS_TAKEN, NEVER_TAKEN, UNKNOWN;
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntInterpreter.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntInterpreter.kt
similarity index 99%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/IntInterpreter.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntInterpreter.kt
index 5c7b0863..49b0dd4e 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntInterpreter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntInterpreter.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntValue.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValue.kt
similarity index 86%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/IntValue.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValue.kt
index b6cea15e..433a466a 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntValue.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValue.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.tree.analysis.BasicValue
 import org.objectweb.asm.tree.analysis.Value
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntValueSet.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValueSet.kt
similarity index 96%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/IntValueSet.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValueSet.kt
index 31c20ef0..a72d802d 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/IntValueSet.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValueSet.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 public sealed class IntValueSet {
     public data class Constant(val values: Set<Int>) : IntValueSet() {
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/LiveVariableAnalyzer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/LiveVariableAnalyzer.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/LiveVariableAnalyzer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/LiveVariableAnalyzer.kt
index ecfeb917..31a5cc95 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/LiveVariableAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/LiveVariableAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet
 import it.unimi.dsi.fastutil.ints.IntSet
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/ThisInterpreter.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisInterpreter.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/ThisInterpreter.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisInterpreter.kt
index 128bd331..bf67414b 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/ThisInterpreter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisInterpreter.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
diff --git a/deob/src/main/kotlin/org/openrs2/deob/analysis/ThisValue.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisValue.kt
similarity index 85%
rename from deob/src/main/kotlin/org/openrs2/deob/analysis/ThisValue.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisValue.kt
index c332e16c..3c857430 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/analysis/ThisValue.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisValue.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis
 
 import org.objectweb.asm.tree.analysis.BasicValue
 import org.objectweb.asm.tree.analysis.Value
diff --git a/deob/src/main/kotlin/org/openrs2/deob/filter/ReflectedConstructorFilter.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/filter/ReflectedConstructorFilter.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/filter/ReflectedConstructorFilter.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/filter/ReflectedConstructorFilter.kt
index 901f4335..67a77c88 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/filter/ReflectedConstructorFilter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/filter/ReflectedConstructorFilter.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.filter
+package org.openrs2.deob.bytecode.filter
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.MethodNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/ArgumentMappingGenerator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ArgumentMappingGenerator.kt
similarity index 86%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/ArgumentMappingGenerator.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ArgumentMappingGenerator.kt
index 04baa3f7..5bc74d67 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/ArgumentMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ArgumentMappingGenerator.kt
@@ -1,6 +1,6 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
-import org.openrs2.deob.ArgRef
+import org.openrs2.deob.bytecode.ArgRef
 import org.openrs2.deob.util.map.NameMap
 
 public class ArgumentMappingGenerator(
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/ClassMappingGenerator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassMappingGenerator.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/ClassMappingGenerator.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassMappingGenerator.kt
index a6bb7006..a039d79b 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/ClassMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassMappingGenerator.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.objectweb.asm.Opcodes
 import org.openrs2.asm.classpath.ClassMetadata
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/ClassNamePrefix.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassNamePrefix.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/ClassNamePrefix.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassNamePrefix.kt
index 1f2a434f..b23a7d52 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/ClassNamePrefix.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassNamePrefix.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.openrs2.asm.classpath.ExtendedRemapper
 import org.openrs2.asm.classpath.Library
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/FieldMappingGenerator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/FieldMappingGenerator.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/FieldMappingGenerator.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/FieldMappingGenerator.kt
index 49657cf9..a33fa955 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/FieldMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/FieldMappingGenerator.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.objectweb.asm.Type
 import org.openrs2.asm.MemberRef
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/MethodMappingGenerator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/MethodMappingGenerator.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/MethodMappingGenerator.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/MethodMappingGenerator.kt
index 6a2d6a11..a0a4724c 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/MethodMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/MethodMappingGenerator.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.objectweb.asm.Opcodes
 import org.openrs2.asm.MemberDesc
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/NameGenerator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/NameGenerator.kt
similarity index 90%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/NameGenerator.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/NameGenerator.kt
index 9e7f4f02..4aaabbd0 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/NameGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/NameGenerator.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 public class NameGenerator {
     private val prefixes = mutableMapOf<String, Int>()
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticClassMapping.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticClassMapping.kt
similarity index 87%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/StaticClassMapping.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticClassMapping.kt
index d5648395..cf0d614e 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticClassMapping.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticClassMapping.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 public class StaticClassMapping {
     private val nameGenerator = NameGenerator()
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticField.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticField.kt
similarity index 78%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/StaticField.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticField.kt
index f85b3568..fa4f8803 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticField.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticField.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.objectweb.asm.tree.AbstractInsnNode
 
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticFieldUnscrambler.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticFieldUnscrambler.kt
similarity index 99%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/StaticFieldUnscrambler.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticFieldUnscrambler.kt
index 4212171f..15cbd743 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticFieldUnscrambler.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticFieldUnscrambler.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticMethodUnscrambler.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticMethodUnscrambler.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/StaticMethodUnscrambler.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticMethodUnscrambler.kt
index 5b9ffd19..2bc02a9f 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/StaticMethodUnscrambler.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticMethodUnscrambler.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import org.objectweb.asm.Opcodes
 import org.openrs2.asm.MemberRef
diff --git a/deob/src/main/kotlin/org/openrs2/deob/remap/TypedRemapper.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/TypedRemapper.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/remap/TypedRemapper.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/TypedRemapper.kt
index 724e797f..925b00a1 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/remap/TypedRemapper.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/TypedRemapper.kt
@@ -1,12 +1,12 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.openrs2.asm.MemberRef
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.ExtendedRemapper
-import org.openrs2.deob.ArgRef
-import org.openrs2.deob.Profile
+import org.openrs2.deob.bytecode.ArgRef
+import org.openrs2.deob.bytecode.Profile
 import org.openrs2.deob.util.map.NameMap
 import org.openrs2.util.collect.DisjointSet
 
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/BitShiftTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitShiftTransformer.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/BitShiftTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitShiftTransformer.kt
index 646590b9..3ffb6dd2 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/BitShiftTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitShiftTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/BitwiseOpTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitwiseOpTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/BitwiseOpTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitwiseOpTransformer.kt
index be5a592f..8aedb6aa 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/BitwiseOpTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitwiseOpTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/CanvasTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CanvasTransformer.kt
similarity index 94%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/CanvasTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CanvasTransformer.kt
index 7e9881ea..97d405db 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/CanvasTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CanvasTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/ClassLiteralTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ClassLiteralTransformer.kt
similarity index 99%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/ClassLiteralTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ClassLiteralTransformer.kt
index 1910ba2d..450d8974 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/ClassLiteralTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ClassLiteralTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/ConstantArgTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt
similarity index 95%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/ConstantArgTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt
index 6aa29ce0..c8e7eca7 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/ConstantArgTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes.GOTO
@@ -36,15 +36,15 @@ import org.openrs2.asm.replaceExpression
 import org.openrs2.asm.stackMetadata
 import org.openrs2.asm.toAbstractInsnNode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.ArgPartition
-import org.openrs2.deob.Profile
-import org.openrs2.deob.analysis.IntBranch
-import org.openrs2.deob.analysis.IntBranchResult.ALWAYS_TAKEN
-import org.openrs2.deob.analysis.IntBranchResult.NEVER_TAKEN
-import org.openrs2.deob.analysis.IntInterpreter
-import org.openrs2.deob.analysis.IntValueSet
-import org.openrs2.deob.filter.ReflectedConstructorFilter
-import org.openrs2.deob.remap.MethodMappingGenerator
+import org.openrs2.deob.bytecode.ArgPartition
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.analysis.IntBranch
+import org.openrs2.deob.bytecode.analysis.IntBranchResult.ALWAYS_TAKEN
+import org.openrs2.deob.bytecode.analysis.IntBranchResult.NEVER_TAKEN
+import org.openrs2.deob.bytecode.analysis.IntInterpreter
+import org.openrs2.deob.bytecode.analysis.IntValueSet
+import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
+import org.openrs2.deob.bytecode.remap.MethodMappingGenerator
 import org.openrs2.util.collect.DisjointSet
 import org.openrs2.util.collect.removeFirstOrNull
 import javax.inject.Inject
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/CopyPropagationTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CopyPropagationTransformer.kt
similarity index 95%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/CopyPropagationTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CopyPropagationTransformer.kt
index 1b22dbf0..094e373f 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/CopyPropagationTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CopyPropagationTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@@ -8,7 +8,7 @@ import org.objectweb.asm.tree.VarInsnNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.analysis.CopyPropagationAnalyzer
+import org.openrs2.deob.bytecode.analysis.CopyPropagationAnalyzer
 import javax.inject.Singleton
 
 /**
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/CounterTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CounterTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/CounterTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CounterTransformer.kt
index c59fe80d..16c7b40e 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/CounterTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CounterTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/EmptyClassTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/EmptyClassTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/EmptyClassTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/EmptyClassTransformer.kt
index 3c85494b..06832365 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/EmptyClassTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/EmptyClassTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Type
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/ExceptionTracingTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ExceptionTracingTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/ExceptionTracingTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ExceptionTracingTransformer.kt
index a82fdcdc..5835f6c1 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/ExceptionTracingTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ExceptionTracingTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/FernflowerExceptionTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FernflowerExceptionTransformer.kt
similarity index 96%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/FernflowerExceptionTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FernflowerExceptionTransformer.kt
index 1ef25f78..25ce4a3c 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/FernflowerExceptionTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FernflowerExceptionTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/FieldOrderTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FieldOrderTransformer.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/FieldOrderTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FieldOrderTransformer.kt
index e0e07881..b19a3f0a 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/FieldOrderTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FieldOrderTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/FinalFieldTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalFieldTransformer.kt
similarity index 96%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/FinalFieldTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalFieldTransformer.kt
index 6bdb92fc..0957a54d 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/FinalFieldTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalFieldTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@@ -13,9 +13,9 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.removeDeadCode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.analysis.FieldWriteAnalyzer
-import org.openrs2.deob.analysis.FieldWriteCount
-import org.openrs2.deob.analysis.ThisInterpreter
+import org.openrs2.deob.bytecode.analysis.FieldWriteAnalyzer
+import org.openrs2.deob.bytecode.analysis.FieldWriteCount
+import org.openrs2.deob.bytecode.analysis.ThisInterpreter
 import org.openrs2.util.collect.DisjointSet
 import javax.inject.Singleton
 
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/FinalTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/FinalTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalTransformer.kt
index 734e6589..321f0c8b 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/FinalTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/InvokeSpecialTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/InvokeSpecialTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/InvokeSpecialTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/InvokeSpecialTransformer.kt
index ca801487..c1e4ea87 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/InvokeSpecialTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/InvokeSpecialTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/MethodOrderTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MethodOrderTransformer.kt
similarity index 96%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/MethodOrderTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MethodOrderTransformer.kt
index b7582550..750d3bdd 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/MethodOrderTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MethodOrderTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/MonitorTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MonitorTransformer.kt
similarity index 99%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/MonitorTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MonitorTransformer.kt
index 6312742f..4d525aaf 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/MonitorTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MonitorTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/OpaquePredicateTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt
similarity index 99%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/OpaquePredicateTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt
index 5caad3f6..db7a02f8 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/OpaquePredicateTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/OriginalNameTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalNameTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/OriginalNameTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalNameTransformer.kt
index 06e6cc39..e8a38acc 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/OriginalNameTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalNameTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AnnotationNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/OriginalPcRestoreTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcRestoreTransformer.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcRestoreTransformer.kt
index 635fa163..dcee18a0 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcRestoreTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Type
@@ -10,8 +10,8 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.removeDeadCode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.OriginalPcTable
 import org.openrs2.deob.annotation.OriginalMember
+import org.openrs2.deob.bytecode.OriginalPcTable
 import org.openrs2.deob.util.map.NameMap
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/OriginalPcSaveTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcSaveTransformer.kt
similarity index 95%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/OriginalPcSaveTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcSaveTransformer.kt
index 760558a5..28df5cd0 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/OriginalPcSaveTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcSaveTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/OverrideTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OverrideTransformer.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/OverrideTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OverrideTransformer.kt
index 7179cb14..4cdc9a95 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/OverrideTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OverrideTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/PatcherTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/PatcherTransformer.kt
similarity index 94%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/PatcherTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/PatcherTransformer.kt
index 7338e068..12ebdfb9 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/PatcherTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/PatcherTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/RedundantGotoTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RedundantGotoTransformer.kt
similarity index 97%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/RedundantGotoTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RedundantGotoTransformer.kt
index e2b4b329..3222c536 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/RedundantGotoTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RedundantGotoTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/RemapTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RemapTransformer.kt
similarity index 77%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/RemapTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RemapTransformer.kt
index d0d313ae..742f1516 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/RemapTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RemapTransformer.kt
@@ -1,9 +1,9 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.Profile
-import org.openrs2.deob.remap.TypedRemapper
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.remap.TypedRemapper
 import org.openrs2.deob.util.map.NameMap
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/ResetTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ResetTransformer.kt
similarity index 98%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/ResetTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ResetTransformer.kt
index 27e0421d..3ac4dbaf 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/ResetTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ResetTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/UnusedArgTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedArgTransformer.kt
similarity index 95%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/UnusedArgTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedArgTransformer.kt
index 07756262..fa32e5e4 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/UnusedArgTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedArgTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@@ -17,11 +17,11 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.hasCode
 import org.openrs2.asm.removeArgument
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.ArgPartition
-import org.openrs2.deob.Profile
-import org.openrs2.deob.analysis.ConstSourceInterpreter
-import org.openrs2.deob.analysis.ConstSourceValue
-import org.openrs2.deob.remap.MethodMappingGenerator
+import org.openrs2.deob.bytecode.ArgPartition
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.analysis.ConstSourceInterpreter
+import org.openrs2.deob.bytecode.analysis.ConstSourceValue
+import org.openrs2.deob.bytecode.remap.MethodMappingGenerator
 import org.openrs2.util.collect.DisjointSet
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/UnusedLocalTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedLocalTransformer.kt
similarity index 94%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/UnusedLocalTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedLocalTransformer.kt
index b10d5e02..4a03b615 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/UnusedLocalTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedLocalTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@@ -11,7 +11,7 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.deleteExpression
 import org.openrs2.asm.isPure
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.analysis.LiveVariableAnalyzer
+import org.openrs2.deob.bytecode.analysis.LiveVariableAnalyzer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/UnusedMethodTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedMethodTransformer.kt
similarity index 95%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/UnusedMethodTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedMethodTransformer.kt
index a6bb7118..5efaad3f 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/UnusedMethodTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedMethodTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
@@ -13,8 +13,8 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.filter.MemberFilter
 import org.openrs2.asm.filter.UnionMemberFilter
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.Profile
-import org.openrs2.deob.filter.ReflectedConstructorFilter
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
 import org.openrs2.util.collect.DisjointSet
 import org.openrs2.util.collect.removeFirst
 import javax.inject.Inject
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/VisibilityTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/VisibilityTransformer.kt
similarity index 96%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/VisibilityTransformer.kt
rename to deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/VisibilityTransformer.kt
index 996ad6b9..7132c2b3 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/VisibilityTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/VisibilityTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
@@ -16,8 +16,8 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.filter.MemberFilter
 import org.openrs2.asm.filter.UnionMemberFilter
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.Profile
-import org.openrs2.deob.filter.ReflectedConstructorFilter
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
 import org.openrs2.util.collect.DisjointSet
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -91,7 +91,7 @@ public class VisibilityTransformer @Inject constructor(private val profile: Prof
             // reduce it to the weakest level required to override a dependency's method
             partition.filter { classPath[it.owner]!!.dependency }
                 .mapNotNull { classPath[it.owner]!!.getMethodAccess(MemberDesc(it)) }
-                .fold(visibility, ::weakestVisibility)
+                .fold(visibility, Companion::weakestVisibility)
         } else {
             visibility
         }
diff --git a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt b/deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt
deleted file mode 100644
index c5b2acf2..00000000
--- a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.openrs2.deob
-
-import com.github.ajalt.clikt.core.CliktCommand
-import com.google.inject.Guice
-import java.nio.file.Paths
-
-public fun main(args: Array<String>): Unit = DeobfuscateCommand().main(args)
-
-public class DeobfuscateCommand : CliktCommand(name = "deob") {
-    override fun run() {
-        val injector = Guice.createInjector(DeobfuscatorModule)
-        val deobfuscator = injector.getInstance(Deobfuscator::class.java)
-        deobfuscator.run(
-            input = Paths.get("nonfree/share/client"),
-            output = Paths.get("nonfree/var/cache/deob")
-        )
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f4755198..88abfe12 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,9 +13,9 @@ include(
     "crypto",
     "db",
     "decompiler",
-    "deob",
     "deob-annotations",
     "deob-ast",
+    "deob-bytecode",
     "deob-processor",
     "deob-util",
     "game",