diff --git a/.idea/runConfigurations/AstDeobfuscator.xml b/.idea/runConfigurations/AstDeobfuscator.xml
index beef02a612..ad7261a420 100644
--- a/.idea/runConfigurations/AstDeobfuscator.xml
+++ b/.idea/runConfigurations/AstDeobfuscator.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="AstDeobfuscator" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="AstDeobfuscator" type="JetRunConfigurationType">
     <module name="openrs2.deob-ast.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="dev.openrs2.deob.ast.DeobfuscateAstCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.ast.DeobfuscateAstCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/Bundler.xml b/.idea/runConfigurations/Bundler.xml
index 4dff0b1042..e719ff24dc 100644
--- a/.idea/runConfigurations/Bundler.xml
+++ b/.idea/runConfigurations/Bundler.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Bundler" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="Bundler" type="JetRunConfigurationType">
     <module name="openrs2.bundler.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="dev.openrs2.bundler.BundleCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.bundler.BundleCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/Decompiler.xml b/.idea/runConfigurations/Decompiler.xml
index 70485b5ae5..8a5f8b82c3 100644
--- a/.idea/runConfigurations/Decompiler.xml
+++ b/.idea/runConfigurations/Decompiler.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Decompiler" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="Decompiler" type="JetRunConfigurationType">
     <module name="openrs2.decompiler.main" />
     <option name="VM_PARAMETERS" value="-Xmx3G" />
     <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="dev.openrs2.decompiler.DecompileCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.decompiler.DecompileCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/Deobfuscator.xml b/.idea/runConfigurations/Deobfuscator.xml
index 0c73742b8e..f466df5ded 100644
--- a/.idea/runConfigurations/Deobfuscator.xml
+++ b/.idea/runConfigurations/Deobfuscator.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Deobfuscator" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="Deobfuscator" type="JetRunConfigurationType">
     <module name="openrs2.deob.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="dev.openrs2.deob.DeobfuscateCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.DeobfuscateCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/GameServer.xml b/.idea/runConfigurations/GameServer.xml
index d4834d64c2..cc84c21bb6 100644
--- a/.idea/runConfigurations/GameServer.xml
+++ b/.idea/runConfigurations/GameServer.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="GameServer" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="GameServer" type="JetRunConfigurationType">
     <module name="openrs2.game.main" />
     <option name="VM_PARAMETERS" value="-Dio.netty.leakDetection.level=PARANOID" />
     <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="dev.openrs2.game.GameCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.game.GameCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/.idea/runConfigurations/dev_openrs2.xml b/.idea/runConfigurations/org_openrs2.xml
similarity index 85%
rename from .idea/runConfigurations/dev_openrs2.xml
rename to .idea/runConfigurations/org_openrs2.xml
index e834dd1363..cce92237db 100644
--- a/.idea/runConfigurations/dev_openrs2.xml
+++ b/.idea/runConfigurations/org_openrs2.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="dev.openrs2" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="org.openrs2" type="JUnit" factoryName="JUnit">
     <useClassPathOnly />
     <extension name="coverage">
       <pattern>
@@ -7,7 +7,7 @@
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <option name="PACKAGE_NAME" value="dev.openrs2" />
+    <option name="PACKAGE_NAME" value="org.openrs2" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
diff --git a/all/build.gradle.kts b/all/build.gradle.kts
index 5420a58057..3fac46ef43 100644
--- a/all/build.gradle.kts
+++ b/all/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 application {
     applicationName = "openrs2"
-    mainClassName = "dev.openrs2.CommandKt"
+    mainClassName = "org.openrs2.CommandKt"
 }
 
 dependencies {
diff --git a/all/src/main/java/dev/openrs2/Command.kt b/all/src/main/java/org/openrs2/Command.kt
similarity index 58%
rename from all/src/main/java/dev/openrs2/Command.kt
rename to all/src/main/java/org/openrs2/Command.kt
index 5edf94a3ff..d264479f49 100644
--- a/all/src/main/java/dev/openrs2/Command.kt
+++ b/all/src/main/java/org/openrs2/Command.kt
@@ -1,15 +1,15 @@
-package dev.openrs2
+package org.openrs2
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
-import dev.openrs2.archive.ArchiveCommand
-import dev.openrs2.bundler.BundleCommand
-import dev.openrs2.compress.cli.CompressCommand
-import dev.openrs2.crc32.Crc32Command
-import dev.openrs2.decompiler.DecompileCommand
-import dev.openrs2.deob.DeobfuscateCommand
-import dev.openrs2.deob.ast.DeobfuscateAstCommand
-import dev.openrs2.game.GameCommand
+import org.openrs2.archive.ArchiveCommand
+import org.openrs2.bundler.BundleCommand
+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.game.GameCommand
 
 public fun main(args: Array<String>): Unit = Command().main(args)
 
diff --git a/archive/build.gradle.kts b/archive/build.gradle.kts
index 86290287d9..6c43bb932f 100644
--- a/archive/build.gradle.kts
+++ b/archive/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.archive.ArchiveCommandKt"
+    mainClassName = "org.openrs2.archive.ArchiveCommandKt"
 }
 
 dependencies {
diff --git a/archive/src/main/java/dev/openrs2/archive/ArchiveCommand.kt b/archive/src/main/java/org/openrs2/archive/ArchiveCommand.kt
similarity index 69%
rename from archive/src/main/java/dev/openrs2/archive/ArchiveCommand.kt
rename to archive/src/main/java/org/openrs2/archive/ArchiveCommand.kt
index 28831b68d4..95ce488d24 100644
--- a/archive/src/main/java/dev/openrs2/archive/ArchiveCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/ArchiveCommand.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.archive
+package org.openrs2.archive
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
-import dev.openrs2.archive.cache.CacheCommand
-import dev.openrs2.archive.key.KeyCommand
-import dev.openrs2.archive.name.NameCommand
+import org.openrs2.archive.cache.CacheCommand
+import org.openrs2.archive.key.KeyCommand
+import org.openrs2.archive.name.NameCommand
 
 public fun main(args: Array<String>): Unit = ArchiveCommand().main(args)
 
diff --git a/archive/src/main/java/dev/openrs2/archive/ArchiveModule.kt b/archive/src/main/java/org/openrs2/archive/ArchiveModule.kt
similarity index 72%
rename from archive/src/main/java/dev/openrs2/archive/ArchiveModule.kt
rename to archive/src/main/java/org/openrs2/archive/ArchiveModule.kt
index fc292ac67a..584293ffdd 100644
--- a/archive/src/main/java/dev/openrs2/archive/ArchiveModule.kt
+++ b/archive/src/main/java/org/openrs2/archive/ArchiveModule.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.archive
+package org.openrs2.archive
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
-import dev.openrs2.buffer.BufferModule
-import dev.openrs2.db.Database
-import dev.openrs2.json.JsonModule
+import org.openrs2.buffer.BufferModule
+import org.openrs2.db.Database
+import org.openrs2.json.JsonModule
 
 public object ArchiveModule : AbstractModule() {
     override fun configure() {
diff --git a/archive/src/main/java/dev/openrs2/archive/DatabaseProvider.kt b/archive/src/main/java/org/openrs2/archive/DatabaseProvider.kt
similarity index 80%
rename from archive/src/main/java/dev/openrs2/archive/DatabaseProvider.kt
rename to archive/src/main/java/org/openrs2/archive/DatabaseProvider.kt
index 70099ded57..39dd83e9fb 100644
--- a/archive/src/main/java/dev/openrs2/archive/DatabaseProvider.kt
+++ b/archive/src/main/java/org/openrs2/archive/DatabaseProvider.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.archive
+package org.openrs2.archive
 
-import dev.openrs2.db.Database
-import dev.openrs2.db.PostgresDeadlockDetector
 import org.flywaydb.core.Flyway
+import org.openrs2.db.Database
+import org.openrs2.db.PostgresDeadlockDetector
 import org.postgresql.ds.PGSimpleDataSource
 import javax.inject.Provider
 
@@ -14,7 +14,7 @@ public class DatabaseProvider : Provider<Database> {
 
         Flyway.configure()
             .dataSource(dataSource)
-            .locations("classpath:/dev/openrs2/archive")
+            .locations("classpath:/org/openrs2/archive")
             .load()
             .migrate()
 
diff --git a/archive/src/main/java/dev/openrs2/archive/cache/CacheCommand.kt b/archive/src/main/java/org/openrs2/archive/cache/CacheCommand.kt
similarity index 88%
rename from archive/src/main/java/dev/openrs2/archive/cache/CacheCommand.kt
rename to archive/src/main/java/org/openrs2/archive/cache/CacheCommand.kt
index 6793b34ece..072654ac43 100644
--- a/archive/src/main/java/dev/openrs2/archive/cache/CacheCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/CacheCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
diff --git a/archive/src/main/java/dev/openrs2/archive/cache/CacheExporter.kt b/archive/src/main/java/org/openrs2/archive/cache/CacheExporter.kt
similarity index 94%
rename from archive/src/main/java/dev/openrs2/archive/cache/CacheExporter.kt
rename to archive/src/main/java/org/openrs2/archive/cache/CacheExporter.kt
index 07d026be18..9bc541209d 100644
--- a/archive/src/main/java/dev/openrs2/archive/cache/CacheExporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/CacheExporter.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache
 
-import dev.openrs2.buffer.use
-import dev.openrs2.cache.Store
-import dev.openrs2.db.Database
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
+import org.openrs2.buffer.use
+import org.openrs2.cache.Store
+import org.openrs2.db.Database
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/archive/src/main/java/dev/openrs2/archive/cache/CacheImporter.kt b/archive/src/main/java/org/openrs2/archive/cache/CacheImporter.kt
similarity index 97%
rename from archive/src/main/java/dev/openrs2/archive/cache/CacheImporter.kt
rename to archive/src/main/java/org/openrs2/archive/cache/CacheImporter.kt
index 5b2ccf9c60..3aa6c64fdd 100644
--- a/archive/src/main/java/dev/openrs2/archive/cache/CacheImporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/CacheImporter.kt
@@ -1,18 +1,18 @@
-package dev.openrs2.archive.cache
-
-import dev.openrs2.buffer.crc32
-import dev.openrs2.buffer.use
-import dev.openrs2.cache.Js5Archive
-import dev.openrs2.cache.Js5Compression
-import dev.openrs2.cache.Js5Index
-import dev.openrs2.cache.Store
-import dev.openrs2.cache.VersionTrailer
-import dev.openrs2.crypto.Whirlpool
-import dev.openrs2.db.Database
+package org.openrs2.archive.cache
+
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.DefaultByteBufHolder
+import org.openrs2.buffer.crc32
+import org.openrs2.buffer.use
+import org.openrs2.cache.Js5Archive
+import org.openrs2.cache.Js5Compression
+import org.openrs2.cache.Js5Index
+import org.openrs2.cache.Store
+import org.openrs2.cache.VersionTrailer
+import org.openrs2.crypto.Whirlpool
+import org.openrs2.db.Database
 import java.io.IOException
 import java.sql.Connection
 import java.sql.Types
diff --git a/archive/src/main/java/dev/openrs2/archive/cache/ExportCommand.kt b/archive/src/main/java/org/openrs2/archive/cache/ExportCommand.kt
similarity index 88%
rename from archive/src/main/java/dev/openrs2/archive/cache/ExportCommand.kt
rename to archive/src/main/java/org/openrs2/archive/cache/ExportCommand.kt
index 73051805c0..1508660975 100644
--- a/archive/src/main/java/dev/openrs2/archive/cache/ExportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/ExportCommand.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.long
 import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
-import dev.openrs2.cache.DiskStore
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
+import org.openrs2.cache.DiskStore
 
 public class ExportCommand : CliktCommand(name = "export") {
     private val id by argument().long()
diff --git a/archive/src/main/java/dev/openrs2/archive/cache/ImportCommand.kt b/archive/src/main/java/org/openrs2/archive/cache/ImportCommand.kt
similarity index 86%
rename from archive/src/main/java/dev/openrs2/archive/cache/ImportCommand.kt
rename to archive/src/main/java/org/openrs2/archive/cache/ImportCommand.kt
index f6b062cade..ecdb369e8d 100644
--- a/archive/src/main/java/dev/openrs2/archive/cache/ImportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/ImportCommand.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
-import dev.openrs2.cache.Store
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
+import org.openrs2.cache.Store
 
 public class ImportCommand : CliktCommand(name = "import") {
     private val input by argument().path(
diff --git a/archive/src/main/java/dev/openrs2/archive/key/BruteForceCommand.kt b/archive/src/main/java/org/openrs2/archive/key/BruteForceCommand.kt
similarity index 84%
rename from archive/src/main/java/dev/openrs2/archive/key/BruteForceCommand.kt
rename to archive/src/main/java/org/openrs2/archive/key/BruteForceCommand.kt
index c21b4be825..2b1ec82806 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/BruteForceCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/BruteForceCommand.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
 
 public class BruteForceCommand : CliktCommand(name = "brute-force") {
     override fun run(): Unit = runBlocking {
diff --git a/archive/src/main/java/dev/openrs2/archive/key/HexKeyReader.kt b/archive/src/main/java/org/openrs2/archive/key/HexKeyReader.kt
similarity index 80%
rename from archive/src/main/java/dev/openrs2/archive/key/HexKeyReader.kt
rename to archive/src/main/java/org/openrs2/archive/key/HexKeyReader.kt
index 086e8e98c0..6b7314075b 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/HexKeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/HexKeyReader.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
-import dev.openrs2.crypto.XteaKey
+import org.openrs2.crypto.XteaKey
 import java.io.InputStream
 
 public object HexKeyReader : KeyReader {
diff --git a/archive/src/main/java/dev/openrs2/archive/key/ImportCommand.kt b/archive/src/main/java/org/openrs2/archive/key/ImportCommand.kt
similarity index 89%
rename from archive/src/main/java/dev/openrs2/archive/key/ImportCommand.kt
rename to archive/src/main/java/org/openrs2/archive/key/ImportCommand.kt
index 2f4d7827ce..e433596a16 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/ImportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/ImportCommand.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
 
 public class ImportCommand : CliktCommand(name = "import") {
     private val input by argument().path(
diff --git a/archive/src/main/java/dev/openrs2/archive/key/JsonKeyReader.kt b/archive/src/main/java/org/openrs2/archive/key/JsonKeyReader.kt
similarity index 90%
rename from archive/src/main/java/dev/openrs2/archive/key/JsonKeyReader.kt
rename to archive/src/main/java/org/openrs2/archive/key/JsonKeyReader.kt
index fe39ec212f..f9d1072df5 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/JsonKeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/JsonKeyReader.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.json.Json
+import org.openrs2.crypto.XteaKey
+import org.openrs2.json.Json
 import java.io.InputStream
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/archive/src/main/java/dev/openrs2/archive/key/KeyBruteForcer.kt b/archive/src/main/java/org/openrs2/archive/key/KeyBruteForcer.kt
similarity index 98%
rename from archive/src/main/java/dev/openrs2/archive/key/KeyBruteForcer.kt
rename to archive/src/main/java/org/openrs2/archive/key/KeyBruteForcer.kt
index f044870633..305bb7d11e 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/KeyBruteForcer.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyBruteForcer.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
-import dev.openrs2.buffer.use
-import dev.openrs2.cache.Js5Compression
-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.db.Database
 import io.netty.buffer.Unpooled
+import org.openrs2.buffer.use
+import org.openrs2.cache.Js5Compression
+import org.openrs2.crypto.XteaKey
+import org.openrs2.db.Database
 import java.sql.Connection
 import java.sql.Types
 import javax.inject.Inject
diff --git a/archive/src/main/java/dev/openrs2/archive/key/KeyCommand.kt b/archive/src/main/java/org/openrs2/archive/key/KeyCommand.kt
similarity index 89%
rename from archive/src/main/java/dev/openrs2/archive/key/KeyCommand.kt
rename to archive/src/main/java/org/openrs2/archive/key/KeyCommand.kt
index 2205d70dd4..e2011b7174 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/KeyCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
diff --git a/archive/src/main/java/dev/openrs2/archive/key/KeyImporter.kt b/archive/src/main/java/org/openrs2/archive/key/KeyImporter.kt
similarity index 96%
rename from archive/src/main/java/dev/openrs2/archive/key/KeyImporter.kt
rename to archive/src/main/java/org/openrs2/archive/key/KeyImporter.kt
index 93f7bb552a..ccbf5dda59 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/KeyImporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyImporter.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.db.Database
+import org.openrs2.crypto.XteaKey
+import org.openrs2.db.Database
 import java.nio.file.Files
 import java.nio.file.Path
 import javax.inject.Inject
diff --git a/archive/src/main/java/dev/openrs2/archive/key/KeyReader.kt b/archive/src/main/java/org/openrs2/archive/key/KeyReader.kt
similarity index 64%
rename from archive/src/main/java/dev/openrs2/archive/key/KeyReader.kt
rename to archive/src/main/java/org/openrs2/archive/key/KeyReader.kt
index a0344a9ab3..89c1a1f7db 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/KeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyReader.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
-import dev.openrs2.crypto.XteaKey
+import org.openrs2.crypto.XteaKey
 import java.io.InputStream
 
 public interface KeyReader {
diff --git a/archive/src/main/java/dev/openrs2/archive/key/TextKeyReader.kt b/archive/src/main/java/org/openrs2/archive/key/TextKeyReader.kt
similarity index 89%
rename from archive/src/main/java/dev/openrs2/archive/key/TextKeyReader.kt
rename to archive/src/main/java/org/openrs2/archive/key/TextKeyReader.kt
index 133e8a05dd..cc453b3447 100644
--- a/archive/src/main/java/dev/openrs2/archive/key/TextKeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/TextKeyReader.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key
 
-import dev.openrs2.crypto.XteaKey
+import org.openrs2.crypto.XteaKey
 import java.io.InputStream
 
 public object TextKeyReader : KeyReader {
diff --git a/archive/src/main/java/dev/openrs2/archive/name/GenerateCommand.kt b/archive/src/main/java/org/openrs2/archive/name/GenerateCommand.kt
similarity index 90%
rename from archive/src/main/java/dev/openrs2/archive/name/GenerateCommand.kt
rename to archive/src/main/java/org/openrs2/archive/name/GenerateCommand.kt
index 9d2cb9f8d6..44c2f1c5e9 100644
--- a/archive/src/main/java/dev/openrs2/archive/name/GenerateCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/GenerateCommand.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
 
 public class GenerateCommand : CliktCommand(name = "generate") {
     override fun run(): Unit = runBlocking {
diff --git a/archive/src/main/java/dev/openrs2/archive/name/ImportCommand.kt b/archive/src/main/java/org/openrs2/archive/name/ImportCommand.kt
similarity index 90%
rename from archive/src/main/java/dev/openrs2/archive/name/ImportCommand.kt
rename to archive/src/main/java/org/openrs2/archive/name/ImportCommand.kt
index f5155f60bd..8437f977a2 100644
--- a/archive/src/main/java/dev/openrs2/archive/name/ImportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/ImportCommand.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.defaultStdin
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
 
 public class ImportCommand : CliktCommand(name = "import") {
     private val input by option().inputStream().defaultStdin()
diff --git a/archive/src/main/java/dev/openrs2/archive/name/NameCommand.kt b/archive/src/main/java/org/openrs2/archive/name/NameCommand.kt
similarity index 89%
rename from archive/src/main/java/dev/openrs2/archive/name/NameCommand.kt
rename to archive/src/main/java/org/openrs2/archive/name/NameCommand.kt
index 33c296330f..9a77d77bb6 100644
--- a/archive/src/main/java/dev/openrs2/archive/name/NameCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/NameCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
diff --git a/archive/src/main/java/dev/openrs2/archive/name/NameImporter.kt b/archive/src/main/java/org/openrs2/archive/name/NameImporter.kt
similarity index 88%
rename from archive/src/main/java/dev/openrs2/archive/name/NameImporter.kt
rename to archive/src/main/java/org/openrs2/archive/name/NameImporter.kt
index bbb5676f5f..b97bf818cd 100644
--- a/archive/src/main/java/dev/openrs2/archive/name/NameImporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/NameImporter.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name
 
-import dev.openrs2.db.Database
-import dev.openrs2.util.krHashCode
+import org.openrs2.db.Database
+import org.openrs2.util.krHashCode
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/asm/src/main/java/dev/openrs2/asm/AsmJacksonModule.kt b/asm/src/main/java/org/openrs2/asm/AsmJacksonModule.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/AsmJacksonModule.kt
rename to asm/src/main/java/org/openrs2/asm/AsmJacksonModule.kt
index cfd6f29c6b..0e1a247ab2 100644
--- a/asm/src/main/java/dev/openrs2/asm/AsmJacksonModule.kt
+++ b/asm/src/main/java/org/openrs2/asm/AsmJacksonModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import com.fasterxml.jackson.databind.module.SimpleModule
 import javax.inject.Singleton
diff --git a/asm/src/main/java/dev/openrs2/asm/AsmModule.kt b/asm/src/main/java/org/openrs2/asm/AsmModule.kt
similarity index 93%
rename from asm/src/main/java/dev/openrs2/asm/AsmModule.kt
rename to asm/src/main/java/org/openrs2/asm/AsmModule.kt
index 41704f38b4..b0469047ae 100644
--- a/asm/src/main/java/dev/openrs2/asm/AsmModule.kt
+++ b/asm/src/main/java/org/openrs2/asm/AsmModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import com.fasterxml.jackson.databind.Module
 import com.google.inject.AbstractModule
diff --git a/asm/src/main/java/dev/openrs2/asm/ClassForNameUtils.kt b/asm/src/main/java/org/openrs2/asm/ClassForNameUtils.kt
similarity index 98%
rename from asm/src/main/java/dev/openrs2/asm/ClassForNameUtils.kt
rename to asm/src/main/java/org/openrs2/asm/ClassForNameUtils.kt
index 7fc3cd7b9f..cd0146358c 100644
--- a/asm/src/main/java/dev/openrs2/asm/ClassForNameUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassForNameUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/asm/src/main/java/dev/openrs2/asm/ClassNameExtensions.kt b/asm/src/main/java/org/openrs2/asm/ClassNameExtensions.kt
similarity index 87%
rename from asm/src/main/java/dev/openrs2/asm/ClassNameExtensions.kt
rename to asm/src/main/java/org/openrs2/asm/ClassNameExtensions.kt
index ce3440f5b2..ea84d576e6 100644
--- a/asm/src/main/java/dev/openrs2/asm/ClassNameExtensions.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassNameExtensions.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 public fun String.toBinaryClassName(): String {
     return replace('/', '.')
diff --git a/asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt b/asm/src/main/java/org/openrs2/asm/ClassNodeRemapper.kt
similarity index 98%
rename from asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt
rename to asm/src/main/java/org/openrs2/asm/ClassNodeRemapper.kt
index 22f498aff6..f13f921a33 100644
--- a/asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassNodeRemapper.kt
@@ -1,6 +1,5 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
-import dev.openrs2.asm.classpath.ExtendedRemapper
 import org.objectweb.asm.Type
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -17,6 +16,7 @@ import org.objectweb.asm.tree.MultiANewArrayInsnNode
 import org.objectweb.asm.tree.ParameterNode
 import org.objectweb.asm.tree.TryCatchBlockNode
 import org.objectweb.asm.tree.TypeInsnNode
+import org.openrs2.asm.classpath.ExtendedRemapper
 
 public fun ClassNode.remap(remapper: ExtendedRemapper) {
     val originalName = name
diff --git a/asm/src/main/java/dev/openrs2/asm/ClassVersionUtils.kt b/asm/src/main/java/org/openrs2/asm/ClassVersionUtils.kt
similarity index 93%
rename from asm/src/main/java/dev/openrs2/asm/ClassVersionUtils.kt
rename to asm/src/main/java/org/openrs2/asm/ClassVersionUtils.kt
index beec586f0a..267162f6dc 100644
--- a/asm/src/main/java/dev/openrs2/asm/ClassVersionUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassVersionUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 public object ClassVersionUtils {
     private fun swapWords(v: Int): Int {
diff --git a/asm/src/main/java/dev/openrs2/asm/InsnListUtils.kt b/asm/src/main/java/org/openrs2/asm/InsnListUtils.kt
similarity index 98%
rename from asm/src/main/java/dev/openrs2/asm/InsnListUtils.kt
rename to asm/src/main/java/org/openrs2/asm/InsnListUtils.kt
index 8d294ed93b..597490b65d 100644
--- a/asm/src/main/java/dev/openrs2/asm/InsnListUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/InsnListUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.InsnList
diff --git a/asm/src/main/java/dev/openrs2/asm/InsnMatcher.kt b/asm/src/main/java/org/openrs2/asm/InsnMatcher.kt
similarity index 99%
rename from asm/src/main/java/dev/openrs2/asm/InsnMatcher.kt
rename to asm/src/main/java/org/openrs2/asm/InsnMatcher.kt
index 2db889c54e..ee06952b3f 100644
--- a/asm/src/main/java/dev/openrs2/asm/InsnMatcher.kt
+++ b/asm/src/main/java/org/openrs2/asm/InsnMatcher.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/asm/src/main/java/dev/openrs2/asm/InsnNodeUtils.kt b/asm/src/main/java/org/openrs2/asm/InsnNodeUtils.kt
similarity index 99%
rename from asm/src/main/java/dev/openrs2/asm/InsnNodeUtils.kt
rename to asm/src/main/java/org/openrs2/asm/InsnNodeUtils.kt
index e9ef712051..25ccae254a 100644
--- a/asm/src/main/java/dev/openrs2/asm/InsnNodeUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/InsnNodeUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/asm/src/main/java/dev/openrs2/asm/MemberDesc.kt b/asm/src/main/java/org/openrs2/asm/MemberDesc.kt
similarity index 96%
rename from asm/src/main/java/dev/openrs2/asm/MemberDesc.kt
rename to asm/src/main/java/org/openrs2/asm/MemberDesc.kt
index 0ec7c092ef..af6a04fc2e 100644
--- a/asm/src/main/java/dev/openrs2/asm/MemberDesc.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberDesc.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.FieldNode
diff --git a/asm/src/main/java/dev/openrs2/asm/MemberRef.kt b/asm/src/main/java/org/openrs2/asm/MemberRef.kt
similarity index 98%
rename from asm/src/main/java/dev/openrs2/asm/MemberRef.kt
rename to asm/src/main/java/org/openrs2/asm/MemberRef.kt
index 20693528a9..6d4ee08f56 100644
--- a/asm/src/main/java/dev/openrs2/asm/MemberRef.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberRef.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
diff --git a/asm/src/main/java/dev/openrs2/asm/MemberRefDeserializer.kt b/asm/src/main/java/org/openrs2/asm/MemberRefDeserializer.kt
similarity index 94%
rename from asm/src/main/java/dev/openrs2/asm/MemberRefDeserializer.kt
rename to asm/src/main/java/org/openrs2/asm/MemberRefDeserializer.kt
index 0d1e29d087..ba52ef3398 100644
--- a/asm/src/main/java/dev/openrs2/asm/MemberRefDeserializer.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberRefDeserializer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
diff --git a/asm/src/main/java/dev/openrs2/asm/MemberRefKeyDeserializer.kt b/asm/src/main/java/org/openrs2/asm/MemberRefKeyDeserializer.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/MemberRefKeyDeserializer.kt
rename to asm/src/main/java/org/openrs2/asm/MemberRefKeyDeserializer.kt
index 0f8a9f98c4..d573f59a74 100644
--- a/asm/src/main/java/dev/openrs2/asm/MemberRefKeyDeserializer.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberRefKeyDeserializer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.KeyDeserializer
diff --git a/asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt b/asm/src/main/java/org/openrs2/asm/MethodNodeUtils.kt
similarity index 99%
rename from asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt
rename to asm/src/main/java/org/openrs2/asm/MethodNodeUtils.kt
index 9c061b4da8..2a1ebbd709 100644
--- a/asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/MethodNodeUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
diff --git a/asm/src/main/java/dev/openrs2/asm/NopClassVisitor.kt b/asm/src/main/java/org/openrs2/asm/NopClassVisitor.kt
similarity index 84%
rename from asm/src/main/java/dev/openrs2/asm/NopClassVisitor.kt
rename to asm/src/main/java/org/openrs2/asm/NopClassVisitor.kt
index bd72f0783b..ca1bf84d40 100644
--- a/asm/src/main/java/dev/openrs2/asm/NopClassVisitor.kt
+++ b/asm/src/main/java/org/openrs2/asm/NopClassVisitor.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Opcodes
diff --git a/asm/src/main/java/dev/openrs2/asm/StackMetadata.kt b/asm/src/main/java/org/openrs2/asm/StackMetadata.kt
similarity index 99%
rename from asm/src/main/java/dev/openrs2/asm/StackMetadata.kt
rename to asm/src/main/java/org/openrs2/asm/StackMetadata.kt
index 0c75c38904..94b5f551fd 100644
--- a/asm/src/main/java/dev/openrs2/asm/StackMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/StackMetadata.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/AsmClassMetadata.kt b/asm/src/main/java/org/openrs2/asm/classpath/AsmClassMetadata.kt
similarity index 94%
rename from asm/src/main/java/dev/openrs2/asm/classpath/AsmClassMetadata.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/AsmClassMetadata.kt
index bba9824874..c91a5b524b 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/AsmClassMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/AsmClassMetadata.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
-import dev.openrs2.asm.MemberDesc
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.MemberDesc
 
 public class AsmClassMetadata(
     private val classPath: ClassPath,
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/ClassMetadata.kt b/asm/src/main/java/org/openrs2/asm/classpath/ClassMetadata.kt
similarity index 97%
rename from asm/src/main/java/dev/openrs2/asm/classpath/ClassMetadata.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/ClassMetadata.kt
index ed7c444641..19bdf87d9a 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/ClassMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ClassMetadata.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
-import dev.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberDesc
 
 public abstract class ClassMetadata {
     public abstract val name: String
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt b/asm/src/main/java/org/openrs2/asm/classpath/ClassPath.kt
similarity index 95%
rename from asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/ClassPath.kt
index 056e4a00b9..863dd9b9fb 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ClassPath.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.toBinaryClassName
-import dev.openrs2.util.collect.DisjointSet
-import dev.openrs2.util.collect.ForestDisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.toBinaryClassName
+import org.openrs2.util.collect.DisjointSet
+import org.openrs2.util.collect.ForestDisjointSet
 import java.util.IdentityHashMap
 
 public class ClassPath(
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt b/asm/src/main/java/org/openrs2/asm/classpath/ExtendedRemapper.kt
similarity index 95%
rename from asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/ExtendedRemapper.kt
index c324465ff5..a8b255eb3e 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ExtendedRemapper.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/JsrInliner.kt b/asm/src/main/java/org/openrs2/asm/classpath/JsrInliner.kt
similarity index 94%
rename from asm/src/main/java/dev/openrs2/asm/classpath/JsrInliner.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/JsrInliner.kt
index 00cefa54fd..f514a42c9d 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/JsrInliner.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/JsrInliner.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt b/asm/src/main/java/org/openrs2/asm/classpath/Library.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/Library.kt
index 1cc40524f4..1d91ba7931 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/Library.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.io.LibraryReader
-import dev.openrs2.asm.io.LibraryWriter
-import dev.openrs2.util.io.useAtomicOutputStream
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.io.LibraryReader
+import org.openrs2.asm.io.LibraryWriter
+import org.openrs2.util.io.useAtomicOutputStream
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.SortedMap
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/LibraryRemapper.kt b/asm/src/main/java/org/openrs2/asm/classpath/LibraryRemapper.kt
similarity index 97%
rename from asm/src/main/java/dev/openrs2/asm/classpath/LibraryRemapper.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/LibraryRemapper.kt
index 4f3d2ef0d3..dedc25f046 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/LibraryRemapper.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/LibraryRemapper.kt
@@ -1,9 +1,5 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
-import dev.openrs2.asm.ClassVersionUtils
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.remap
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@@ -11,6 +7,10 @@ import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.InsnList
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.ClassVersionUtils
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.remap
 import java.util.SortedMap
 import java.util.TreeMap
 import kotlin.math.max
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/ReflectionClassMetadata.kt b/asm/src/main/java/org/openrs2/asm/classpath/ReflectionClassMetadata.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/classpath/ReflectionClassMetadata.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/ReflectionClassMetadata.kt
index f7e6490179..4213fe14f5 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/ReflectionClassMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ReflectionClassMetadata.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.toInternalClassName
 import org.objectweb.asm.Type
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.toInternalClassName
 
 private val Class<*>.asmName: String
     get() = name.toInternalClassName()
diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/StackFrameClassWriter.kt b/asm/src/main/java/org/openrs2/asm/classpath/StackFrameClassWriter.kt
similarity index 95%
rename from asm/src/main/java/dev/openrs2/asm/classpath/StackFrameClassWriter.kt
rename to asm/src/main/java/org/openrs2/asm/classpath/StackFrameClassWriter.kt
index 9bb26a3600..877d40a802 100644
--- a/asm/src/main/java/dev/openrs2/asm/classpath/StackFrameClassWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/StackFrameClassWriter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath
 
 import org.objectweb.asm.ClassWriter
 
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/AnyClassFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/AnyClassFilter.kt
similarity index 80%
rename from asm/src/main/java/dev/openrs2/asm/filter/AnyClassFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/AnyClassFilter.kt
index 1d8c522fcf..9a7c3e427e 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/AnyClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/AnyClassFilter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 public object AnyClassFilter : ClassFilter {
     override fun matches(name: String): Boolean {
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/AnyMemberFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/AnyMemberFilter.kt
similarity index 83%
rename from asm/src/main/java/dev/openrs2/asm/filter/AnyMemberFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/AnyMemberFilter.kt
index a7636c3f47..71391f035f 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/AnyMemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/AnyMemberFilter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 public object AnyMemberFilter : MemberFilter {
     override fun matches(owner: String, name: String, desc: String): Boolean {
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/ClassFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/ClassFilter.kt
similarity index 72%
rename from asm/src/main/java/dev/openrs2/asm/filter/ClassFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/ClassFilter.kt
index dfd8835192..dcf64fee4b 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/ClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/ClassFilter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 public interface ClassFilter {
     public fun matches(name: String): Boolean
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/Glob.kt b/asm/src/main/java/org/openrs2/asm/filter/Glob.kt
similarity index 97%
rename from asm/src/main/java/dev/openrs2/asm/filter/Glob.kt
rename to asm/src/main/java/org/openrs2/asm/filter/Glob.kt
index 3e90ccfe58..168e60fa9c 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/Glob.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/Glob.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 public object Glob {
     public fun compile(pattern: String): Regex {
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/GlobClassFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/GlobClassFilter.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/filter/GlobClassFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/GlobClassFilter.kt
index 97499ce8f7..d49da5a597 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/GlobClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/GlobClassFilter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/GlobMemberFilter.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/GlobMemberFilter.kt
index 6a62d821ee..ba990758c3 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/GlobMemberFilter.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 import com.fasterxml.jackson.annotation.JsonIgnore
-import dev.openrs2.asm.MemberRef
+import org.openrs2.asm.MemberRef
 
 public class GlobMemberFilter(@Suppress("CanBeParameter") private val patterns: List<MemberRef>) : MemberFilter {
     private data class CompiledPattern(val owner: Regex, val name: Regex, val desc: Regex)
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/MemberFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/MemberFilter.kt
similarity index 78%
rename from asm/src/main/java/dev/openrs2/asm/filter/MemberFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/MemberFilter.kt
index aa3059a864..b9d7934408 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/MemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/MemberFilter.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
-import dev.openrs2.asm.MemberRef
+import org.openrs2.asm.MemberRef
 
 public interface MemberFilter {
     public fun matches(owner: String, name: String, desc: String): Boolean
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/UnionClassFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/UnionClassFilter.kt
similarity index 87%
rename from asm/src/main/java/dev/openrs2/asm/filter/UnionClassFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/UnionClassFilter.kt
index 48432dd163..2940823d42 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/UnionClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/UnionClassFilter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 public class UnionClassFilter(vararg filters: ClassFilter) : ClassFilter {
     private val filters = filters.toList()
diff --git a/asm/src/main/java/dev/openrs2/asm/filter/UnionMemberFilter.kt b/asm/src/main/java/org/openrs2/asm/filter/UnionMemberFilter.kt
similarity index 89%
rename from asm/src/main/java/dev/openrs2/asm/filter/UnionMemberFilter.kt
rename to asm/src/main/java/org/openrs2/asm/filter/UnionMemberFilter.kt
index 84e1a228f2..bc66fa7c63 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/UnionMemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/UnionMemberFilter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter
 
 public class UnionMemberFilter(vararg filters: MemberFilter) : MemberFilter {
     private val filters = filters.toList()
diff --git a/asm/src/main/java/dev/openrs2/asm/io/AbstractJarLibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/AbstractJarLibraryWriter.kt
similarity index 88%
rename from asm/src/main/java/dev/openrs2/asm/io/AbstractJarLibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/AbstractJarLibraryWriter.kt
index 51295a498c..6a0a98a852 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/AbstractJarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/AbstractJarLibraryWriter.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.asm.ClassVersionUtils
-import dev.openrs2.asm.NopClassVisitor
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.StackFrameClassWriter
 import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.util.CheckClassAdapter
+import org.openrs2.asm.ClassVersionUtils
+import org.openrs2.asm.NopClassVisitor
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.StackFrameClassWriter
 import java.io.OutputStream
 import java.util.jar.JarEntry
 import java.util.jar.JarOutputStream
diff --git a/asm/src/main/java/dev/openrs2/asm/io/JarLibraryReader.kt b/asm/src/main/java/org/openrs2/asm/io/JarLibraryReader.kt
similarity index 88%
rename from asm/src/main/java/dev/openrs2/asm/io/JarLibraryReader.kt
rename to asm/src/main/java/org/openrs2/asm/io/JarLibraryReader.kt
index 046c4d2007..308dcb89d7 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/JarLibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/JarLibraryReader.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.asm.classpath.JsrInliner
-import dev.openrs2.util.io.entries
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.JsrInliner
+import org.openrs2.util.io.entries
 import java.io.InputStream
 import java.util.jar.JarInputStream
 
diff --git a/asm/src/main/java/dev/openrs2/asm/io/JarLibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/JarLibraryWriter.kt
similarity index 76%
rename from asm/src/main/java/dev/openrs2/asm/io/JarLibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/JarLibraryWriter.kt
index dc145bf2c0..2b041921ce 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/JarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/JarLibraryWriter.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.util.io.DeterministicJarOutputStream
+import org.openrs2.util.io.DeterministicJarOutputStream
 import java.io.OutputStream
 import java.util.jar.JarOutputStream
 
diff --git a/asm/src/main/java/dev/openrs2/asm/io/LibraryReader.kt b/asm/src/main/java/org/openrs2/asm/io/LibraryReader.kt
similarity index 85%
rename from asm/src/main/java/dev/openrs2/asm/io/LibraryReader.kt
rename to asm/src/main/java/org/openrs2/asm/io/LibraryReader.kt
index 9f7a2a4d8e..ae9a6edb2b 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/LibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/LibraryReader.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
 import org.objectweb.asm.tree.ClassNode
 import java.io.InputStream
diff --git a/asm/src/main/java/dev/openrs2/asm/io/LibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/LibraryWriter.kt
similarity index 74%
rename from asm/src/main/java/dev/openrs2/asm/io/LibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/LibraryWriter.kt
index 4ca8befbdf..ac6349aaba 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/LibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/LibraryWriter.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.asm.classpath.ClassPath
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
 import java.io.OutputStream
 
 public interface LibraryWriter {
diff --git a/asm/src/main/java/dev/openrs2/asm/io/ManifestJarLibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/ManifestJarLibraryWriter.kt
similarity index 80%
rename from asm/src/main/java/dev/openrs2/asm/io/ManifestJarLibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/ManifestJarLibraryWriter.kt
index 72ef563a82..bffbe1833e 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/ManifestJarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/ManifestJarLibraryWriter.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.util.io.DeterministicJarOutputStream
+import org.openrs2.util.io.DeterministicJarOutputStream
 import java.io.OutputStream
 import java.util.jar.JarOutputStream
 import java.util.jar.Manifest
diff --git a/asm/src/main/java/dev/openrs2/asm/io/Pack200LibraryReader.kt b/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryReader.kt
similarity index 92%
rename from asm/src/main/java/dev/openrs2/asm/io/Pack200LibraryReader.kt
rename to asm/src/main/java/org/openrs2/asm/io/Pack200LibraryReader.kt
index 724fe5189b..857c574cc8 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/Pack200LibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryReader.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.compress.gzip.Gzip
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.compress.gzip.Gzip
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
diff --git a/asm/src/main/java/dev/openrs2/asm/io/Pack200LibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryWriter.kt
similarity index 87%
rename from asm/src/main/java/dev/openrs2/asm/io/Pack200LibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/Pack200LibraryWriter.kt
index ba30e0ff4b..c5bcad5821 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/Pack200LibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryWriter.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.compress.gzip.Gzip
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.compress.gzip.Gzip
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream
diff --git a/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryReader.kt b/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryReader.kt
similarity index 90%
rename from asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryReader.kt
rename to asm/src/main/java/org/openrs2/asm/io/PackClassLibraryReader.kt
index d9759ed399..0e27a44e59 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryReader.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
 import org.objectweb.asm.tree.ClassNode
 import java.io.InputStream
diff --git a/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryWriter.kt
similarity index 79%
rename from asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/PackClassLibraryWriter.kt
index 0b0b10a029..acbadd87a7 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryWriter.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.asm.classpath.ClassPath
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
 import java.io.OutputStream
 
 public object PackClassLibraryWriter : LibraryWriter {
diff --git a/asm/src/main/java/dev/openrs2/asm/io/SignedJarLibraryWriter.kt b/asm/src/main/java/org/openrs2/asm/io/SignedJarLibraryWriter.kt
similarity index 86%
rename from asm/src/main/java/dev/openrs2/asm/io/SignedJarLibraryWriter.kt
rename to asm/src/main/java/org/openrs2/asm/io/SignedJarLibraryWriter.kt
index 0779f11cd2..a19186df86 100644
--- a/asm/src/main/java/dev/openrs2/asm/io/SignedJarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/SignedJarLibraryWriter.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.crypto.Pkcs12KeyStore
-import dev.openrs2.util.io.DeterministicJarOutputStream
-import dev.openrs2.util.io.entries
-import dev.openrs2.util.io.useTempFile
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.crypto.Pkcs12KeyStore
+import org.openrs2.util.io.DeterministicJarOutputStream
+import org.openrs2.util.io.entries
+import org.openrs2.util.io.useTempFile
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
diff --git a/asm/src/main/java/dev/openrs2/asm/transform/Transformer.kt b/asm/src/main/java/org/openrs2/asm/transform/Transformer.kt
similarity index 94%
rename from asm/src/main/java/dev/openrs2/asm/transform/Transformer.kt
rename to asm/src/main/java/org/openrs2/asm/transform/Transformer.kt
index 57862f2148..ca6a3168e7 100644
--- a/asm/src/main/java/dev/openrs2/asm/transform/Transformer.kt
+++ b/asm/src/main/java/org/openrs2/asm/transform/Transformer.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.asm.transform
+package org.openrs2.asm.transform
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode
 
 public abstract class Transformer {
     public open fun transform(classPath: ClassPath) {
diff --git a/buffer/src/main/java/dev/openrs2/buffer/BufferModule.kt b/buffer/src/main/java/org/openrs2/buffer/BufferModule.kt
similarity index 92%
rename from buffer/src/main/java/dev/openrs2/buffer/BufferModule.kt
rename to buffer/src/main/java/org/openrs2/buffer/BufferModule.kt
index f82d2888fb..69a3b6dddf 100644
--- a/buffer/src/main/java/dev/openrs2/buffer/BufferModule.kt
+++ b/buffer/src/main/java/org/openrs2/buffer/BufferModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer
 
 import com.google.inject.AbstractModule
 import io.netty.buffer.ByteBufAllocator
diff --git a/buffer/src/main/java/dev/openrs2/buffer/ByteBufExtensions.kt b/buffer/src/main/java/org/openrs2/buffer/ByteBufExtensions.kt
similarity index 99%
rename from buffer/src/main/java/dev/openrs2/buffer/ByteBufExtensions.kt
rename to buffer/src/main/java/org/openrs2/buffer/ByteBufExtensions.kt
index 6a94eaa33d..8c887b0806 100644
--- a/buffer/src/main/java/dev/openrs2/buffer/ByteBufExtensions.kt
+++ b/buffer/src/main/java/org/openrs2/buffer/ByteBufExtensions.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer
 
 import com.google.common.base.Preconditions
 import io.netty.buffer.ByteBuf
diff --git a/buffer/src/main/java/dev/openrs2/buffer/ReferenceCountedExtensions.kt b/buffer/src/main/java/org/openrs2/buffer/ReferenceCountedExtensions.kt
similarity index 87%
rename from buffer/src/main/java/dev/openrs2/buffer/ReferenceCountedExtensions.kt
rename to buffer/src/main/java/org/openrs2/buffer/ReferenceCountedExtensions.kt
index 656998e9a2..14dc947ec3 100644
--- a/buffer/src/main/java/dev/openrs2/buffer/ReferenceCountedExtensions.kt
+++ b/buffer/src/main/java/org/openrs2/buffer/ReferenceCountedExtensions.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer
 
 import io.netty.util.ReferenceCounted
 
diff --git a/buffer/src/test/java/dev/openrs2/buffer/ByteBufExtensionsTest.kt b/buffer/src/test/java/org/openrs2/buffer/ByteBufExtensionsTest.kt
similarity index 99%
rename from buffer/src/test/java/dev/openrs2/buffer/ByteBufExtensionsTest.kt
rename to buffer/src/test/java/org/openrs2/buffer/ByteBufExtensionsTest.kt
index 76f3a18e5d..c19af2bd2e 100644
--- a/buffer/src/test/java/dev/openrs2/buffer/ByteBufExtensionsTest.kt
+++ b/buffer/src/test/java/org/openrs2/buffer/ByteBufExtensionsTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer
 
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index 62d4c90f44..bbc3f16328 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -7,7 +7,7 @@ object Versions {
     const val dependencyLicenseReport = "1.14"
     const val dokka = "1.4.10"
     const val fastutil = "8.4.2"
-    const val fernflower = "1.0.4-SNAPSHOT"
+    const val fernflower = "1.1.0"
     const val flyway = "7.0.0"
     const val guava = "29.0-jre"
     const val guice = "4.2.3"
@@ -24,7 +24,7 @@ object Versions {
     const val kotlinter = "3.2.0"
     const val logback = "1.2.3"
     const val netty = "4.1.52.Final"
-    const val openrs2Natives = "2.0.1"
+    const val openrs2Natives = "3.0.0"
     const val postgres = "42.2.16"
     const val shadowPlugin = "6.0.0"
     const val versionsPlugin = "0.33.0"
diff --git a/bundler/build.gradle.kts b/bundler/build.gradle.kts
index 0732750c2a..960c2fb237 100644
--- a/bundler/build.gradle.kts
+++ b/bundler/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.bundler.BundleCommandKt"
+    mainClassName = "org.openrs2.bundler.BundleCommandKt"
 }
 
 dependencies {
@@ -15,7 +15,7 @@ dependencies {
 
     implementation(project(":conf"))
     implementation(project(":crypto"))
-    implementation("dev.openrs2:openrs2-natives-all:${Versions.openrs2Natives}")
+    implementation("org.openrs2:openrs2-natives-all:${Versions.openrs2Natives}")
 }
 
 publishing {
diff --git a/bundler/src/main/java/dev/openrs2/bundler/BundleCommand.kt b/bundler/src/main/java/org/openrs2/bundler/BundleCommand.kt
similarity index 94%
rename from bundler/src/main/java/dev/openrs2/bundler/BundleCommand.kt
rename to bundler/src/main/java/org/openrs2/bundler/BundleCommand.kt
index 78725ef0d8..6db3f8f5db 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/BundleCommand.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/BundleCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
diff --git a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt b/bundler/src/main/java/org/openrs2/bundler/Bundler.kt
similarity index 90%
rename from bundler/src/main/java/dev/openrs2/bundler/Bundler.kt
rename to bundler/src/main/java/org/openrs2/bundler/Bundler.kt
index 46ae1f6c33..77f5926055 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/Bundler.kt
@@ -1,19 +1,19 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.io.JarLibraryReader
-import dev.openrs2.asm.io.JarLibraryWriter
-import dev.openrs2.asm.io.ManifestJarLibraryWriter
-import dev.openrs2.asm.io.Pack200LibraryReader
-import dev.openrs2.asm.io.Pack200LibraryWriter
-import dev.openrs2.asm.io.PackClassLibraryWriter
-import dev.openrs2.asm.io.SignedJarLibraryWriter
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.transform.ResourceTransformer
-import dev.openrs2.conf.Config
-import dev.openrs2.crypto.Pkcs12KeyStore
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.io.JarLibraryReader
+import org.openrs2.asm.io.JarLibraryWriter
+import org.openrs2.asm.io.ManifestJarLibraryWriter
+import org.openrs2.asm.io.Pack200LibraryReader
+import org.openrs2.asm.io.Pack200LibraryWriter
+import org.openrs2.asm.io.PackClassLibraryWriter
+import org.openrs2.asm.io.SignedJarLibraryWriter
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.transform.ResourceTransformer
+import org.openrs2.conf.Config
+import org.openrs2.crypto.Pkcs12KeyStore
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.jar.Attributes
diff --git a/bundler/src/main/java/dev/openrs2/bundler/BundlerModule.kt b/bundler/src/main/java/org/openrs2/bundler/BundlerModule.kt
similarity index 57%
rename from bundler/src/main/java/dev/openrs2/bundler/BundlerModule.kt
rename to bundler/src/main/java/org/openrs2/bundler/BundlerModule.kt
index b828117491..13218f1ece 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/BundlerModule.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/BundlerModule.kt
@@ -1,23 +1,23 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler
 
 import com.google.inject.AbstractModule
 import com.google.inject.multibindings.Multibinder
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.transform.BufferSizeTransformer
-import dev.openrs2.bundler.transform.CachePathTransformer
-import dev.openrs2.bundler.transform.DomainTransformer
-import dev.openrs2.bundler.transform.HighDpiTransformer
-import dev.openrs2.bundler.transform.HostCheckTransformer
-import dev.openrs2.bundler.transform.LoadLibraryTransformer
-import dev.openrs2.bundler.transform.MacResizeTransformer
-import dev.openrs2.bundler.transform.MemoryAllocationTransformer
-import dev.openrs2.bundler.transform.NameTransformer
-import dev.openrs2.bundler.transform.PlatformDetectionTransformer
-import dev.openrs2.bundler.transform.PublicKeyTransformer
-import dev.openrs2.bundler.transform.RightClickTransformer
-import dev.openrs2.bundler.transform.TypoTransformer
-import dev.openrs2.conf.ConfigModule
-import dev.openrs2.crypto.CryptoModule
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.transform.BufferSizeTransformer
+import org.openrs2.bundler.transform.CachePathTransformer
+import org.openrs2.bundler.transform.DomainTransformer
+import org.openrs2.bundler.transform.HighDpiTransformer
+import org.openrs2.bundler.transform.HostCheckTransformer
+import org.openrs2.bundler.transform.LoadLibraryTransformer
+import org.openrs2.bundler.transform.MacResizeTransformer
+import org.openrs2.bundler.transform.MemoryAllocationTransformer
+import org.openrs2.bundler.transform.NameTransformer
+import org.openrs2.bundler.transform.PlatformDetectionTransformer
+import org.openrs2.bundler.transform.PublicKeyTransformer
+import org.openrs2.bundler.transform.RightClickTransformer
+import org.openrs2.bundler.transform.TypoTransformer
+import org.openrs2.conf.ConfigModule
+import org.openrs2.crypto.CryptoModule
 
 public object BundlerModule : AbstractModule() {
     override fun configure() {
diff --git a/bundler/src/main/java/dev/openrs2/bundler/BundlerQualifier.kt b/bundler/src/main/java/org/openrs2/bundler/BundlerQualifier.kt
similarity index 88%
rename from bundler/src/main/java/dev/openrs2/bundler/BundlerQualifier.kt
rename to bundler/src/main/java/org/openrs2/bundler/BundlerQualifier.kt
index 2f6d02fdb7..9234740f79 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/BundlerQualifier.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/BundlerQualifier.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler
 
 import javax.inject.Qualifier
 
diff --git a/bundler/src/main/java/dev/openrs2/bundler/Resource.kt b/bundler/src/main/java/org/openrs2/bundler/Resource.kt
similarity index 95%
rename from bundler/src/main/java/dev/openrs2/bundler/Resource.kt
rename to bundler/src/main/java/org/openrs2/bundler/Resource.kt
index a4a76d7224..06b72ec4b1 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/Resource.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/Resource.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.io.LibraryWriter
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.io.LibraryWriter
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 import java.nio.file.Path
@@ -80,7 +80,7 @@ public class Resource(
         }
 
         private fun compressNative(source: String, destination: String, resource: String): Resource {
-            val path = "/dev/openrs2/natives/$resource"
+            val path = "/org/openrs2/natives/$resource"
             val uncompressed = Resource::class.java.getResourceAsStream(path).use { it.readBytes() }
             return compress(source, destination, uncompressed)
         }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/BufferSizeTransformer.kt
similarity index 87%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/BufferSizeTransformer.kt
index 80d091dd0c..820e9ff3e4 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/BufferSizeTransformer.kt
@@ -1,17 +1,17 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode
+import org.openrs2.asm.toAbstractInsnNode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/CachePathTransformer.kt
similarity index 87%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/CachePathTransformer.kt
index 673cbc9999..63344d017f 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/CachePathTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.conf.Config
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.conf.Config
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/DomainTransformer.kt
similarity index 85%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/DomainTransformer.kt
index be31cc843f..8353b72fbf 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/DomainTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.conf.Config
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.conf.Config
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/HighDpiTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/HighDpiTransformer.kt
similarity index 95%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/HighDpiTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/HighDpiTransformer.kt
index a3bb1abe50..1d4a5fbdfc 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/HighDpiTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/HighDpiTransformer.kt
@@ -1,13 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.getExpression
-import dev.openrs2.asm.previousReal
-import dev.openrs2.asm.stackMetadata
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@@ -23,6 +16,13 @@ import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.ParameterNode
 import org.objectweb.asm.tree.TypeInsnNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.getExpression
+import org.openrs2.asm.previousReal
+import org.openrs2.asm.stackMetadata
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 import kotlin.math.max
 
@@ -225,12 +225,14 @@ public class HighDpiTransformer : Transformer() {
 
         list.add(VarInsnNode(Opcodes.ALOAD, graphicsVar))
         list.add(TypeInsnNode(Opcodes.CHECKCAST, "java/awt/Graphics2D"))
-        list.add(MethodInsnNode(
-            Opcodes.INVOKEVIRTUAL,
-            "java/awt/Graphics2D",
-            "getTransform",
-            "()Ljava/awt/geom/AffineTransform;"
-        ))
+        list.add(
+            MethodInsnNode(
+                Opcodes.INVOKEVIRTUAL,
+                "java/awt/Graphics2D",
+                "getTransform",
+                "()Ljava/awt/geom/AffineTransform;"
+            )
+        )
         list.add(MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/awt/geom/AffineTransform", "getScaleX", "()D"))
         list.add(FieldInsnNode(Opcodes.PUTSTATIC, gameShell, "canvasScale", "D"))
         list.add(JumpInsnNode(Opcodes.GOTO, endLabel))
@@ -349,9 +351,11 @@ public class HighDpiTransformer : Transformer() {
         private val GL_CONTEXTS = setOf("javax/media/opengl/GLContext", "gl!javax/media/opengl/GLContext")
         private val GET_GL_DESCRIPTORS = setOf("()Ljavax/media/opengl/GL;", "()Lgl!javax/media/opengl/GL;")
 
-        private val DRAW_PIXELS_MATCHER = InsnMatcher.compile("""
+        private val DRAW_PIXELS_MATCHER = InsnMatcher.compile(
+            """
             ALOAD ILOAD ILOAD LDC GETSTATIC IFEQ LDC GOTO SIPUSH ALOAD INVOKESTATIC INVOKEINTERFACE
-        """.trimIndent())
+        """.trimIndent()
+        )
         private val GET_GL_MATCHER = InsnMatcher.compile("GETSTATIC INVOKEVIRTUAL PUTSTATIC")
         private val SET_CANVAS_VISIBLE_MATCHER = InsnMatcher.compile("GETSTATIC ICONST_1 INVOKEVIRTUAL")
     }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/HostCheckTransformer.kt
similarity index 91%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/HostCheckTransformer.kt
index ead3a60a9a..adaed0a0e7 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/HostCheckTransformer.kt
@@ -1,16 +1,16 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
similarity index 92%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
index e3e7d3068b..0dc1b4844a 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/MacResizeTransformer.kt
similarity index 91%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/MacResizeTransformer.kt
index c9806e5c98..18fa5ed52f 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/MacResizeTransformer.kt
@@ -1,10 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@@ -12,6 +8,10 @@ import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
similarity index 88%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
index c3f99c0147..af41dcb2ea 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
@@ -1,17 +1,17 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.replaceExpression
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.replaceExpression
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/NameTransformer.kt
similarity index 86%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/NameTransformer.kt
index 2617318d5f..d86e08b8c4 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/NameTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.conf.Config
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.conf.Config
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
similarity index 95%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
index 21a56fa0f1..56f27d1013 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
@@ -1,13 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.intConstant
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@@ -19,6 +12,13 @@ import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.intConstant
+import org.openrs2.asm.toAbstractInsnNode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/PublicKeyTransformer.kt
similarity index 91%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/PublicKeyTransformer.kt
index a8906e47a8..2be9da0cea 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/PublicKeyTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/ResourceTransformer.kt
similarity index 96%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/ResourceTransformer.kt
index cc62e0ae9b..953294273d 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/ResourceTransformer.kt
@@ -1,12 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.Resource
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnList
@@ -16,6 +10,12 @@ import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.TypeInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.toAbstractInsnNode
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.Resource
 
 public class ResourceTransformer(
     private val resources: List<Resource>? = null,
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/RightClickTransformer.kt
similarity index 91%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/RightClickTransformer.kt
index 3c81c85e61..63cbcbfe20 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/RightClickTransformer.kt
@@ -1,9 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@@ -11,6 +8,9 @@ import org.objectweb.asm.tree.InsnList
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt b/bundler/src/main/java/org/openrs2/bundler/transform/TypoTransformer.kt
similarity index 86%
rename from bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt
rename to bundler/src/main/java/org/openrs2/bundler/transform/TypoTransformer.kt
index 6a2004cea4..52bc0d0fc3 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/TypoTransformer.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/cache/src/main/java/dev/openrs2/cache/BufferedFileChannel.kt b/cache/src/main/java/org/openrs2/cache/BufferedFileChannel.kt
similarity index 99%
rename from cache/src/main/java/dev/openrs2/cache/BufferedFileChannel.kt
rename to cache/src/main/java/org/openrs2/cache/BufferedFileChannel.kt
index ecb956988f..5908d79c12 100644
--- a/cache/src/main/java/dev/openrs2/cache/BufferedFileChannel.kt
+++ b/cache/src/main/java/org/openrs2/cache/BufferedFileChannel.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
diff --git a/cache/src/main/java/dev/openrs2/cache/DiskStore.kt b/cache/src/main/java/org/openrs2/cache/DiskStore.kt
similarity index 99%
rename from cache/src/main/java/dev/openrs2/cache/DiskStore.kt
rename to cache/src/main/java/org/openrs2/cache/DiskStore.kt
index 4a2006e25d..50b7a04323 100644
--- a/cache/src/main/java/dev/openrs2/cache/DiskStore.kt
+++ b/cache/src/main/java/org/openrs2/cache/DiskStore.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.use
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
+import org.openrs2.buffer.use
 import java.io.FileNotFoundException
 import java.nio.channels.FileChannel
 import java.nio.file.Files
diff --git a/cache/src/main/java/dev/openrs2/cache/FlatFileStore.kt b/cache/src/main/java/org/openrs2/cache/FlatFileStore.kt
similarity index 97%
rename from cache/src/main/java/dev/openrs2/cache/FlatFileStore.kt
rename to cache/src/main/java/org/openrs2/cache/FlatFileStore.kt
index e2e314fe53..072eb906fe 100644
--- a/cache/src/main/java/dev/openrs2/cache/FlatFileStore.kt
+++ b/cache/src/main/java/org/openrs2/cache/FlatFileStore.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.use
-import dev.openrs2.util.io.useAtomicOutputStream
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
+import org.openrs2.buffer.use
+import org.openrs2.util.io.useAtomicOutputStream
 import java.io.FileNotFoundException
 import java.nio.channels.FileChannel
 import java.nio.file.Files
diff --git a/cache/src/main/java/dev/openrs2/cache/Js5Archive.kt b/cache/src/main/java/org/openrs2/cache/Js5Archive.kt
similarity index 73%
rename from cache/src/main/java/dev/openrs2/cache/Js5Archive.kt
rename to cache/src/main/java/org/openrs2/cache/Js5Archive.kt
index db2fd082e3..0b8d356111 100644
--- a/cache/src/main/java/dev/openrs2/cache/Js5Archive.kt
+++ b/cache/src/main/java/org/openrs2/cache/Js5Archive.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 public object Js5Archive {
     public const val ARCHIVESET: Int = 255
diff --git a/cache/src/main/java/dev/openrs2/cache/Js5Compression.kt b/cache/src/main/java/org/openrs2/cache/Js5Compression.kt
similarity index 98%
rename from cache/src/main/java/dev/openrs2/cache/Js5Compression.kt
rename to cache/src/main/java/org/openrs2/cache/Js5Compression.kt
index c0bd93e008..7cf437465e 100644
--- a/cache/src/main/java/dev/openrs2/cache/Js5Compression.kt
+++ b/cache/src/main/java/org/openrs2/cache/Js5Compression.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.use
-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.crypto.xteaDecrypt
-import dev.openrs2.crypto.xteaEncrypt
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufInputStream
 import io.netty.buffer.ByteBufOutputStream
+import org.openrs2.buffer.use
+import org.openrs2.crypto.XteaKey
+import org.openrs2.crypto.xteaDecrypt
+import org.openrs2.crypto.xteaEncrypt
 import java.io.IOException
 import java.io.OutputStream
 
diff --git a/cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt b/cache/src/main/java/org/openrs2/cache/Js5CompressionType.kt
similarity index 91%
rename from cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt
rename to cache/src/main/java/org/openrs2/cache/Js5CompressionType.kt
index 0cc34c7d8e..3f9be3469b 100644
--- a/cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt
+++ b/cache/src/main/java/org/openrs2/cache/Js5CompressionType.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.compress.bzip2.Bzip2
-import dev.openrs2.compress.gzip.GzipLevelOutputStream
-import dev.openrs2.compress.lzma.Lzma
+import org.openrs2.compress.bzip2.Bzip2
+import org.openrs2.compress.gzip.GzipLevelOutputStream
+import org.openrs2.compress.lzma.Lzma
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.zip.Deflater
diff --git a/cache/src/main/java/dev/openrs2/cache/Js5Index.kt b/cache/src/main/java/org/openrs2/cache/Js5Index.kt
similarity index 98%
rename from cache/src/main/java/dev/openrs2/cache/Js5Index.kt
rename to cache/src/main/java/org/openrs2/cache/Js5Index.kt
index 6a803fffe8..ea5a105969 100644
--- a/cache/src/main/java/dev/openrs2/cache/Js5Index.kt
+++ b/cache/src/main/java/org/openrs2/cache/Js5Index.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.readUnsignedIntSmart
-import dev.openrs2.buffer.writeUnsignedIntSmart
-import dev.openrs2.crypto.Whirlpool
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufUtil
+import org.openrs2.buffer.readUnsignedIntSmart
+import org.openrs2.buffer.writeUnsignedIntSmart
+import org.openrs2.crypto.Whirlpool
 
 public class Js5Index(
     public var protocol: Js5Protocol,
diff --git a/cache/src/main/java/dev/openrs2/cache/Js5Protocol.kt b/cache/src/main/java/org/openrs2/cache/Js5Protocol.kt
similarity index 95%
rename from cache/src/main/java/dev/openrs2/cache/Js5Protocol.kt
rename to cache/src/main/java/org/openrs2/cache/Js5Protocol.kt
index 2873097be5..67f5424c89 100644
--- a/cache/src/main/java/dev/openrs2/cache/Js5Protocol.kt
+++ b/cache/src/main/java/org/openrs2/cache/Js5Protocol.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 public enum class Js5Protocol {
     ORIGINAL,
diff --git a/cache/src/main/java/dev/openrs2/cache/NamedEntry.kt b/cache/src/main/java/org/openrs2/cache/NamedEntry.kt
similarity index 80%
rename from cache/src/main/java/dev/openrs2/cache/NamedEntry.kt
rename to cache/src/main/java/org/openrs2/cache/NamedEntry.kt
index 4b42aea8e2..570b59a601 100644
--- a/cache/src/main/java/dev/openrs2/cache/NamedEntry.kt
+++ b/cache/src/main/java/org/openrs2/cache/NamedEntry.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.util.krHashCode
+import org.openrs2.util.krHashCode
 
 public interface NamedEntry {
     public val id: Int
diff --git a/cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt b/cache/src/main/java/org/openrs2/cache/NamedEntryCollection.kt
similarity index 99%
rename from cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt
rename to cache/src/main/java/org/openrs2/cache/NamedEntryCollection.kt
index 9e835f0e75..9f669f0c7f 100644
--- a/cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt
+++ b/cache/src/main/java/org/openrs2/cache/NamedEntryCollection.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.util.krHashCode
 import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.ints.IntAVLTreeSet
 import it.unimi.dsi.fastutil.ints.IntSortedSet
 import it.unimi.dsi.fastutil.ints.IntSortedSets
+import org.openrs2.util.krHashCode
 
 /**
  * A specialist collection type entirely designed for use by the [Js5Index]
diff --git a/cache/src/main/java/dev/openrs2/cache/Store.kt b/cache/src/main/java/org/openrs2/cache/Store.kt
similarity index 99%
rename from cache/src/main/java/dev/openrs2/cache/Store.kt
rename to cache/src/main/java/org/openrs2/cache/Store.kt
index 53c3bc960b..463cd27773 100644
--- a/cache/src/main/java/dev/openrs2/cache/Store.kt
+++ b/cache/src/main/java/org/openrs2/cache/Store.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
diff --git a/cache/src/main/java/dev/openrs2/cache/StoreCorruptException.kt b/cache/src/main/java/org/openrs2/cache/StoreCorruptException.kt
similarity index 80%
rename from cache/src/main/java/dev/openrs2/cache/StoreCorruptException.kt
rename to cache/src/main/java/org/openrs2/cache/StoreCorruptException.kt
index 7a66b51452..eba0a39376 100644
--- a/cache/src/main/java/dev/openrs2/cache/StoreCorruptException.kt
+++ b/cache/src/main/java/org/openrs2/cache/StoreCorruptException.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import java.io.IOException
 
diff --git a/cache/src/main/java/dev/openrs2/cache/StoreFullException.kt b/cache/src/main/java/org/openrs2/cache/StoreFullException.kt
similarity index 74%
rename from cache/src/main/java/dev/openrs2/cache/StoreFullException.kt
rename to cache/src/main/java/org/openrs2/cache/StoreFullException.kt
index ca965794a3..b59933de1e 100644
--- a/cache/src/main/java/dev/openrs2/cache/StoreFullException.kt
+++ b/cache/src/main/java/org/openrs2/cache/StoreFullException.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import java.io.IOException
 
diff --git a/cache/src/main/java/dev/openrs2/cache/VersionTrailer.kt b/cache/src/main/java/org/openrs2/cache/VersionTrailer.kt
similarity index 93%
rename from cache/src/main/java/dev/openrs2/cache/VersionTrailer.kt
rename to cache/src/main/java/org/openrs2/cache/VersionTrailer.kt
index 25f562f3db..c967a28c59 100644
--- a/cache/src/main/java/dev/openrs2/cache/VersionTrailer.kt
+++ b/cache/src/main/java/org/openrs2/cache/VersionTrailer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import io.netty.buffer.ByteBuf
 
diff --git a/cache/src/test/java/dev/openrs2/cache/BufferedFileChannelTest.kt b/cache/src/test/java/org/openrs2/cache/BufferedFileChannelTest.kt
similarity index 99%
rename from cache/src/test/java/dev/openrs2/cache/BufferedFileChannelTest.kt
rename to cache/src/test/java/org/openrs2/cache/BufferedFileChannelTest.kt
index e16537e654..6f737a9d56 100644
--- a/cache/src/test/java/dev/openrs2/cache/BufferedFileChannelTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/BufferedFileChannelTest.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
-import dev.openrs2.buffer.use
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import org.openrs2.buffer.use
 import java.io.EOFException
 import java.nio.channels.FileChannel
 import java.nio.file.Files
diff --git a/cache/src/test/java/dev/openrs2/cache/DiskStoreTest.kt b/cache/src/test/java/org/openrs2/cache/DiskStoreTest.kt
similarity index 99%
rename from cache/src/test/java/dev/openrs2/cache/DiskStoreTest.kt
rename to cache/src/test/java/org/openrs2/cache/DiskStoreTest.kt
index be0a8fb39b..0f35f0b369 100644
--- a/cache/src/test/java/dev/openrs2/cache/DiskStoreTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/DiskStoreTest.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
-import dev.openrs2.buffer.use
-import dev.openrs2.util.io.recursiveCopy
-import dev.openrs2.util.io.recursiveEquals
 import io.netty.buffer.Unpooled
 import org.junit.jupiter.api.assertThrows
+import org.openrs2.buffer.use
+import org.openrs2.util.io.recursiveCopy
+import org.openrs2.util.io.recursiveEquals
 import java.io.FileNotFoundException
 import java.nio.file.Paths
 import kotlin.test.Test
diff --git a/cache/src/test/java/dev/openrs2/cache/FlatFileStoreTest.kt b/cache/src/test/java/org/openrs2/cache/FlatFileStoreTest.kt
similarity index 98%
rename from cache/src/test/java/dev/openrs2/cache/FlatFileStoreTest.kt
rename to cache/src/test/java/org/openrs2/cache/FlatFileStoreTest.kt
index 8cf90c07bb..3388a43b68 100644
--- a/cache/src/test/java/dev/openrs2/cache/FlatFileStoreTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/FlatFileStoreTest.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
-import dev.openrs2.buffer.use
-import dev.openrs2.util.io.recursiveCopy
-import dev.openrs2.util.io.recursiveEquals
 import io.netty.buffer.Unpooled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import org.openrs2.buffer.use
+import org.openrs2.util.io.recursiveCopy
+import org.openrs2.util.io.recursiveEquals
 import java.io.FileNotFoundException
 import java.nio.file.Path
 import java.nio.file.Paths
diff --git a/cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt b/cache/src/test/java/org/openrs2/cache/Js5CompressionTest.kt
similarity index 99%
rename from cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt
rename to cache/src/test/java/org/openrs2/cache/Js5CompressionTest.kt
index cabb250e02..d0bcab3110 100644
--- a/cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/Js5CompressionTest.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.use
-import dev.openrs2.crypto.XteaKey
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import org.junit.jupiter.api.assertThrows
+import org.openrs2.buffer.use
+import org.openrs2.crypto.XteaKey
 import java.io.IOException
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/cache/src/test/java/dev/openrs2/cache/Js5IndexTest.kt b/cache/src/test/java/org/openrs2/cache/Js5IndexTest.kt
similarity index 99%
rename from cache/src/test/java/dev/openrs2/cache/Js5IndexTest.kt
rename to cache/src/test/java/org/openrs2/cache/Js5IndexTest.kt
index 1aa469947b..49ab6ba8ba 100644
--- a/cache/src/test/java/dev/openrs2/cache/Js5IndexTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/Js5IndexTest.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.use
-import dev.openrs2.util.krHashCode
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.Unpooled
 import org.junit.jupiter.api.assertThrows
+import org.openrs2.buffer.use
+import org.openrs2.util.krHashCode
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
diff --git a/cache/src/test/java/dev/openrs2/cache/NamedEntryCollectionTest.kt b/cache/src/test/java/org/openrs2/cache/NamedEntryCollectionTest.kt
similarity index 99%
rename from cache/src/test/java/dev/openrs2/cache/NamedEntryCollectionTest.kt
rename to cache/src/test/java/org/openrs2/cache/NamedEntryCollectionTest.kt
index ed4d8a3bc5..deafcf4359 100644
--- a/cache/src/test/java/dev/openrs2/cache/NamedEntryCollectionTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/NamedEntryCollectionTest.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.util.krHashCode
 import org.junit.jupiter.api.assertThrows
+import org.openrs2.util.krHashCode
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
diff --git a/cache/src/test/java/dev/openrs2/cache/StoreTest.kt b/cache/src/test/java/org/openrs2/cache/StoreTest.kt
similarity index 95%
rename from cache/src/test/java/dev/openrs2/cache/StoreTest.kt
rename to cache/src/test/java/org/openrs2/cache/StoreTest.kt
index 1ca84057e3..9e53160824 100644
--- a/cache/src/test/java/dev/openrs2/cache/StoreTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/StoreTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
 import java.nio.file.Paths
 import kotlin.test.Test
diff --git a/cache/src/test/java/dev/openrs2/cache/VersionTrailerTest.kt b/cache/src/test/java/org/openrs2/cache/VersionTrailerTest.kt
similarity index 94%
rename from cache/src/test/java/dev/openrs2/cache/VersionTrailerTest.kt
rename to cache/src/test/java/org/openrs2/cache/VersionTrailerTest.kt
index 6cf8c849af..85379ed7d1 100644
--- a/cache/src/test/java/dev/openrs2/cache/VersionTrailerTest.kt
+++ b/cache/src/test/java/org/openrs2/cache/VersionTrailerTest.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.cache
+package org.openrs2.cache
 
-import dev.openrs2.buffer.use
 import io.netty.buffer.Unpooled
+import org.openrs2.buffer.use
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/bzip2-corrupt.dat b/cache/src/test/resources/org/openrs2/cache/compression/bzip2-corrupt.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/bzip2-corrupt.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/bzip2-corrupt.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/bzip2-encrypted.dat b/cache/src/test/resources/org/openrs2/cache/compression/bzip2-encrypted.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/bzip2-encrypted.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/bzip2-encrypted.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/bzip2-eof.dat b/cache/src/test/resources/org/openrs2/cache/compression/bzip2-eof.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/bzip2-eof.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/bzip2-eof.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/bzip2-invalid-magic.dat b/cache/src/test/resources/org/openrs2/cache/compression/bzip2-invalid-magic.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/bzip2-invalid-magic.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/bzip2-invalid-magic.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/bzip2.dat b/cache/src/test/resources/org/openrs2/cache/compression/bzip2.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/bzip2.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/bzip2.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/compressed-underflow.dat b/cache/src/test/resources/org/openrs2/cache/compression/compressed-underflow.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/compressed-underflow.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/compressed-underflow.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-corrupt.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip-corrupt.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip-corrupt.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip-corrupt.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-encrypted.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip-encrypted.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip-encrypted.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip-encrypted.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-eof.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip-eof.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip-eof.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip-eof.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-invalid-magic.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip-invalid-magic.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip-invalid-magic.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip-invalid-magic.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-invalid-method.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip-invalid-method.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip-invalid-method.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip-invalid-method.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-large.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip-large.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip-large.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip-large.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip.dat b/cache/src/test/resources/org/openrs2/cache/compression/gzip.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/gzip.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/gzip.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/invalid-length.dat b/cache/src/test/resources/org/openrs2/cache/compression/invalid-length.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/invalid-length.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/invalid-length.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/invalid-type.dat b/cache/src/test/resources/org/openrs2/cache/compression/invalid-type.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/invalid-type.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/invalid-type.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/invalid-uncompressed-length.dat b/cache/src/test/resources/org/openrs2/cache/compression/invalid-uncompressed-length.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/invalid-uncompressed-length.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/invalid-uncompressed-length.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/large.dat b/cache/src/test/resources/org/openrs2/cache/compression/large.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/large.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/large.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma-corrupt.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma-corrupt.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma-corrupt.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma-corrupt.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma-dict-size-larger-than-preset.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma-dict-size-larger-than-preset.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma-dict-size-larger-than-preset.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma-dict-size-larger-than-preset.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma-dict-size-negative.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma-dict-size-negative.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma-dict-size-negative.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma-dict-size-negative.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma-encrypted.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma-encrypted.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma-encrypted.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma-encrypted.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma-eof.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma-eof.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma-eof.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma-eof.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma-invalid-pb.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma-invalid-pb.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma-invalid-pb.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma-invalid-pb.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/lzma.dat b/cache/src/test/resources/org/openrs2/cache/compression/lzma.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/lzma.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/lzma.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/none-encrypted.dat b/cache/src/test/resources/org/openrs2/cache/compression/none-encrypted.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/none-encrypted.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/none-encrypted.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/none-eof.dat b/cache/src/test/resources/org/openrs2/cache/compression/none-eof.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/none-eof.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/none-eof.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/none.dat b/cache/src/test/resources/org/openrs2/cache/compression/none.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/none.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/none.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/shorter-than-two-blocks.dat b/cache/src/test/resources/org/openrs2/cache/compression/shorter-than-two-blocks.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/shorter-than-two-blocks.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/shorter-than-two-blocks.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/uncompressed-overflow.dat b/cache/src/test/resources/org/openrs2/cache/compression/uncompressed-overflow.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/uncompressed-overflow.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/uncompressed-overflow.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/uncompressed-underflow.dat b/cache/src/test/resources/org/openrs2/cache/compression/uncompressed-underflow.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/compression/uncompressed-underflow.dat
rename to cache/src/test/resources/org/openrs2/cache/compression/uncompressed-underflow.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-eof-late/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-eof-early/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-archive/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-block-number/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-invalid-group/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-first-outside-data-file/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-eof-early/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-archive/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-block-number/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-invalid-group/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/corrupt-second-outside-data-file/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archive/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/empty-archive/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archive/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/empty-archive/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archive/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/empty-archive/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archive/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/empty-archive/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archives/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/empty-archives/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archives/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/empty-archives/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archives/main_file_cache.idx0 b/cache/src/test/resources/org/openrs2/cache/disk-store/empty-archives/main_file_cache.idx0
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archives/main_file_cache.idx0
rename to cache/src/test/resources/org/openrs2/cache/disk-store/empty-archives/main_file_cache.idx0
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archives/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/empty-archives/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/empty-archives/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/empty-archives/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/empty/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/empty/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/empty/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/empty/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/fragmented/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/fragmented/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/fragmented/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/fragmented/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/fragmented/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/fragmented/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/fragmented/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/fragmented/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-extended/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/multiple-blocks/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/multiple-blocks/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-extended/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-extended/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-removed/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-removed/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-removed/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-removed/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-removed/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block-removed/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block-removed/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block-removed/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/single-block/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/single-block/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/single-block/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/single-block/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-extended/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks-overwritten/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks/main_file_cache.dat2 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks/main_file_cache.dat2
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks/main_file_cache.dat2
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks/main_file_cache.dat2
diff --git a/cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks/main_file_cache.idx255 b/cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks/main_file_cache.idx255
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/disk-store/two-blocks/main_file_cache.idx255
rename to cache/src/test/resources/org/openrs2/cache/disk-store/two-blocks/main_file_cache.idx255
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/empty-archive/255/.gitempty b/cache/src/test/resources/org/openrs2/cache/flat-file-store/empty-archive/255/.gitempty
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/empty-archive/255/.gitempty
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/empty-archive/255/.gitempty
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/empty/.gitempty b/cache/src/test/resources/org/openrs2/cache/flat-file-store/empty/.gitempty
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/empty/.gitempty
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/empty/.gitempty
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/0/0.dat b/cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/0/0.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/0/0.dat
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/0/0.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/0/1.dat b/cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/0/1.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/0/1.dat
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/0/1.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/255/0.dat b/cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/255/0.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/255/0.dat
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/255/0.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/255/65536.dat b/cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/255/65536.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/multiple-groups/255/65536.dat
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/multiple-groups/255/65536.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/single-group-overwritten/255/0.dat b/cache/src/test/resources/org/openrs2/cache/flat-file-store/single-group-overwritten/255/0.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/single-group-overwritten/255/0.dat
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/single-group-overwritten/255/0.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/flat-file-store/single-group/255/0.dat b/cache/src/test/resources/org/openrs2/cache/flat-file-store/single-group/255/0.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/flat-file-store/single-group/255/0.dat
rename to cache/src/test/resources/org/openrs2/cache/flat-file-store/single-group/255/0.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/all-flags.dat b/cache/src/test/resources/org/openrs2/cache/index/all-flags.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/all-flags.dat
rename to cache/src/test/resources/org/openrs2/cache/index/all-flags.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/digest.dat b/cache/src/test/resources/org/openrs2/cache/index/digest.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/digest.dat
rename to cache/src/test/resources/org/openrs2/cache/index/digest.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/empty.dat b/cache/src/test/resources/org/openrs2/cache/index/empty.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/empty.dat
rename to cache/src/test/resources/org/openrs2/cache/index/empty.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/lengths.dat b/cache/src/test/resources/org/openrs2/cache/index/lengths.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/lengths.dat
rename to cache/src/test/resources/org/openrs2/cache/index/lengths.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/named.dat b/cache/src/test/resources/org/openrs2/cache/index/named.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/named.dat
rename to cache/src/test/resources/org/openrs2/cache/index/named.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/no-flags.dat b/cache/src/test/resources/org/openrs2/cache/index/no-flags.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/no-flags.dat
rename to cache/src/test/resources/org/openrs2/cache/index/no-flags.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/null-digest.dat b/cache/src/test/resources/org/openrs2/cache/index/null-digest.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/null-digest.dat
rename to cache/src/test/resources/org/openrs2/cache/index/null-digest.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/smart.dat b/cache/src/test/resources/org/openrs2/cache/index/smart.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/smart.dat
rename to cache/src/test/resources/org/openrs2/cache/index/smart.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/uncompressed-checksum.dat b/cache/src/test/resources/org/openrs2/cache/index/uncompressed-checksum.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/uncompressed-checksum.dat
rename to cache/src/test/resources/org/openrs2/cache/index/uncompressed-checksum.dat
diff --git a/cache/src/test/resources/dev/openrs2/cache/index/versioned.dat b/cache/src/test/resources/org/openrs2/cache/index/versioned.dat
similarity index 100%
rename from cache/src/test/resources/dev/openrs2/cache/index/versioned.dat
rename to cache/src/test/resources/org/openrs2/cache/index/versioned.dat
diff --git a/compress-cli/build.gradle.kts b/compress-cli/build.gradle.kts
index 4c28d779cd..381013da82 100644
--- a/compress-cli/build.gradle.kts
+++ b/compress-cli/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.compress.cli.CompressCommandKt"
+    mainClassName = "org.openrs2.compress.cli.CompressCommandKt"
 }
 
 dependencies {
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/CompressCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/CompressCommand.kt
similarity index 53%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/CompressCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/CompressCommand.kt
index d4b653fb18..f35447430d 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/CompressCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/CompressCommand.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.compress.cli
+package org.openrs2.compress.cli
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
-import dev.openrs2.compress.cli.bzip2.Bunzip2Command
-import dev.openrs2.compress.cli.bzip2.Bzip2Command
-import dev.openrs2.compress.cli.deflate.DeflateCommand
-import dev.openrs2.compress.cli.deflate.InflateCommand
-import dev.openrs2.compress.cli.gzip.GunzipCommand
-import dev.openrs2.compress.cli.gzip.GzipCommand
-import dev.openrs2.compress.cli.lzma.LzmaCommand
-import dev.openrs2.compress.cli.lzma.UnlzmaCommand
+import org.openrs2.compress.cli.bzip2.Bunzip2Command
+import org.openrs2.compress.cli.bzip2.Bzip2Command
+import org.openrs2.compress.cli.deflate.DeflateCommand
+import org.openrs2.compress.cli.deflate.InflateCommand
+import org.openrs2.compress.cli.gzip.GunzipCommand
+import org.openrs2.compress.cli.gzip.GzipCommand
+import org.openrs2.compress.cli.lzma.LzmaCommand
+import org.openrs2.compress.cli.lzma.UnlzmaCommand
 
 public fun main(args: Array<String>): Unit = CompressCommand().main(args)
 
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/bzip2/Bunzip2Command.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/bzip2/Bunzip2Command.kt
similarity index 90%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/bzip2/Bunzip2Command.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/bzip2/Bunzip2Command.kt
index b72c277a4d..68aadb408c 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/bzip2/Bunzip2Command.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/bzip2/Bunzip2Command.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.bzip2
+package org.openrs2.compress.cli.bzip2
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
@@ -6,7 +6,7 @@ import com.github.ajalt.clikt.parameters.types.defaultStdin
 import com.github.ajalt.clikt.parameters.types.defaultStdout
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.github.ajalt.clikt.parameters.types.outputStream
-import dev.openrs2.compress.bzip2.Bzip2
+import org.openrs2.compress.bzip2.Bzip2
 
 public class Bunzip2Command : CliktCommand(name = "bunzip2") {
     private val input by option().inputStream().defaultStdin()
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/bzip2/Bzip2Command.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/bzip2/Bzip2Command.kt
similarity index 90%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/bzip2/Bzip2Command.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/bzip2/Bzip2Command.kt
index 00f8cbb947..9aba65785c 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/bzip2/Bzip2Command.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/bzip2/Bzip2Command.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.bzip2
+package org.openrs2.compress.cli.bzip2
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
@@ -6,7 +6,7 @@ import com.github.ajalt.clikt.parameters.types.defaultStdin
 import com.github.ajalt.clikt.parameters.types.defaultStdout
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.github.ajalt.clikt.parameters.types.outputStream
-import dev.openrs2.compress.bzip2.Bzip2
+import org.openrs2.compress.bzip2.Bzip2
 
 public class Bzip2Command : CliktCommand(name = "bzip2") {
     private val input by option().inputStream().defaultStdin()
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/deflate/DeflateCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/deflate/DeflateCommand.kt
similarity index 96%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/deflate/DeflateCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/deflate/DeflateCommand.kt
index 78199f0af7..f641126845 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/deflate/DeflateCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/deflate/DeflateCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.deflate
+package org.openrs2.compress.cli.deflate
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/deflate/InflateCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/deflate/InflateCommand.kt
similarity index 95%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/deflate/InflateCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/deflate/InflateCommand.kt
index e429caae69..fc7c9f0fe0 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/deflate/InflateCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/deflate/InflateCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.deflate
+package org.openrs2.compress.cli.deflate
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/gzip/GunzipCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/gzip/GunzipCommand.kt
similarity index 90%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/gzip/GunzipCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/gzip/GunzipCommand.kt
index bca04becb7..bc78e05cce 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/gzip/GunzipCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/gzip/GunzipCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.gzip
+package org.openrs2.compress.cli.gzip
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
@@ -6,7 +6,7 @@ import com.github.ajalt.clikt.parameters.types.defaultStdin
 import com.github.ajalt.clikt.parameters.types.defaultStdout
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.github.ajalt.clikt.parameters.types.outputStream
-import dev.openrs2.compress.gzip.Gzip
+import org.openrs2.compress.gzip.Gzip
 
 public class GunzipCommand : CliktCommand(name = "gunzip") {
     private val input by option().inputStream().defaultStdin()
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/gzip/GzipCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/gzip/GzipCommand.kt
similarity index 94%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/gzip/GzipCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/gzip/GzipCommand.kt
index becca157fc..84346fed15 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/gzip/GzipCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/gzip/GzipCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.gzip
+package org.openrs2.compress.cli.gzip
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
@@ -9,7 +9,7 @@ import com.github.ajalt.clikt.parameters.types.defaultStdout
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.github.ajalt.clikt.parameters.types.int
 import com.github.ajalt.clikt.parameters.types.outputStream
-import dev.openrs2.compress.gzip.Gzip
+import org.openrs2.compress.gzip.Gzip
 import java.util.zip.Deflater
 
 public class GzipCommand : CliktCommand(name = "gzip") {
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/lzma/LzmaCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/lzma/LzmaCommand.kt
similarity index 94%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/lzma/LzmaCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/lzma/LzmaCommand.kt
index 42a06a4284..6639126768 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/lzma/LzmaCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/lzma/LzmaCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.lzma
+package org.openrs2.compress.cli.lzma
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
@@ -9,7 +9,7 @@ import com.github.ajalt.clikt.parameters.types.defaultStdout
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.github.ajalt.clikt.parameters.types.int
 import com.github.ajalt.clikt.parameters.types.outputStream
-import dev.openrs2.compress.lzma.Lzma
+import org.openrs2.compress.lzma.Lzma
 import org.tukaani.xz.LZMA2Options
 
 public class LzmaCommand : CliktCommand(name = "lzma") {
diff --git a/compress-cli/src/main/java/dev/openrs2/compress/cli/lzma/UnlzmaCommand.kt b/compress-cli/src/main/java/org/openrs2/compress/cli/lzma/UnlzmaCommand.kt
similarity index 92%
rename from compress-cli/src/main/java/dev/openrs2/compress/cli/lzma/UnlzmaCommand.kt
rename to compress-cli/src/main/java/org/openrs2/compress/cli/lzma/UnlzmaCommand.kt
index ab6a117379..a4ac7d24ca 100644
--- a/compress-cli/src/main/java/dev/openrs2/compress/cli/lzma/UnlzmaCommand.kt
+++ b/compress-cli/src/main/java/org/openrs2/compress/cli/lzma/UnlzmaCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.cli.lzma
+package org.openrs2.compress.cli.lzma
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
@@ -8,7 +8,7 @@ import com.github.ajalt.clikt.parameters.types.defaultStdout
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.github.ajalt.clikt.parameters.types.long
 import com.github.ajalt.clikt.parameters.types.outputStream
-import dev.openrs2.compress.lzma.Lzma
+import org.openrs2.compress.lzma.Lzma
 
 public class UnlzmaCommand : CliktCommand(name = "unlzma") {
     private val input by option().inputStream().defaultStdin()
diff --git a/compress/src/main/java/dev/openrs2/compress/bzip2/Bzip2.kt b/compress/src/main/java/org/openrs2/compress/bzip2/Bzip2.kt
similarity index 91%
rename from compress/src/main/java/dev/openrs2/compress/bzip2/Bzip2.kt
rename to compress/src/main/java/org/openrs2/compress/bzip2/Bzip2.kt
index 64de29cffd..bc515f4162 100644
--- a/compress/src/main/java/dev/openrs2/compress/bzip2/Bzip2.kt
+++ b/compress/src/main/java/org/openrs2/compress/bzip2/Bzip2.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.compress.bzip2
+package org.openrs2.compress.bzip2
 
-import dev.openrs2.util.io.SkipOutputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
+import org.openrs2.util.io.SkipOutputStream
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/compress/src/main/java/dev/openrs2/compress/gzip/Gzip.kt b/compress/src/main/java/org/openrs2/compress/gzip/Gzip.kt
similarity index 89%
rename from compress/src/main/java/dev/openrs2/compress/gzip/Gzip.kt
rename to compress/src/main/java/org/openrs2/compress/gzip/Gzip.kt
index 2f51f98276..037ebf4000 100644
--- a/compress/src/main/java/dev/openrs2/compress/gzip/Gzip.kt
+++ b/compress/src/main/java/org/openrs2/compress/gzip/Gzip.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.compress.gzip
+package org.openrs2.compress.gzip
 
-import dev.openrs2.util.io.SkipOutputStream
+import org.openrs2.util.io.SkipOutputStream
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/compress/src/main/java/dev/openrs2/compress/gzip/GzipLevelOutputStream.kt b/compress/src/main/java/org/openrs2/compress/gzip/GzipLevelOutputStream.kt
similarity index 86%
rename from compress/src/main/java/dev/openrs2/compress/gzip/GzipLevelOutputStream.kt
rename to compress/src/main/java/org/openrs2/compress/gzip/GzipLevelOutputStream.kt
index 35f3fecffe..fb2c93df51 100644
--- a/compress/src/main/java/dev/openrs2/compress/gzip/GzipLevelOutputStream.kt
+++ b/compress/src/main/java/org/openrs2/compress/gzip/GzipLevelOutputStream.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.gzip
+package org.openrs2.compress.gzip
 
 import java.io.OutputStream
 import java.util.zip.GZIPOutputStream
diff --git a/compress/src/main/java/dev/openrs2/compress/lzma/Lzma.kt b/compress/src/main/java/org/openrs2/compress/lzma/Lzma.kt
similarity index 97%
rename from compress/src/main/java/dev/openrs2/compress/lzma/Lzma.kt
rename to compress/src/main/java/org/openrs2/compress/lzma/Lzma.kt
index 1eebc5162c..3ee944d398 100644
--- a/compress/src/main/java/dev/openrs2/compress/lzma/Lzma.kt
+++ b/compress/src/main/java/org/openrs2/compress/lzma/Lzma.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.compress.lzma
+package org.openrs2.compress.lzma
 
 import com.google.common.io.LittleEndianDataInputStream
 import com.google.common.io.LittleEndianDataOutputStream
diff --git a/conf/src/main/java/dev/openrs2/conf/Config.kt b/conf/src/main/java/org/openrs2/conf/Config.kt
similarity index 95%
rename from conf/src/main/java/dev/openrs2/conf/Config.kt
rename to conf/src/main/java/org/openrs2/conf/Config.kt
index 2bf8b727d0..4613989f8e 100644
--- a/conf/src/main/java/dev/openrs2/conf/Config.kt
+++ b/conf/src/main/java/org/openrs2/conf/Config.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.conf
+package org.openrs2.conf
 
 public data class Config(
     val game: String,
diff --git a/conf/src/main/java/dev/openrs2/conf/ConfigModule.kt b/conf/src/main/java/org/openrs2/conf/ConfigModule.kt
similarity index 83%
rename from conf/src/main/java/dev/openrs2/conf/ConfigModule.kt
rename to conf/src/main/java/org/openrs2/conf/ConfigModule.kt
index 82b0b2a3dd..1a97c90b28 100644
--- a/conf/src/main/java/dev/openrs2/conf/ConfigModule.kt
+++ b/conf/src/main/java/org/openrs2/conf/ConfigModule.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.conf
+package org.openrs2.conf
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
-import dev.openrs2.yaml.YamlModule
+import org.openrs2.yaml.YamlModule
 
 public object ConfigModule : AbstractModule() {
     override fun configure() {
diff --git a/conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt b/conf/src/main/java/org/openrs2/conf/ConfigProvider.kt
similarity index 93%
rename from conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt
rename to conf/src/main/java/org/openrs2/conf/ConfigProvider.kt
index 13cc6e9b3e..a211514130 100644
--- a/conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt
+++ b/conf/src/main/java/org/openrs2/conf/ConfigProvider.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.conf
+package org.openrs2.conf
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.openrs2.yaml.Yaml
+import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Paths
 import javax.inject.Inject
diff --git a/crc32/build.gradle.kts b/crc32/build.gradle.kts
index 7526daacf3..68466d0327 100644
--- a/crc32/build.gradle.kts
+++ b/crc32/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.crc32.Crc32CommandKt"
+    mainClassName = "org.openrs2.crc32.Crc32CommandKt"
 }
 
 dependencies {
diff --git a/crc32/src/main/java/dev/openrs2/crc32/Crc32Command.kt b/crc32/src/main/java/org/openrs2/crc32/Crc32Command.kt
similarity index 96%
rename from crc32/src/main/java/dev/openrs2/crc32/Crc32Command.kt
rename to crc32/src/main/java/org/openrs2/crc32/Crc32Command.kt
index b8f114396e..1414adb908 100644
--- a/crc32/src/main/java/dev/openrs2/crc32/Crc32Command.kt
+++ b/crc32/src/main/java/org/openrs2/crc32/Crc32Command.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crc32
+package org.openrs2.crc32
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
diff --git a/crypto/src/main/java/dev/openrs2/crypto/CryptoModule.kt b/crypto/src/main/java/org/openrs2/crypto/CryptoModule.kt
similarity index 93%
rename from crypto/src/main/java/dev/openrs2/crypto/CryptoModule.kt
rename to crypto/src/main/java/org/openrs2/crypto/CryptoModule.kt
index f71025dac4..e317916b14 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/CryptoModule.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/CryptoModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
diff --git a/crypto/src/main/java/dev/openrs2/crypto/IsaacRandom.kt b/crypto/src/main/java/org/openrs2/crypto/IsaacRandom.kt
similarity index 99%
rename from crypto/src/main/java/dev/openrs2/crypto/IsaacRandom.kt
rename to crypto/src/main/java/org/openrs2/crypto/IsaacRandom.kt
index 165486dd8e..df561ab38e 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/IsaacRandom.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/IsaacRandom.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 public class IsaacRandom {
     private var count = 0
diff --git a/crypto/src/main/java/dev/openrs2/crypto/Pkcs12KeyStore.kt b/crypto/src/main/java/org/openrs2/crypto/Pkcs12KeyStore.kt
similarity index 98%
rename from crypto/src/main/java/dev/openrs2/crypto/Pkcs12KeyStore.kt
rename to crypto/src/main/java/org/openrs2/crypto/Pkcs12KeyStore.kt
index 415baf0aa6..7f26d6b730 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/Pkcs12KeyStore.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/Pkcs12KeyStore.kt
@@ -1,6 +1,5 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
-import dev.openrs2.util.io.useAtomicOutputStream
 import jdk.security.jarsigner.JarSigner
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers
@@ -12,6 +11,7 @@ import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
 import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory
 import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder
 import org.bouncycastle.util.BigIntegers
+import org.openrs2.util.io.useAtomicOutputStream
 import java.io.OutputStream
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/crypto/src/main/java/dev/openrs2/crypto/Rsa.kt b/crypto/src/main/java/org/openrs2/crypto/Rsa.kt
similarity index 98%
rename from crypto/src/main/java/dev/openrs2/crypto/Rsa.kt
rename to crypto/src/main/java/org/openrs2/crypto/Rsa.kt
index 781ea3bf68..3bb6cf9134 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/Rsa.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/Rsa.kt
@@ -1,6 +1,5 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
-import dev.openrs2.util.io.useAtomicBufferedWriter
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.Unpooled
@@ -21,6 +20,7 @@ import org.bouncycastle.util.BigIntegers
 import org.bouncycastle.util.io.pem.PemObject
 import org.bouncycastle.util.io.pem.PemReader
 import org.bouncycastle.util.io.pem.PemWriter
+import org.openrs2.util.io.useAtomicBufferedWriter
 import java.io.IOException
 import java.math.BigInteger
 import java.nio.file.Files
diff --git a/crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt b/crypto/src/main/java/org/openrs2/crypto/RsaKeyProvider.kt
similarity index 95%
rename from crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt
rename to crypto/src/main/java/org/openrs2/crypto/RsaKeyProvider.kt
index bc36df5818..9f9be8d844 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/RsaKeyProvider.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters
 import java.nio.file.Files
diff --git a/crypto/src/main/java/dev/openrs2/crypto/ThreadLocalSecureRandom.kt b/crypto/src/main/java/org/openrs2/crypto/ThreadLocalSecureRandom.kt
similarity index 86%
rename from crypto/src/main/java/dev/openrs2/crypto/ThreadLocalSecureRandom.kt
rename to crypto/src/main/java/org/openrs2/crypto/ThreadLocalSecureRandom.kt
index 017f7a6552..14770921d1 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/ThreadLocalSecureRandom.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/ThreadLocalSecureRandom.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import java.security.SecureRandom
 
diff --git a/crypto/src/main/java/dev/openrs2/crypto/Whirlpool.kt b/crypto/src/main/java/org/openrs2/crypto/Whirlpool.kt
similarity index 99%
rename from crypto/src/main/java/dev/openrs2/crypto/Whirlpool.kt
rename to crypto/src/main/java/org/openrs2/crypto/Whirlpool.kt
index c79a0d815d..4ada9500c0 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/Whirlpool.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/Whirlpool.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 public class Whirlpool {
     private val bitLength = ByteArray(32)
diff --git a/crypto/src/main/java/dev/openrs2/crypto/Xtea.kt b/crypto/src/main/java/org/openrs2/crypto/Xtea.kt
similarity index 99%
rename from crypto/src/main/java/dev/openrs2/crypto/Xtea.kt
rename to crypto/src/main/java/org/openrs2/crypto/Xtea.kt
index d38c1a2014..a8a5593666 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/Xtea.kt
+++ b/crypto/src/main/java/org/openrs2/crypto/Xtea.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import io.netty.buffer.ByteBuf
 
diff --git a/crypto/src/test/java/dev/openrs2/crypto/IsaacRandomTest.kt b/crypto/src/test/java/org/openrs2/crypto/IsaacRandomTest.kt
similarity index 98%
rename from crypto/src/test/java/dev/openrs2/crypto/IsaacRandomTest.kt
rename to crypto/src/test/java/org/openrs2/crypto/IsaacRandomTest.kt
index 273611ed36..9a2fa0f262 100644
--- a/crypto/src/test/java/dev/openrs2/crypto/IsaacRandomTest.kt
+++ b/crypto/src/test/java/org/openrs2/crypto/IsaacRandomTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
diff --git a/crypto/src/test/java/dev/openrs2/crypto/RsaTest.kt b/crypto/src/test/java/org/openrs2/crypto/RsaTest.kt
similarity index 98%
rename from crypto/src/test/java/dev/openrs2/crypto/RsaTest.kt
rename to crypto/src/test/java/org/openrs2/crypto/RsaTest.kt
index c476e8c464..6e10a4ca46 100644
--- a/crypto/src/test/java/dev/openrs2/crypto/RsaTest.kt
+++ b/crypto/src/test/java/org/openrs2/crypto/RsaTest.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
-import dev.openrs2.buffer.use
-import dev.openrs2.util.io.useTempFile
 import io.netty.buffer.Unpooled
 import org.bouncycastle.crypto.params.RSAKeyParameters
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters
 import org.bouncycastle.util.Properties
+import org.openrs2.buffer.use
+import org.openrs2.util.io.useTempFile
 import java.math.BigInteger
 import java.nio.file.Files
 import kotlin.test.Test
diff --git a/crypto/src/test/java/dev/openrs2/crypto/WhirlpoolTest.kt b/crypto/src/test/java/org/openrs2/crypto/WhirlpoolTest.kt
similarity index 99%
rename from crypto/src/test/java/dev/openrs2/crypto/WhirlpoolTest.kt
rename to crypto/src/test/java/org/openrs2/crypto/WhirlpoolTest.kt
index 2ea1f6405c..6a82095b08 100644
--- a/crypto/src/test/java/dev/openrs2/crypto/WhirlpoolTest.kt
+++ b/crypto/src/test/java/org/openrs2/crypto/WhirlpoolTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
 import io.netty.buffer.ByteBufUtil
 import org.junit.jupiter.api.Assertions.assertArrayEquals
diff --git a/crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt b/crypto/src/test/java/org/openrs2/crypto/XteaTest.kt
similarity index 97%
rename from crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt
rename to crypto/src/test/java/org/openrs2/crypto/XteaTest.kt
index 3c00bbbb1c..add5a41c9f 100644
--- a/crypto/src/test/java/dev/openrs2/crypto/XteaTest.kt
+++ b/crypto/src/test/java/org/openrs2/crypto/XteaTest.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.crypto
+package org.openrs2.crypto
 
-import dev.openrs2.buffer.use
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.Unpooled
+import org.openrs2.buffer.use
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/crypto/src/test/resources/dev/openrs2/crypto/isaac/noseedvect.txt b/crypto/src/test/resources/org/openrs2/crypto/isaac/noseedvect.txt
similarity index 100%
rename from crypto/src/test/resources/dev/openrs2/crypto/isaac/noseedvect.txt
rename to crypto/src/test/resources/org/openrs2/crypto/isaac/noseedvect.txt
diff --git a/crypto/src/test/resources/dev/openrs2/crypto/isaac/randvect.txt b/crypto/src/test/resources/org/openrs2/crypto/isaac/randvect.txt
similarity index 100%
rename from crypto/src/test/resources/dev/openrs2/crypto/isaac/randvect.txt
rename to crypto/src/test/resources/org/openrs2/crypto/isaac/randvect.txt
diff --git a/crypto/src/test/resources/dev/openrs2/crypto/isaac/seedvect.txt b/crypto/src/test/resources/org/openrs2/crypto/isaac/seedvect.txt
similarity index 100%
rename from crypto/src/test/resources/dev/openrs2/crypto/isaac/seedvect.txt
rename to crypto/src/test/resources/org/openrs2/crypto/isaac/seedvect.txt
diff --git a/crypto/src/test/resources/dev/openrs2/crypto/whirlpool/nessie-one-vectors.txt b/crypto/src/test/resources/org/openrs2/crypto/whirlpool/nessie-one-vectors.txt
similarity index 100%
rename from crypto/src/test/resources/dev/openrs2/crypto/whirlpool/nessie-one-vectors.txt
rename to crypto/src/test/resources/org/openrs2/crypto/whirlpool/nessie-one-vectors.txt
diff --git a/crypto/src/test/resources/dev/openrs2/crypto/whirlpool/nessie-zero-vectors.txt b/crypto/src/test/resources/org/openrs2/crypto/whirlpool/nessie-zero-vectors.txt
similarity index 100%
rename from crypto/src/test/resources/dev/openrs2/crypto/whirlpool/nessie-zero-vectors.txt
rename to crypto/src/test/resources/org/openrs2/crypto/whirlpool/nessie-zero-vectors.txt
diff --git a/db/src/main/java/dev/openrs2/db/BackoffStrategy.kt b/db/src/main/java/org/openrs2/db/BackoffStrategy.kt
similarity index 95%
rename from db/src/main/java/dev/openrs2/db/BackoffStrategy.kt
rename to db/src/main/java/org/openrs2/db/BackoffStrategy.kt
index eea691a8c6..78956b8efa 100644
--- a/db/src/main/java/dev/openrs2/db/BackoffStrategy.kt
+++ b/db/src/main/java/org/openrs2/db/BackoffStrategy.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 /**
  * A functional interface for calculating the delay before a transaction is
diff --git a/db/src/main/java/dev/openrs2/db/BinaryExponentialBackoffStrategy.kt b/db/src/main/java/org/openrs2/db/BinaryExponentialBackoffStrategy.kt
similarity index 97%
rename from db/src/main/java/dev/openrs2/db/BinaryExponentialBackoffStrategy.kt
rename to db/src/main/java/org/openrs2/db/BinaryExponentialBackoffStrategy.kt
index 0914c9615f..38e4b726fe 100644
--- a/db/src/main/java/dev/openrs2/db/BinaryExponentialBackoffStrategy.kt
+++ b/db/src/main/java/org/openrs2/db/BinaryExponentialBackoffStrategy.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import com.google.common.math.IntMath
 import java.util.concurrent.ThreadLocalRandom
diff --git a/db/src/main/java/dev/openrs2/db/Database.kt b/db/src/main/java/org/openrs2/db/Database.kt
similarity index 99%
rename from db/src/main/java/dev/openrs2/db/Database.kt
rename to db/src/main/java/org/openrs2/db/Database.kt
index 26edba1a9d..6525189382 100644
--- a/db/src/main/java/dev/openrs2/db/Database.kt
+++ b/db/src/main/java/org/openrs2/db/Database.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
diff --git a/db/src/main/java/dev/openrs2/db/DeadlockDetector.kt b/db/src/main/java/org/openrs2/db/DeadlockDetector.kt
similarity index 96%
rename from db/src/main/java/dev/openrs2/db/DeadlockDetector.kt
rename to db/src/main/java/org/openrs2/db/DeadlockDetector.kt
index 1b996014f9..cfd2e9a6b8 100644
--- a/db/src/main/java/dev/openrs2/db/DeadlockDetector.kt
+++ b/db/src/main/java/org/openrs2/db/DeadlockDetector.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 
diff --git a/db/src/main/java/dev/openrs2/db/DefaultDeadlockDetector.kt b/db/src/main/java/org/openrs2/db/DefaultDeadlockDetector.kt
similarity index 95%
rename from db/src/main/java/dev/openrs2/db/DefaultDeadlockDetector.kt
rename to db/src/main/java/org/openrs2/db/DefaultDeadlockDetector.kt
index 5901285af5..72c739cafe 100644
--- a/db/src/main/java/dev/openrs2/db/DefaultDeadlockDetector.kt
+++ b/db/src/main/java/org/openrs2/db/DefaultDeadlockDetector.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 
diff --git a/db/src/main/java/dev/openrs2/db/FixedBackoffStrategy.kt b/db/src/main/java/org/openrs2/db/FixedBackoffStrategy.kt
similarity index 96%
rename from db/src/main/java/dev/openrs2/db/FixedBackoffStrategy.kt
rename to db/src/main/java/org/openrs2/db/FixedBackoffStrategy.kt
index 37be958a32..99b9c209d0 100644
--- a/db/src/main/java/dev/openrs2/db/FixedBackoffStrategy.kt
+++ b/db/src/main/java/org/openrs2/db/FixedBackoffStrategy.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 /**
  * A [BackoffStrategy] with a fixed delay.
diff --git a/db/src/main/java/dev/openrs2/db/H2DeadlockDetector.kt b/db/src/main/java/org/openrs2/db/H2DeadlockDetector.kt
similarity index 95%
rename from db/src/main/java/dev/openrs2/db/H2DeadlockDetector.kt
rename to db/src/main/java/org/openrs2/db/H2DeadlockDetector.kt
index 87bed1d3da..b046ca8353 100644
--- a/db/src/main/java/dev/openrs2/db/H2DeadlockDetector.kt
+++ b/db/src/main/java/org/openrs2/db/H2DeadlockDetector.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 
diff --git a/db/src/main/java/dev/openrs2/db/MysqlDeadlockDetector.kt b/db/src/main/java/org/openrs2/db/MysqlDeadlockDetector.kt
similarity index 95%
rename from db/src/main/java/dev/openrs2/db/MysqlDeadlockDetector.kt
rename to db/src/main/java/org/openrs2/db/MysqlDeadlockDetector.kt
index a3d2d82285..ce0606ee25 100644
--- a/db/src/main/java/dev/openrs2/db/MysqlDeadlockDetector.kt
+++ b/db/src/main/java/org/openrs2/db/MysqlDeadlockDetector.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 
diff --git a/db/src/main/java/dev/openrs2/db/PostgresDeadlockDetector.kt b/db/src/main/java/org/openrs2/db/PostgresDeadlockDetector.kt
similarity index 95%
rename from db/src/main/java/dev/openrs2/db/PostgresDeadlockDetector.kt
rename to db/src/main/java/org/openrs2/db/PostgresDeadlockDetector.kt
index 11a1d5e201..f5436fc0d4 100644
--- a/db/src/main/java/dev/openrs2/db/PostgresDeadlockDetector.kt
+++ b/db/src/main/java/org/openrs2/db/PostgresDeadlockDetector.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 
diff --git a/db/src/main/java/dev/openrs2/db/SqliteDeadlockDetector.kt b/db/src/main/java/org/openrs2/db/SqliteDeadlockDetector.kt
similarity index 98%
rename from db/src/main/java/dev/openrs2/db/SqliteDeadlockDetector.kt
rename to db/src/main/java/org/openrs2/db/SqliteDeadlockDetector.kt
index 84dcd60d90..9209531176 100644
--- a/db/src/main/java/dev/openrs2/db/SqliteDeadlockDetector.kt
+++ b/db/src/main/java/org/openrs2/db/SqliteDeadlockDetector.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 
diff --git a/db/src/main/java/dev/openrs2/db/Transaction.kt b/db/src/main/java/org/openrs2/db/Transaction.kt
similarity index 97%
rename from db/src/main/java/dev/openrs2/db/Transaction.kt
rename to db/src/main/java/org/openrs2/db/Transaction.kt
index bfc8637f69..85b33ff84f 100644
--- a/db/src/main/java/dev/openrs2/db/Transaction.kt
+++ b/db/src/main/java/org/openrs2/db/Transaction.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.Connection
 
diff --git a/db/src/test/java/dev/openrs2/db/BackoffStrategyTest.kt b/db/src/test/java/org/openrs2/db/BackoffStrategyTest.kt
similarity index 97%
rename from db/src/test/java/dev/openrs2/db/BackoffStrategyTest.kt
rename to db/src/test/java/org/openrs2/db/BackoffStrategyTest.kt
index 5a38770871..66533ee3a2 100644
--- a/db/src/test/java/dev/openrs2/db/BackoffStrategyTest.kt
+++ b/db/src/test/java/org/openrs2/db/BackoffStrategyTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.Test
diff --git a/db/src/test/java/dev/openrs2/db/DatabaseTest.kt b/db/src/test/java/org/openrs2/db/DatabaseTest.kt
similarity index 99%
rename from db/src/test/java/dev/openrs2/db/DatabaseTest.kt
rename to db/src/test/java/org/openrs2/db/DatabaseTest.kt
index 0eec938a7a..5cf80770b5 100644
--- a/db/src/test/java/dev/openrs2/db/DatabaseTest.kt
+++ b/db/src/test/java/org/openrs2/db/DatabaseTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
diff --git a/db/src/test/java/dev/openrs2/db/DeadlockDetectorTest.kt b/db/src/test/java/org/openrs2/db/DeadlockDetectorTest.kt
similarity index 98%
rename from db/src/test/java/dev/openrs2/db/DeadlockDetectorTest.kt
rename to db/src/test/java/org/openrs2/db/DeadlockDetectorTest.kt
index 308d6c4d10..24cccc225a 100644
--- a/db/src/test/java/dev/openrs2/db/DeadlockDetectorTest.kt
+++ b/db/src/test/java/org/openrs2/db/DeadlockDetectorTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.db
+package org.openrs2.db
 
 import java.sql.SQLException
 import kotlin.test.Test
diff --git a/decompiler/build.gradle.kts b/decompiler/build.gradle.kts
index 19ab8e1f79..d3d2d92aae 100644
--- a/decompiler/build.gradle.kts
+++ b/decompiler/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.decompiler.DecompileCommandKt"
+    mainClassName = "org.openrs2.decompiler.DecompileCommandKt"
     applicationDefaultJvmArgs = listOf("-Xmx3G")
 }
 
@@ -14,7 +14,7 @@ dependencies {
 
     implementation(project(":deob-util"))
     implementation(project(":util"))
-    implementation("dev.openrs2:fernflower:${Versions.fernflower}")
+    implementation("org.openrs2:fernflower:${Versions.fernflower}")
 }
 
 publishing {
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt b/decompiler/src/main/java/org/openrs2/decompiler/DecompileCommand.kt
similarity index 81%
rename from decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt
rename to decompiler/src/main/java/org/openrs2/decompiler/DecompileCommand.kt
index 8ae3ff0fb2..e4ecb2c409 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt
+++ b/decompiler/src/main/java/org/openrs2/decompiler/DecompileCommand.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.decompiler
+package org.openrs2.decompiler
 
 import com.github.ajalt.clikt.core.CliktCommand
-import dev.openrs2.deob.util.Module
+import org.openrs2.deob.util.Module
 
 public fun main(args: Array<String>): Unit = DecompileCommand().main(args)
 
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt b/decompiler/src/main/java/org/openrs2/decompiler/Decompiler.kt
similarity index 92%
rename from decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt
rename to decompiler/src/main/java/org/openrs2/decompiler/Decompiler.kt
index e52715d9da..ff768b76ec 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt
+++ b/decompiler/src/main/java/org/openrs2/decompiler/Decompiler.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.decompiler
+package org.openrs2.decompiler
 
-import dev.openrs2.deob.util.Module
 import org.jetbrains.java.decompiler.main.Fernflower
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences
+import org.openrs2.deob.util.Module
 
 public class Decompiler(private val modules: Set<Module>) {
     public fun run() {
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt b/decompiler/src/main/java/org/openrs2/decompiler/DecompilerIo.kt
similarity index 96%
rename from decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt
rename to decompiler/src/main/java/org/openrs2/decompiler/DecompilerIo.kt
index 17c458ab1d..790a47361f 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt
+++ b/decompiler/src/main/java/org/openrs2/decompiler/DecompilerIo.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.decompiler
+package org.openrs2.decompiler
 
-import dev.openrs2.util.io.useAtomicBufferedWriter
 import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider
 import org.jetbrains.java.decompiler.main.extern.IResultSaver
+import org.openrs2.util.io.useAtomicBufferedWriter
 import java.io.Closeable
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/Library.kt b/decompiler/src/main/java/org/openrs2/decompiler/Library.kt
similarity index 84%
rename from decompiler/src/main/java/dev/openrs2/decompiler/Library.kt
rename to decompiler/src/main/java/org/openrs2/decompiler/Library.kt
index d350f49b16..10deb4b65c 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/Library.kt
+++ b/decompiler/src/main/java/org/openrs2/decompiler/Library.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.decompiler
+package org.openrs2.decompiler
 
 import java.nio.file.Path
 
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/Slf4jFernflowerLogger.kt b/decompiler/src/main/java/org/openrs2/decompiler/Slf4jFernflowerLogger.kt
similarity index 97%
rename from decompiler/src/main/java/dev/openrs2/decompiler/Slf4jFernflowerLogger.kt
rename to decompiler/src/main/java/org/openrs2/decompiler/Slf4jFernflowerLogger.kt
index a264655aec..2bd7534c91 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/Slf4jFernflowerLogger.kt
+++ b/decompiler/src/main/java/org/openrs2/decompiler/Slf4jFernflowerLogger.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.decompiler
+package org.openrs2.decompiler
 
 import com.github.michaelbull.logging.InlineLogger
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger
diff --git a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalArg.java b/deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalArg.java
similarity index 81%
rename from deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalArg.java
rename to deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalArg.java
index 1b287881e0..3dac78efdb 100644
--- a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalArg.java
+++ b/deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalArg.java
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.annotation;
+package org.openrs2.deob.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalClass.java b/deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalClass.java
similarity index 81%
rename from deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalClass.java
rename to deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalClass.java
index b91a8b3bc9..0b85e3cea7 100644
--- a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalClass.java
+++ b/deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalClass.java
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.annotation;
+package org.openrs2.deob.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalMember.java b/deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalMember.java
similarity index 86%
rename from deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalMember.java
rename to deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalMember.java
index 9a3c88cea4..db3d0dde07 100644
--- a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/OriginalMember.java
+++ b/deob-annotations/src/main/java/org/openrs2/deob/annotation/OriginalMember.java
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.annotation;
+package org.openrs2.deob.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/Pc.java b/deob-annotations/src/main/java/org/openrs2/deob/annotation/Pc.java
similarity index 83%
rename from deob-annotations/src/main/java/dev/openrs2/deob/annotation/Pc.java
rename to deob-annotations/src/main/java/org/openrs2/deob/annotation/Pc.java
index 775f7188c7..c05f99f514 100644
--- a/deob-annotations/src/main/java/dev/openrs2/deob/annotation/Pc.java
+++ b/deob-annotations/src/main/java/org/openrs2/deob/annotation/Pc.java
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.annotation;
+package org.openrs2.deob.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/deob-ast/build.gradle.kts b/deob-ast/build.gradle.kts
index b549dfd43b..8f6edfc2d3 100644
--- a/deob-ast/build.gradle.kts
+++ b/deob-ast/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.deob.ast.DeobfuscateAstCommandKt"
+    mainClassName = "org.openrs2.deob.ast.DeobfuscateAstCommandKt"
 }
 
 dependencies {
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/AstDeobfuscator.kt
similarity index 85%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/AstDeobfuscator.kt
index 7b3225db60..05da0162f6 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/AstDeobfuscator.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.deob.ast
+package org.openrs2.deob.ast
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.deob.ast.transform.Transformer
-import dev.openrs2.deob.util.Module
+import org.openrs2.deob.ast.transform.Transformer
+import org.openrs2.deob.util.Module
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscatorModule.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/AstDeobfuscatorModule.kt
similarity index 56%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscatorModule.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/AstDeobfuscatorModule.kt
index 01a943821b..d03336d251 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscatorModule.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/AstDeobfuscatorModule.kt
@@ -1,30 +1,30 @@
-package dev.openrs2.deob.ast
+package org.openrs2.deob.ast
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
 import com.google.inject.multibindings.Multibinder
-import dev.openrs2.deob.ast.gl.GlRegistry
-import dev.openrs2.deob.ast.gl.GlRegistryProvider
-import dev.openrs2.deob.ast.transform.AddSubTransformer
-import dev.openrs2.deob.ast.transform.BinaryExprOrderTransformer
-import dev.openrs2.deob.ast.transform.BitMaskTransformer
-import dev.openrs2.deob.ast.transform.CharLiteralTransformer
-import dev.openrs2.deob.ast.transform.ComplementTransformer
-import dev.openrs2.deob.ast.transform.EncloseTransformer
-import dev.openrs2.deob.ast.transform.ForLoopConditionTransformer
-import dev.openrs2.deob.ast.transform.GlTransformer
-import dev.openrs2.deob.ast.transform.HexLiteralTransformer
-import dev.openrs2.deob.ast.transform.IdentityTransformer
-import dev.openrs2.deob.ast.transform.IfElseTransformer
-import dev.openrs2.deob.ast.transform.IncrementTransformer
-import dev.openrs2.deob.ast.transform.NegativeLiteralTransformer
-import dev.openrs2.deob.ast.transform.NewInstanceTransformer
-import dev.openrs2.deob.ast.transform.NotTransformer
-import dev.openrs2.deob.ast.transform.RedundantCastTransformer
-import dev.openrs2.deob.ast.transform.TernaryTransformer
-import dev.openrs2.deob.ast.transform.Transformer
-import dev.openrs2.deob.ast.transform.UnencloseTransformer
-import dev.openrs2.deob.ast.transform.ValueOfTransformer
+import org.openrs2.deob.ast.gl.GlRegistry
+import org.openrs2.deob.ast.gl.GlRegistryProvider
+import org.openrs2.deob.ast.transform.AddSubTransformer
+import org.openrs2.deob.ast.transform.BinaryExprOrderTransformer
+import org.openrs2.deob.ast.transform.BitMaskTransformer
+import org.openrs2.deob.ast.transform.CharLiteralTransformer
+import org.openrs2.deob.ast.transform.ComplementTransformer
+import org.openrs2.deob.ast.transform.EncloseTransformer
+import org.openrs2.deob.ast.transform.ForLoopConditionTransformer
+import org.openrs2.deob.ast.transform.GlTransformer
+import org.openrs2.deob.ast.transform.HexLiteralTransformer
+import org.openrs2.deob.ast.transform.IdentityTransformer
+import org.openrs2.deob.ast.transform.IfElseTransformer
+import org.openrs2.deob.ast.transform.IncrementTransformer
+import org.openrs2.deob.ast.transform.NegativeLiteralTransformer
+import org.openrs2.deob.ast.transform.NewInstanceTransformer
+import org.openrs2.deob.ast.transform.NotTransformer
+import org.openrs2.deob.ast.transform.RedundantCastTransformer
+import org.openrs2.deob.ast.transform.TernaryTransformer
+import org.openrs2.deob.ast.transform.Transformer
+import org.openrs2.deob.ast.transform.UnencloseTransformer
+import org.openrs2.deob.ast.transform.ValueOfTransformer
 
 public object AstDeobfuscatorModule : AbstractModule() {
     override fun configure() {
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/DeobfuscateAstCommand.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/DeobfuscateAstCommand.kt
similarity index 87%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/DeobfuscateAstCommand.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/DeobfuscateAstCommand.kt
index cebcc19cf8..6105161e82 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/DeobfuscateAstCommand.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/DeobfuscateAstCommand.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.deob.ast
+package org.openrs2.deob.ast
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
-import dev.openrs2.deob.util.Module
+import org.openrs2.deob.util.Module
 
 public fun main(args: Array<String>): Unit = DeobfuscateAstCommand().main(args)
 
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/Library.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/Library.kt
similarity index 97%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/Library.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/Library.kt
index b49646fa5e..b1983915de 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/Library.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/Library.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast
+package org.openrs2.deob.ast
 
 import com.github.javaparser.ParserConfiguration
 import com.github.javaparser.ast.CompilationUnit
@@ -10,7 +10,7 @@ import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSol
 import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver
 import com.github.javaparser.utils.SourceRoot
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.deob.util.Module
+import org.openrs2.deob.util.Module
 import java.util.function.Function
 
 public class Library(
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/LibraryGroup.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/LibraryGroup.kt
similarity index 92%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/LibraryGroup.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/LibraryGroup.kt
index 77acf68694..8c01bbabc4 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/LibraryGroup.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/LibraryGroup.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast
+package org.openrs2.deob.ast
 
 public class LibraryGroup(libraries: Iterable<Library>) : Iterable<Library> {
     private val libraries = libraries.associateBy { it.name }
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/gl/GlRegistry.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/gl/GlRegistry.kt
similarity index 99%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/gl/GlRegistry.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/gl/GlRegistry.kt
index 05ecf0707a..37df668715 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/gl/GlRegistry.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/gl/GlRegistry.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.gl
+package org.openrs2.deob.ast.gl
 
 import com.google.common.collect.HashMultimap
 import com.google.common.collect.ImmutableSetMultimap
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/gl/GlRegistryProvider.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/gl/GlRegistryProvider.kt
similarity index 92%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/gl/GlRegistryProvider.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/gl/GlRegistryProvider.kt
index b4dd602159..a3ced2bafb 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/gl/GlRegistryProvider.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/gl/GlRegistryProvider.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.gl
+package org.openrs2.deob.ast.gl
 
 import java.nio.file.Files
 import java.nio.file.Paths
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/AddSubTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/AddSubTransformer.kt
similarity index 93%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/AddSubTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/AddSubTransformer.kt
index 0da53e8067..84a0a174d7 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/AddSubTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/AddSubTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
@@ -7,12 +7,12 @@ import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.hasSideEffects
-import dev.openrs2.deob.ast.util.isString
-import dev.openrs2.deob.ast.util.negate
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.hasSideEffects
+import org.openrs2.deob.ast.util.isString
+import org.openrs2.deob.ast.util.negate
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
similarity index 82%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
index 450ca38e20..66543dccea 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.LiteralExpr
 import com.github.javaparser.ast.expr.ThisExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.flip
-import dev.openrs2.deob.ast.util.isString
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.flip
+import org.openrs2.deob.ast.util.isString
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/BitMaskTransformer.kt
similarity index 93%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/BitMaskTransformer.kt
index 1938ade941..01fdf49ff4 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/BitMaskTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.checkedAsInt
-import dev.openrs2.deob.ast.util.checkedAsLong
-import dev.openrs2.deob.ast.util.toLongLiteralExpr
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.checkedAsInt
+import org.openrs2.deob.ast.util.checkedAsLong
+import org.openrs2.deob.ast.util.toLongLiteralExpr
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/CharLiteralTransformer.kt
similarity index 94%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/CharLiteralTransformer.kt
index 0cec6fe1d5..135a53d0ce 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/CharLiteralTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.AssignExpr
@@ -14,10 +14,10 @@ import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.resolution.types.ResolvedPrimitiveType
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.checkedAsInt
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.checkedAsInt
+import org.openrs2.deob.ast.util.walk
 import java.lang.Character.CONTROL
 import java.lang.Character.FORMAT
 import java.lang.Character.LINE_SEPARATOR
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/ComplementTransformer.kt
similarity index 86%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/ComplementTransformer.kt
index 185a58bc11..087b87bf0d 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/ComplementTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
@@ -6,13 +6,13 @@ import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.checkedAsInt
-import dev.openrs2.deob.ast.util.checkedAsLong
-import dev.openrs2.deob.ast.util.isIntegerOrLongLiteral
-import dev.openrs2.deob.ast.util.toLongLiteralExpr
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.checkedAsInt
+import org.openrs2.deob.ast.util.checkedAsLong
+import org.openrs2.deob.ast.util.isIntegerOrLongLiteral
+import org.openrs2.deob.ast.util.toLongLiteralExpr
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/EncloseTransformer.kt
similarity index 97%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/EncloseTransformer.kt
index f9fdee4488..e88c5a961a 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/EncloseTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.ArrayAccessExpr
@@ -14,9 +14,9 @@ import com.github.javaparser.ast.expr.InstanceOfExpr
 import com.github.javaparser.ast.expr.MethodCallExpr
 import com.github.javaparser.ast.expr.ObjectCreationExpr
 import com.github.javaparser.ast.expr.UnaryExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
similarity index 88%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
index b4e4050923..2abd8139a3 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.AssignExpr
@@ -10,11 +10,11 @@ import com.github.javaparser.ast.expr.UnaryExpr.Operator.POSTFIX_INCREMENT
 import com.github.javaparser.ast.expr.UnaryExpr.Operator.PREFIX_DECREMENT
 import com.github.javaparser.ast.expr.UnaryExpr.Operator.PREFIX_INCREMENT
 import com.github.javaparser.ast.stmt.ForStmt
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.flip
-import dev.openrs2.deob.ast.util.hasSideEffects
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.flip
+import org.openrs2.deob.ast.util.hasSideEffects
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/GlTransformer.kt
similarity index 96%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/GlTransformer.kt
index 8d55d9164e..6530672f86 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/GlTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.NodeList
@@ -22,15 +22,15 @@ import com.github.javaparser.resolution.types.ResolvedPrimitiveType
 import com.github.javaparser.resolution.types.ResolvedReferenceType
 import com.github.javaparser.resolution.types.ResolvedType
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.gl.GlCommand
-import dev.openrs2.deob.ast.gl.GlEnum
-import dev.openrs2.deob.ast.gl.GlParameter
-import dev.openrs2.deob.ast.gl.GlRegistry
-import dev.openrs2.deob.ast.util.checkedAsInt
-import dev.openrs2.deob.ast.util.toHexLiteralExpr
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.gl.GlCommand
+import org.openrs2.deob.ast.gl.GlEnum
+import org.openrs2.deob.ast.gl.GlParameter
+import org.openrs2.deob.ast.gl.GlRegistry
+import org.openrs2.deob.ast.util.checkedAsInt
+import org.openrs2.deob.ast.util.toHexLiteralExpr
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/HexLiteralTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/HexLiteralTransformer.kt
similarity index 82%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/HexLiteralTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/HexLiteralTransformer.kt
index b3eb535076..45e763285b 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/HexLiteralTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/HexLiteralTransformer.kt
@@ -1,16 +1,16 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.checkedAsInt
-import dev.openrs2.deob.ast.util.checkedAsLong
-import dev.openrs2.deob.ast.util.toHexLiteralExpr
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.checkedAsInt
+import org.openrs2.deob.ast.util.checkedAsLong
+import org.openrs2.deob.ast.util.toHexLiteralExpr
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IdentityTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/IdentityTransformer.kt
similarity index 95%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IdentityTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/IdentityTransformer.kt
index aab7290abb..a783cac8d2 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IdentityTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/IdentityTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.AssignExpr
@@ -8,9 +8,9 @@ import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.ast.stmt.ExpressionStmt
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/IfElseTransformer.kt
similarity index 98%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/IfElseTransformer.kt
index 985316b8eb..49271b0628 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/IfElseTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.NodeList
@@ -11,11 +11,11 @@ import com.github.javaparser.ast.stmt.ReturnStmt
 import com.github.javaparser.ast.stmt.Statement
 import com.github.javaparser.ast.stmt.ThrowStmt
 import com.github.javaparser.ast.type.VoidType
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.countNots
-import dev.openrs2.deob.ast.util.not
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.countNots
+import org.openrs2.deob.ast.util.not
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IncrementTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/IncrementTransformer.kt
similarity index 88%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IncrementTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/IncrementTransformer.kt
index b35812c7d4..fef0169a5e 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IncrementTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/IncrementTransformer.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.ast.stmt.ExpressionStmt
 import com.github.javaparser.ast.stmt.ForStmt
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
similarity index 74%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
index 55626acd8b..f3e1030dc8 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.UnaryExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.isIntegerOrLongLiteral
-import dev.openrs2.deob.ast.util.negate
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.isIntegerOrLongLiteral
+import org.openrs2.deob.ast.util.negate
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/NewInstanceTransformer.kt
similarity index 77%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/NewInstanceTransformer.kt
index 07999f403a..a61d3f9dc3 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/NewInstanceTransformer.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.MethodCallExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.isClass
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.isClass
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NotTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/NotTransformer.kt
similarity index 91%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NotTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/NotTransformer.kt
index 204dccce19..bba8aea505 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NotTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/NotTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
@@ -8,10 +8,10 @@ import com.github.javaparser.ast.expr.BooleanLiteralExpr
 import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.ast.expr.UnaryExpr.Operator.LOGICAL_COMPLEMENT
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.not
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.not
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/RedundantCastTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt
similarity index 97%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/RedundantCastTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt
index 1d772324c8..83a7777522 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/RedundantCastTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.AssignExpr
@@ -19,9 +19,9 @@ import com.github.javaparser.resolution.types.ResolvedPrimitiveType.INT
 import com.github.javaparser.resolution.types.ResolvedPrimitiveType.LONG
 import com.github.javaparser.resolution.types.ResolvedPrimitiveType.SHORT
 import com.google.common.collect.ImmutableSetMultimap
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/TernaryTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/TernaryTransformer.kt
similarity index 76%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/TernaryTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/TernaryTransformer.kt
index 8a5f817317..a07ad92785 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/TernaryTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/TernaryTransformer.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.ConditionalExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.countNots
-import dev.openrs2.deob.ast.util.not
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.countNots
+import org.openrs2.deob.ast.util.not
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/Transformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/Transformer.kt
similarity index 84%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/Transformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/Transformer.kt
index a858e07368..7a363be33b 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/Transformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/Transformer.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
 
 public abstract class Transformer {
     public fun transform(group: LibraryGroup) {
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/UnencloseTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/UnencloseTransformer.kt
similarity index 71%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/UnencloseTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/UnencloseTransformer.kt
index 0275360cf0..795666f35b 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/UnencloseTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/UnencloseTransformer.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.EnclosedExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ValueOfTransformer.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/ValueOfTransformer.kt
similarity index 79%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ValueOfTransformer.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/transform/ValueOfTransformer.kt
index 3ac58478f4..5cd23106e8 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ValueOfTransformer.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/transform/ValueOfTransformer.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.ast.transform
+package org.openrs2.deob.ast.transform
 
 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.MethodCallExpr
 import com.github.javaparser.ast.expr.ObjectCreationExpr
 import com.github.javaparser.ast.expr.TypeExpr
-import dev.openrs2.deob.ast.Library
-import dev.openrs2.deob.ast.LibraryGroup
-import dev.openrs2.deob.ast.util.walk
+import org.openrs2.deob.ast.Library
+import org.openrs2.deob.ast.LibraryGroup
+import org.openrs2.deob.ast.util.walk
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/util/ExprUtils.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/util/ExprUtils.kt
similarity index 99%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/util/ExprUtils.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/util/ExprUtils.kt
index 1b39d06aba..a5afd3f7c5 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/util/ExprUtils.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/util/ExprUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.util
+package org.openrs2.deob.ast.util
 
 import com.github.javaparser.ast.expr.ArrayAccessExpr
 import com.github.javaparser.ast.expr.BinaryExpr
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/util/NodeUtils.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/util/NodeUtils.kt
similarity index 87%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/util/NodeUtils.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/util/NodeUtils.kt
index 035b4f55e2..974261cbe0 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/util/NodeUtils.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/util/NodeUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.util
+package org.openrs2.deob.ast.util
 
 import com.github.javaparser.ast.Node
 
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/util/TypeUtils.kt b/deob-ast/src/main/java/org/openrs2/deob/ast/util/TypeUtils.kt
similarity index 90%
rename from deob-ast/src/main/java/dev/openrs2/deob/ast/util/TypeUtils.kt
rename to deob-ast/src/main/java/org/openrs2/deob/ast/util/TypeUtils.kt
index 190f172013..461d3acbd9 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/util/TypeUtils.kt
+++ b/deob-ast/src/main/java/org/openrs2/deob/ast/util/TypeUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.ast.util
+package org.openrs2.deob.ast.util
 
 import com.github.javaparser.resolution.types.ResolvedType
 
diff --git a/deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt b/deob-processor/src/main/java/org/openrs2/deob/processor/DeobfuscatorProcessorModule.kt
similarity index 63%
rename from deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt
rename to deob-processor/src/main/java/org/openrs2/deob/processor/DeobfuscatorProcessorModule.kt
index 0ad605061e..97add18ba7 100644
--- a/deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt
+++ b/deob-processor/src/main/java/org/openrs2/deob/processor/DeobfuscatorProcessorModule.kt
@@ -1,8 +1,8 @@
-package dev.openrs2.deob.processor
+package org.openrs2.deob.processor
 
 import com.google.inject.AbstractModule
-import dev.openrs2.deob.util.DeobfuscatorUtilModule
-import dev.openrs2.yaml.YamlModule
+import org.openrs2.deob.util.DeobfuscatorUtilModule
+import org.openrs2.yaml.YamlModule
 
 public object DeobfuscatorProcessorModule : AbstractModule() {
     override fun configure() {
diff --git a/deob-processor/src/main/java/dev/openrs2/deob/processor/LocalVariableScanner.kt b/deob-processor/src/main/java/org/openrs2/deob/processor/LocalVariableScanner.kt
similarity index 88%
rename from deob-processor/src/main/java/dev/openrs2/deob/processor/LocalVariableScanner.kt
rename to deob-processor/src/main/java/org/openrs2/deob/processor/LocalVariableScanner.kt
index 2919b9c442..96fb1e8a8e 100644
--- a/deob-processor/src/main/java/dev/openrs2/deob/processor/LocalVariableScanner.kt
+++ b/deob-processor/src/main/java/org/openrs2/deob/processor/LocalVariableScanner.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.deob.processor
+package org.openrs2.deob.processor
 
 import com.sun.source.tree.VariableTree
 import com.sun.source.util.TreePathScanner
 import com.sun.source.util.Trees
-import dev.openrs2.deob.annotation.Pc
+import org.openrs2.deob.annotation.Pc
 
 public class LocalVariableScanner(private val trees: Trees) : TreePathScanner<Void, MutableMap<Int, String>>() {
     override fun visitVariable(node: VariableTree, p: MutableMap<Int, String>): Void? {
diff --git a/deob-processor/src/main/java/dev/openrs2/deob/processor/NameMapProcessor.kt b/deob-processor/src/main/java/org/openrs2/deob/processor/NameMapProcessor.kt
similarity index 85%
rename from deob-processor/src/main/java/dev/openrs2/deob/processor/NameMapProcessor.kt
rename to deob-processor/src/main/java/org/openrs2/deob/processor/NameMapProcessor.kt
index a2dd60181b..c0f8ae4345 100644
--- a/deob-processor/src/main/java/dev/openrs2/deob/processor/NameMapProcessor.kt
+++ b/deob-processor/src/main/java/org/openrs2/deob/processor/NameMapProcessor.kt
@@ -1,19 +1,19 @@
-package dev.openrs2.deob.processor
+package org.openrs2.deob.processor
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.inject.Guice
 import com.google.inject.Key
 import com.sun.source.util.Trees
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.toInternalClassName
-import dev.openrs2.deob.annotation.OriginalArg
-import dev.openrs2.deob.annotation.OriginalClass
-import dev.openrs2.deob.annotation.OriginalMember
-import dev.openrs2.deob.util.map.Field
-import dev.openrs2.deob.util.map.Method
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.util.io.useAtomicBufferedWriter
-import dev.openrs2.yaml.Yaml
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.toInternalClassName
+import org.openrs2.deob.annotation.OriginalArg
+import org.openrs2.deob.annotation.OriginalClass
+import org.openrs2.deob.annotation.OriginalMember
+import org.openrs2.deob.util.map.Field
+import org.openrs2.deob.util.map.Method
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.util.io.useAtomicBufferedWriter
+import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -30,10 +30,10 @@ import javax.lang.model.element.TypeElement
 import javax.lang.model.element.VariableElement
 
 @SupportedAnnotationTypes(
-    "dev.openrs2.deob.annotation.OriginalArg",
-    "dev.openrs2.deob.annotation.OriginalClass",
-    "dev.openrs2.deob.annotation.OriginalMember",
-    "dev.openrs2.deob.annotation.Pc"
+    "org.openrs2.deob.annotation.OriginalArg",
+    "org.openrs2.deob.annotation.OriginalClass",
+    "org.openrs2.deob.annotation.OriginalMember",
+    "org.openrs2.deob.annotation.Pc"
 )
 @SupportedSourceVersion(SourceVersion.RELEASE_11)
 @SupportedOptions(
diff --git a/deob-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/deob-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index f89b051bad..7d6a73b99e 100644
--- a/deob-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/deob-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-dev.openrs2.deob.processor.NameMapProcessor
+org.openrs2.deob.processor.NameMapProcessor
diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/DeobfuscatorUtilModule.kt b/deob-util/src/main/java/org/openrs2/deob/util/DeobfuscatorUtilModule.kt
similarity index 67%
rename from deob-util/src/main/java/dev/openrs2/deob/util/DeobfuscatorUtilModule.kt
rename to deob-util/src/main/java/org/openrs2/deob/util/DeobfuscatorUtilModule.kt
index 7ae38d918b..d4a9a5e5a9 100644
--- a/deob-util/src/main/java/dev/openrs2/deob/util/DeobfuscatorUtilModule.kt
+++ b/deob-util/src/main/java/org/openrs2/deob/util/DeobfuscatorUtilModule.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.deob.util
+package org.openrs2.deob.util
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
-import dev.openrs2.asm.AsmModule
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.deob.util.map.NameMapProvider
+import org.openrs2.asm.AsmModule
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.deob.util.map.NameMapProvider
 
 public object DeobfuscatorUtilModule : AbstractModule() {
     override fun configure() {
diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/Module.kt b/deob-util/src/main/java/org/openrs2/deob/util/Module.kt
similarity index 96%
rename from deob-util/src/main/java/dev/openrs2/deob/util/Module.kt
rename to deob-util/src/main/java/org/openrs2/deob/util/Module.kt
index ce78223811..ff967331d7 100644
--- a/deob-util/src/main/java/dev/openrs2/deob/util/Module.kt
+++ b/deob-util/src/main/java/org/openrs2/deob/util/Module.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.util
+package org.openrs2.deob.util
 
 import java.nio.file.Path
 import java.nio.file.Paths
diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/map/Field.kt b/deob-util/src/main/java/org/openrs2/deob/util/map/Field.kt
similarity index 64%
rename from deob-util/src/main/java/dev/openrs2/deob/util/map/Field.kt
rename to deob-util/src/main/java/org/openrs2/deob/util/map/Field.kt
index b94c844fa0..f3002ae2c9 100644
--- a/deob-util/src/main/java/dev/openrs2/deob/util/map/Field.kt
+++ b/deob-util/src/main/java/org/openrs2/deob/util/map/Field.kt
@@ -1,3 +1,3 @@
-package dev.openrs2.deob.util.map
+package org.openrs2.deob.util.map
 
 public data class Field(val owner: String, val name: String)
diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/map/Method.kt b/deob-util/src/main/java/org/openrs2/deob/util/map/Method.kt
similarity index 89%
rename from deob-util/src/main/java/dev/openrs2/deob/util/map/Method.kt
rename to deob-util/src/main/java/org/openrs2/deob/util/map/Method.kt
index 3364c832be..6c4a5ed41b 100644
--- a/deob-util/src/main/java/dev/openrs2/deob/util/map/Method.kt
+++ b/deob-util/src/main/java/org/openrs2/deob/util/map/Method.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.util.map
+package org.openrs2.deob.util.map
 
 import java.util.SortedMap
 
diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/map/NameMap.kt b/deob-util/src/main/java/org/openrs2/deob/util/map/NameMap.kt
similarity index 94%
rename from deob-util/src/main/java/dev/openrs2/deob/util/map/NameMap.kt
rename to deob-util/src/main/java/org/openrs2/deob/util/map/NameMap.kt
index 6e6a81284e..ffccb68cc9 100644
--- a/deob-util/src/main/java/dev/openrs2/deob/util/map/NameMap.kt
+++ b/deob-util/src/main/java/org/openrs2/deob/util/map/NameMap.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.deob.util.map
+package org.openrs2.deob.util.map
 
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.util.collect.DisjointSet
+import org.openrs2.asm.MemberRef
+import org.openrs2.util.collect.DisjointSet
 import java.util.SortedMap
 import java.util.TreeMap
 
diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/map/NameMapProvider.kt b/deob-util/src/main/java/org/openrs2/deob/util/map/NameMapProvider.kt
similarity index 94%
rename from deob-util/src/main/java/dev/openrs2/deob/util/map/NameMapProvider.kt
rename to deob-util/src/main/java/org/openrs2/deob/util/map/NameMapProvider.kt
index c0f992d483..6e5d8a40d4 100644
--- a/deob-util/src/main/java/dev/openrs2/deob/util/map/NameMapProvider.kt
+++ b/deob-util/src/main/java/org/openrs2/deob/util/map/NameMapProvider.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.deob.util.map
+package org.openrs2.deob.util.map
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.openrs2.yaml.Yaml
+import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
diff --git a/deob/build.gradle.kts b/deob/build.gradle.kts
index 006e5f109b..21e240f54e 100644
--- a/deob/build.gradle.kts
+++ b/deob/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.deob.DeobfuscateCommandKt"
+    mainClassName = "org.openrs2.deob.DeobfuscateCommandKt"
 }
 
 dependencies {
diff --git a/deob/src/main/java/dev/openrs2/deob/ArgPartition.kt b/deob/src/main/java/dev/openrs2/deob/ArgPartition.kt
deleted file mode 100644
index 7baee802e0..0000000000
--- a/deob/src/main/java/dev/openrs2/deob/ArgPartition.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package dev.openrs2.deob
-
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.util.collect.DisjointSet
-
-public data class ArgPartition(val method: DisjointSet.Partition<MemberRef>, val index: Int)
diff --git a/deob/src/main/java/org/openrs2/deob/ArgPartition.kt b/deob/src/main/java/org/openrs2/deob/ArgPartition.kt
new file mode 100644
index 0000000000..882ad3e8dc
--- /dev/null
+++ b/deob/src/main/java/org/openrs2/deob/ArgPartition.kt
@@ -0,0 +1,6 @@
+package org.openrs2.deob
+
+import org.openrs2.asm.MemberRef
+import org.openrs2.util.collect.DisjointSet
+
+public data class ArgPartition(val method: DisjointSet.Partition<MemberRef>, val index: Int)
diff --git a/deob/src/main/java/dev/openrs2/deob/ArgRef.kt b/deob/src/main/java/org/openrs2/deob/ArgRef.kt
similarity index 53%
rename from deob/src/main/java/dev/openrs2/deob/ArgRef.kt
rename to deob/src/main/java/org/openrs2/deob/ArgRef.kt
index 8bfc11bd38..90687889a9 100644
--- a/deob/src/main/java/dev/openrs2/deob/ArgRef.kt
+++ b/deob/src/main/java/org/openrs2/deob/ArgRef.kt
@@ -1,5 +1,5 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
-import dev.openrs2.asm.MemberRef
+import org.openrs2.asm.MemberRef
 
 public data class ArgRef(val method: MemberRef, val index: Int)
diff --git a/deob/src/main/java/dev/openrs2/deob/DeobfuscateCommand.kt b/deob/src/main/java/org/openrs2/deob/DeobfuscateCommand.kt
similarity index 95%
rename from deob/src/main/java/dev/openrs2/deob/DeobfuscateCommand.kt
rename to deob/src/main/java/org/openrs2/deob/DeobfuscateCommand.kt
index a85f51d787..c5311abfdc 100644
--- a/deob/src/main/java/dev/openrs2/deob/DeobfuscateCommand.kt
+++ b/deob/src/main/java/org/openrs2/deob/DeobfuscateCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
diff --git a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt b/deob/src/main/java/org/openrs2/deob/Deobfuscator.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt
rename to deob/src/main/java/org/openrs2/deob/Deobfuscator.kt
index 813cf739c7..94fd08617a 100644
--- a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt
+++ b/deob/src/main/java/org/openrs2/deob/Deobfuscator.kt
@@ -1,14 +1,14 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.io.JarLibraryReader
-import dev.openrs2.asm.io.JarLibraryWriter
-import dev.openrs2.asm.io.Pack200LibraryReader
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.remap.ClassNamePrefixRemapper
-import dev.openrs2.deob.remap.StripClassNamePrefixRemapper
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+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 java.nio.file.Files
 import java.nio.file.Path
 import javax.inject.Inject
diff --git a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt b/deob/src/main/java/org/openrs2/deob/DeobfuscatorModule.kt
similarity index 57%
rename from deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt
rename to deob/src/main/java/org/openrs2/deob/DeobfuscatorModule.kt
index bfae314d4e..13a4fe861c 100644
--- a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt
+++ b/deob/src/main/java/org/openrs2/deob/DeobfuscatorModule.kt
@@ -1,41 +1,41 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
 import com.google.inject.multibindings.Multibinder
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.BundlerModule
-import dev.openrs2.bundler.transform.ResourceTransformer
-import dev.openrs2.deob.transform.BitShiftTransformer
-import dev.openrs2.deob.transform.BitwiseOpTransformer
-import dev.openrs2.deob.transform.BundlerTransformer
-import dev.openrs2.deob.transform.CanvasTransformer
-import dev.openrs2.deob.transform.ClassLiteralTransformer
-import dev.openrs2.deob.transform.ConstantArgTransformer
-import dev.openrs2.deob.transform.CopyPropagationTransformer
-import dev.openrs2.deob.transform.CounterTransformer
-import dev.openrs2.deob.transform.EmptyClassTransformer
-import dev.openrs2.deob.transform.ExceptionTracingTransformer
-import dev.openrs2.deob.transform.FernflowerExceptionTransformer
-import dev.openrs2.deob.transform.FieldOrderTransformer
-import dev.openrs2.deob.transform.FinalFieldTransformer
-import dev.openrs2.deob.transform.FinalTransformer
-import dev.openrs2.deob.transform.InvokeSpecialTransformer
-import dev.openrs2.deob.transform.MethodOrderTransformer
-import dev.openrs2.deob.transform.MonitorTransformer
-import dev.openrs2.deob.transform.OpaquePredicateTransformer
-import dev.openrs2.deob.transform.OriginalNameTransformer
-import dev.openrs2.deob.transform.OriginalPcRestoreTransformer
-import dev.openrs2.deob.transform.OriginalPcSaveTransformer
-import dev.openrs2.deob.transform.OverrideTransformer
-import dev.openrs2.deob.transform.RedundantGotoTransformer
-import dev.openrs2.deob.transform.RemapTransformer
-import dev.openrs2.deob.transform.ResetTransformer
-import dev.openrs2.deob.transform.UnusedArgTransformer
-import dev.openrs2.deob.transform.UnusedLocalTransformer
-import dev.openrs2.deob.transform.UnusedMethodTransformer
-import dev.openrs2.deob.transform.VisibilityTransformer
-import dev.openrs2.deob.util.DeobfuscatorUtilModule
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.BundlerModule
+import org.openrs2.bundler.transform.ResourceTransformer
+import org.openrs2.deob.transform.BitShiftTransformer
+import org.openrs2.deob.transform.BitwiseOpTransformer
+import org.openrs2.deob.transform.BundlerTransformer
+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.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.util.DeobfuscatorUtilModule
 
 public object DeobfuscatorModule : AbstractModule() {
     override fun configure() {
diff --git a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorQualifier.kt b/deob/src/main/java/org/openrs2/deob/DeobfuscatorQualifier.kt
similarity index 89%
rename from deob/src/main/java/dev/openrs2/deob/DeobfuscatorQualifier.kt
rename to deob/src/main/java/org/openrs2/deob/DeobfuscatorQualifier.kt
index 098d1cfc77..69297874f6 100644
--- a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorQualifier.kt
+++ b/deob/src/main/java/org/openrs2/deob/DeobfuscatorQualifier.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import javax.inject.Qualifier
 
diff --git a/deob/src/main/java/dev/openrs2/deob/OriginalPcTable.kt b/deob/src/main/java/org/openrs2/deob/OriginalPcTable.kt
similarity index 97%
rename from deob/src/main/java/dev/openrs2/deob/OriginalPcTable.kt
rename to deob/src/main/java/org/openrs2/deob/OriginalPcTable.kt
index b8325849b9..07c8b241c0 100644
--- a/deob/src/main/java/dev/openrs2/deob/OriginalPcTable.kt
+++ b/deob/src/main/java/org/openrs2/deob/OriginalPcTable.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import org.objectweb.asm.Attribute
 import org.objectweb.asm.ByteVector
diff --git a/deob/src/main/java/dev/openrs2/deob/Profile.kt b/deob/src/main/java/org/openrs2/deob/Profile.kt
similarity index 72%
rename from deob/src/main/java/dev/openrs2/deob/Profile.kt
rename to deob/src/main/java/org/openrs2/deob/Profile.kt
index aedb8269c2..b7ac50fe8c 100644
--- a/deob/src/main/java/dev/openrs2/deob/Profile.kt
+++ b/deob/src/main/java/org/openrs2/deob/Profile.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
-import dev.openrs2.asm.filter.GlobClassFilter
-import dev.openrs2.asm.filter.GlobMemberFilter
+import org.openrs2.asm.filter.GlobClassFilter
+import org.openrs2.asm.filter.GlobMemberFilter
 
 public class Profile(
     public val excludedClasses: GlobClassFilter,
diff --git a/deob/src/main/java/dev/openrs2/deob/ProfileProvider.kt b/deob/src/main/java/org/openrs2/deob/ProfileProvider.kt
similarity index 91%
rename from deob/src/main/java/dev/openrs2/deob/ProfileProvider.kt
rename to deob/src/main/java/org/openrs2/deob/ProfileProvider.kt
index 9f6efeebd8..fff53555d8 100644
--- a/deob/src/main/java/dev/openrs2/deob/ProfileProvider.kt
+++ b/deob/src/main/java/org/openrs2/deob/ProfileProvider.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.openrs2.yaml.Yaml
+import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Paths
 import javax.inject.Inject
diff --git a/deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt b/deob/src/main/java/org/openrs2/deob/SignedClassUtils.kt
similarity index 96%
rename from deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt
rename to deob/src/main/java/org/openrs2/deob/SignedClassUtils.kt
index fca1e573b6..523faf2e60 100644
--- a/deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt
+++ b/deob/src/main/java/org/openrs2/deob/SignedClassUtils.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob
+package org.openrs2.deob
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.Library
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.Library
 
 public object SignedClassUtils {
     private val logger = InlineLogger()
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/ConstSourceInterpreter.kt b/deob/src/main/java/org/openrs2/deob/analysis/ConstSourceInterpreter.kt
similarity index 97%
rename from deob/src/main/java/dev/openrs2/deob/analysis/ConstSourceInterpreter.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/ConstSourceInterpreter.kt
index d4b0ae6af3..fc9905f4af 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/ConstSourceInterpreter.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/ConstSourceInterpreter.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
-import dev.openrs2.asm.intConstant
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.analysis.BasicInterpreter
 import org.objectweb.asm.tree.analysis.Interpreter
+import org.openrs2.asm.intConstant
 
 public class ConstSourceInterpreter : Interpreter<ConstSourceValue>(Opcodes.ASM9) {
     private val basicInterpreter = BasicInterpreter()
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/ConstSourceValue.kt b/deob/src/main/java/org/openrs2/deob/analysis/ConstSourceValue.kt
similarity index 94%
rename from deob/src/main/java/dev/openrs2/deob/analysis/ConstSourceValue.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/ConstSourceValue.kt
index 12729571fa..a6297bc365 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/ConstSourceValue.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/ConstSourceValue.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.analysis.BasicValue
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/ControlFlowAnalyzer.kt b/deob/src/main/java/org/openrs2/deob/analysis/ControlFlowAnalyzer.kt
similarity index 96%
rename from deob/src/main/java/dev/openrs2/deob/analysis/ControlFlowAnalyzer.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/ControlFlowAnalyzer.kt
index f37bdbd06b..fd0d1842b1 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/ControlFlowAnalyzer.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/ControlFlowAnalyzer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.jgrapht.Graph
 import org.jgrapht.graph.AsUnmodifiableGraph
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/CopyAssignment.kt b/deob/src/main/java/org/openrs2/deob/analysis/CopyAssignment.kt
similarity index 68%
rename from deob/src/main/java/dev/openrs2/deob/analysis/CopyAssignment.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/CopyAssignment.kt
index eba7717843..2f338a6541 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/CopyAssignment.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/CopyAssignment.kt
@@ -1,3 +1,3 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 public data class CopyAssignment(val destination: Int, val source: Int)
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/CopyPropagationAnalyzer.kt b/deob/src/main/java/org/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
similarity index 98%
rename from deob/src/main/java/dev/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
index 9e90a37a55..44c7553850 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/CopyPropagationAnalyzer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/DataFlowAnalyzer.kt b/deob/src/main/java/org/openrs2/deob/analysis/DataFlowAnalyzer.kt
similarity index 96%
rename from deob/src/main/java/dev/openrs2/deob/analysis/DataFlowAnalyzer.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/DataFlowAnalyzer.kt
index 7f6f1c39e0..97a85e11a8 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/DataFlowAnalyzer.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/DataFlowAnalyzer.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
-import dev.openrs2.util.collect.removeFirstOrNull
 import org.jgrapht.Graph
 import org.jgrapht.graph.DefaultEdge
 import org.jgrapht.graph.EdgeReversedGraph
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.util.collect.removeFirstOrNull
 
 public abstract class DataFlowAnalyzer<T>(owner: String, private val method: MethodNode, backwards: Boolean = false) {
     private val graph: Graph<Int, DefaultEdge>
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/FieldWriteAnalyzer.kt b/deob/src/main/java/org/openrs2/deob/analysis/FieldWriteAnalyzer.kt
similarity index 96%
rename from deob/src/main/java/dev/openrs2/deob/analysis/FieldWriteAnalyzer.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/FieldWriteAnalyzer.kt
index e2f1f1d1c1..f4aec7f759 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/FieldWriteAnalyzer.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/FieldWriteAnalyzer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.classpath.ClassPath
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.analysis.Frame
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.classpath.ClassPath
 
 public class FieldWriteAnalyzer(
     private val clazz: ClassNode,
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/FieldWriteCount.kt b/deob/src/main/java/org/openrs2/deob/analysis/FieldWriteCount.kt
similarity index 71%
rename from deob/src/main/java/dev/openrs2/deob/analysis/FieldWriteCount.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/FieldWriteCount.kt
index 748c09366e..73551912d1 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/FieldWriteCount.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/FieldWriteCount.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 public enum class FieldWriteCount {
     NEVER,
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/IntBranch.kt b/deob/src/main/java/org/openrs2/deob/analysis/IntBranch.kt
similarity index 98%
rename from deob/src/main/java/dev/openrs2/deob/analysis/IntBranch.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/IntBranch.kt
index 641eb41e60..9425eb6f2c 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/IntBranch.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/IntBranch.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.objectweb.asm.Opcodes.IFEQ
 import org.objectweb.asm.Opcodes.IFGE
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/IntBranchResult.kt b/deob/src/main/java/org/openrs2/deob/analysis/IntBranchResult.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/analysis/IntBranchResult.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/IntBranchResult.kt
index b8090ab529..301d2a3e1b 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/IntBranchResult.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/IntBranchResult.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 public enum class IntBranchResult {
     ALWAYS_TAKEN, NEVER_TAKEN, UNKNOWN;
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt b/deob/src/main/java/org/openrs2/deob/analysis/IntInterpreter.kt
similarity index 98%
rename from deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/IntInterpreter.kt
index 263ee2185e..5c7b08634a 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/IntInterpreter.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
-import dev.openrs2.asm.intConstant
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.IincInsnNode
 import org.objectweb.asm.tree.analysis.BasicInterpreter
 import org.objectweb.asm.tree.analysis.Interpreter
+import org.openrs2.asm.intConstant
 
 public class IntInterpreter(private val args: Array<IntValueSet>) : Interpreter<IntValue>(Opcodes.ASM9) {
     private val basicInterpreter = BasicInterpreter()
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/IntValue.kt b/deob/src/main/java/org/openrs2/deob/analysis/IntValue.kt
similarity index 89%
rename from deob/src/main/java/dev/openrs2/deob/analysis/IntValue.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/IntValue.kt
index ec165e1955..b6cea15e68 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/IntValue.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/IntValue.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.objectweb.asm.tree.analysis.BasicValue
 import org.objectweb.asm.tree.analysis.Value
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/IntValueSet.kt b/deob/src/main/java/org/openrs2/deob/analysis/IntValueSet.kt
similarity index 96%
rename from deob/src/main/java/dev/openrs2/deob/analysis/IntValueSet.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/IntValueSet.kt
index 0942ccf1f5..31c20ef074 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/IntValueSet.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/IntValueSet.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 public sealed class IntValueSet {
     public data class Constant(val values: Set<Int>) : IntValueSet() {
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/LiveVariableAnalyzer.kt b/deob/src/main/java/org/openrs2/deob/analysis/LiveVariableAnalyzer.kt
similarity index 98%
rename from deob/src/main/java/dev/openrs2/deob/analysis/LiveVariableAnalyzer.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/LiveVariableAnalyzer.kt
index 77457c21e1..ecfeb91775 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/LiveVariableAnalyzer.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/LiveVariableAnalyzer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet
 import it.unimi.dsi.fastutil.ints.IntSet
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/ThisInterpreter.kt b/deob/src/main/java/org/openrs2/deob/analysis/ThisInterpreter.kt
similarity index 98%
rename from deob/src/main/java/dev/openrs2/deob/analysis/ThisInterpreter.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/ThisInterpreter.kt
index 4c0ba7dde5..128bd331a6 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/ThisInterpreter.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/ThisInterpreter.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/ThisValue.kt b/deob/src/main/java/org/openrs2/deob/analysis/ThisValue.kt
similarity index 88%
rename from deob/src/main/java/dev/openrs2/deob/analysis/ThisValue.kt
rename to deob/src/main/java/org/openrs2/deob/analysis/ThisValue.kt
index a5748fb33a..c332e16cd1 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/ThisValue.kt
+++ b/deob/src/main/java/org/openrs2/deob/analysis/ThisValue.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.analysis
+package org.openrs2.deob.analysis
 
 import org.objectweb.asm.tree.analysis.BasicValue
 import org.objectweb.asm.tree.analysis.Value
diff --git a/deob/src/main/java/dev/openrs2/deob/filter/BrowserControlFilter.kt b/deob/src/main/java/org/openrs2/deob/filter/BrowserControlFilter.kt
similarity index 90%
rename from deob/src/main/java/dev/openrs2/deob/filter/BrowserControlFilter.kt
rename to deob/src/main/java/org/openrs2/deob/filter/BrowserControlFilter.kt
index 0aeb295aa9..ef098cdd70 100644
--- a/deob/src/main/java/dev/openrs2/deob/filter/BrowserControlFilter.kt
+++ b/deob/src/main/java/org/openrs2/deob/filter/BrowserControlFilter.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.filter
+package org.openrs2.deob.filter
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.AnyMemberFilter
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.asm.hasCode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodInsnNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.AnyMemberFilter
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.asm.hasCode
 
 public class BrowserControlFilter private constructor(private val clazz: String) : MemberFilter {
     override fun matches(owner: String, name: String, desc: String): Boolean {
diff --git a/deob/src/main/java/dev/openrs2/deob/filter/ReflectedConstructorFilter.kt b/deob/src/main/java/org/openrs2/deob/filter/ReflectedConstructorFilter.kt
similarity index 88%
rename from deob/src/main/java/dev/openrs2/deob/filter/ReflectedConstructorFilter.kt
rename to deob/src/main/java/org/openrs2/deob/filter/ReflectedConstructorFilter.kt
index 3c488796d9..901f43357e 100644
--- a/deob/src/main/java/dev/openrs2/deob/filter/ReflectedConstructorFilter.kt
+++ b/deob/src/main/java/org/openrs2/deob/filter/ReflectedConstructorFilter.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.filter
+package org.openrs2.deob.filter
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.ClassForNameUtils
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.asm.hasCode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.ClassForNameUtils
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.asm.hasCode
 
 public class ReflectedConstructorFilter private constructor(private val classes: Set<String>) : MemberFilter {
     override fun matches(owner: String, name: String, desc: String): Boolean {
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/ArgumentMappingGenerator.kt b/deob/src/main/java/org/openrs2/deob/remap/ArgumentMappingGenerator.kt
similarity index 81%
rename from deob/src/main/java/dev/openrs2/deob/remap/ArgumentMappingGenerator.kt
rename to deob/src/main/java/org/openrs2/deob/remap/ArgumentMappingGenerator.kt
index 238e7a8be4..04baa3f729 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/ArgumentMappingGenerator.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/ArgumentMappingGenerator.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
-import dev.openrs2.deob.ArgRef
-import dev.openrs2.deob.util.map.NameMap
+import org.openrs2.deob.ArgRef
+import org.openrs2.deob.util.map.NameMap
 
 public class ArgumentMappingGenerator(
     private val nameMap: NameMap
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/ClassMappingGenerator.kt b/deob/src/main/java/org/openrs2/deob/remap/ClassMappingGenerator.kt
similarity index 90%
rename from deob/src/main/java/dev/openrs2/deob/remap/ClassMappingGenerator.kt
rename to deob/src/main/java/org/openrs2/deob/remap/ClassMappingGenerator.kt
index 2c814e9410..a6bb7006fd 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/ClassMappingGenerator.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/ClassMappingGenerator.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
-import dev.openrs2.asm.classpath.ClassMetadata
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.ClassFilter
-import dev.openrs2.deob.util.map.NameMap
 import org.objectweb.asm.Opcodes
+import org.openrs2.asm.classpath.ClassMetadata
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.ClassFilter
+import org.openrs2.deob.util.map.NameMap
 
 public class ClassMappingGenerator(
     private val classPath: ClassPath,
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefix.kt b/deob/src/main/java/org/openrs2/deob/remap/ClassNamePrefix.kt
similarity index 91%
rename from deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefix.kt
rename to deob/src/main/java/org/openrs2/deob/remap/ClassNamePrefix.kt
index e37577c20a..1f2a434f9b 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/ClassNamePrefix.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/ClassNamePrefix.kt
@@ -1,7 +1,7 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
-import dev.openrs2.asm.classpath.ExtendedRemapper
-import dev.openrs2.asm.classpath.Library
+import org.openrs2.asm.classpath.ExtendedRemapper
+import org.openrs2.asm.classpath.Library
 
 private val BOUNDARY_CHARS = charArrayOf('/', '!')
 
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/FieldMappingGenerator.kt b/deob/src/main/java/org/openrs2/deob/remap/FieldMappingGenerator.kt
similarity index 88%
rename from deob/src/main/java/dev/openrs2/deob/remap/FieldMappingGenerator.kt
rename to deob/src/main/java/org/openrs2/deob/remap/FieldMappingGenerator.kt
index 110aaa50a5..49657cf962 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/FieldMappingGenerator.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/FieldMappingGenerator.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.util.collect.DisjointSet
-import dev.openrs2.util.indefiniteArticle
 import org.objectweb.asm.Type
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.util.collect.DisjointSet
+import org.openrs2.util.indefiniteArticle
 
 public class FieldMappingGenerator(
     private val classPath: ClassPath,
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/MethodMappingGenerator.kt b/deob/src/main/java/org/openrs2/deob/remap/MethodMappingGenerator.kt
similarity index 85%
rename from deob/src/main/java/dev/openrs2/deob/remap/MethodMappingGenerator.kt
rename to deob/src/main/java/org/openrs2/deob/remap/MethodMappingGenerator.kt
index f976fa1f9b..6a2d6a117e 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/MethodMappingGenerator.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/MethodMappingGenerator.kt
@@ -1,12 +1,12 @@
-package dev.openrs2.deob.remap
-
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.util.collect.DisjointSet
+package org.openrs2.deob.remap
+
 import org.objectweb.asm.Opcodes
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.util.collect.DisjointSet
 
 public class MethodMappingGenerator(
     private val classPath: ClassPath,
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/NameGenerator.kt b/deob/src/main/java/org/openrs2/deob/remap/NameGenerator.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/remap/NameGenerator.kt
rename to deob/src/main/java/org/openrs2/deob/remap/NameGenerator.kt
index 22e3d0fb5a..9e7f4f02fa 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/NameGenerator.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/NameGenerator.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
 public class NameGenerator {
     private val prefixes = mutableMapOf<String, Int>()
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/StaticClassGenerator.kt b/deob/src/main/java/org/openrs2/deob/remap/StaticClassGenerator.kt
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/remap/StaticClassGenerator.kt
rename to deob/src/main/java/org/openrs2/deob/remap/StaticClassGenerator.kt
index daa9d8f30b..c75570e77b 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/StaticClassGenerator.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/StaticClassGenerator.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
 public class StaticClassGenerator(private val generator: NameGenerator, private val maxMembers: Int) {
     private var lastClass: String? = null
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/StaticField.kt b/deob/src/main/java/org/openrs2/deob/remap/StaticField.kt
similarity index 82%
rename from deob/src/main/java/dev/openrs2/deob/remap/StaticField.kt
rename to deob/src/main/java/org/openrs2/deob/remap/StaticField.kt
index b90515abc0..f85b35682e 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/StaticField.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/StaticField.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
 import org.objectweb.asm.tree.AbstractInsnNode
 
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/StaticFieldUnscrambler.kt b/deob/src/main/java/org/openrs2/deob/remap/StaticFieldUnscrambler.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/remap/StaticFieldUnscrambler.kt
rename to deob/src/main/java/org/openrs2/deob/remap/StaticFieldUnscrambler.kt
index 312064c3b9..fc6c81d4d1 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/StaticFieldUnscrambler.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/StaticFieldUnscrambler.kt
@@ -1,17 +1,17 @@
-package dev.openrs2.deob.remap
-
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.asm.getExpression
-import dev.openrs2.asm.isSequential
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.util.collect.DisjointSet
+package org.openrs2.deob.remap
+
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.asm.getExpression
+import org.openrs2.asm.isSequential
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.util.collect.DisjointSet
 
 public class StaticFieldUnscrambler(
     private val classPath: ClassPath,
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/StaticMethodUnscrambler.kt b/deob/src/main/java/org/openrs2/deob/remap/StaticMethodUnscrambler.kt
similarity index 87%
rename from deob/src/main/java/dev/openrs2/deob/remap/StaticMethodUnscrambler.kt
rename to deob/src/main/java/org/openrs2/deob/remap/StaticMethodUnscrambler.kt
index d6c1ca55ac..4c9846ccc2 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/StaticMethodUnscrambler.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/StaticMethodUnscrambler.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.util.collect.DisjointSet
 
 public class StaticMethodUnscrambler(
     private val classPath: ClassPath,
diff --git a/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt b/deob/src/main/java/org/openrs2/deob/remap/TypedRemapper.kt
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt
rename to deob/src/main/java/org/openrs2/deob/remap/TypedRemapper.kt
index 4978e56dfa..27b0fb7890 100644
--- a/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt
+++ b/deob/src/main/java/org/openrs2/deob/remap/TypedRemapper.kt
@@ -1,16 +1,16 @@
-package dev.openrs2.deob.remap
+package org.openrs2.deob.remap
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.ExtendedRemapper
-import dev.openrs2.asm.filter.UnionMemberFilter
-import dev.openrs2.deob.ArgRef
-import dev.openrs2.deob.Profile
-import dev.openrs2.deob.filter.BrowserControlFilter
-import dev.openrs2.deob.util.map.NameMap
-import dev.openrs2.util.collect.DisjointSet
 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.asm.filter.UnionMemberFilter
+import org.openrs2.deob.ArgRef
+import org.openrs2.deob.Profile
+import org.openrs2.deob.filter.BrowserControlFilter
+import org.openrs2.deob.util.map.NameMap
+import org.openrs2.util.collect.DisjointSet
 
 public class TypedRemapper private constructor(
     private val inheritedFieldSets: DisjointSet<MemberRef>,
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/BitShiftTransformer.kt
similarity index 84%
rename from deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/BitShiftTransformer.kt
index 14a6ca7adf..646590b9dd 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/BitShiftTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.intConstant
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.intConstant
+import org.openrs2.asm.toAbstractInsnNode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/BitwiseOpTransformer.kt
similarity index 91%
rename from deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/BitwiseOpTransformer.kt
index 69c4b5ac5b..be5a592fcd 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/BitwiseOpTransformer.kt
@@ -1,18 +1,18 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/BundlerTransformer.kt
similarity index 78%
rename from deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/BundlerTransformer.kt
index ab5829ad36..e2bbcfbabf 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/BundlerTransformer.kt
@@ -1,9 +1,9 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.BundlerQualifier
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.BundlerQualifier
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/CanvasTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/CanvasTransformer.kt
similarity index 77%
rename from deob/src/main/java/dev/openrs2/deob/transform/CanvasTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/CanvasTransformer.kt
index ab6d0402f0..7e9881eaa0 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/CanvasTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/CanvasTransformer.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/ClassLiteralTransformer.kt
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/ClassLiteralTransformer.kt
index d11c9f7f38..1910ba2d2f 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/ClassLiteralTransformer.kt
@@ -1,13 +1,6 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.ClassVersionUtils
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.toInternalClassName
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
@@ -15,6 +8,13 @@ import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.ClassVersionUtils
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.toInternalClassName
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/ConstantArgTransformer.kt
similarity index 90%
rename from deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/ConstantArgTransformer.kt
index a6ed2705a2..6aa29ce0c1 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/ConstantArgTransformer.kt
@@ -1,32 +1,6 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.copy
-import dev.openrs2.asm.deleteExpression
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.asm.filter.UnionMemberFilter
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.intConstant
-import dev.openrs2.asm.isPure
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.replaceExpression
-import dev.openrs2.asm.stackMetadata
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.ArgPartition
-import dev.openrs2.deob.Profile
-import dev.openrs2.deob.analysis.IntBranch
-import dev.openrs2.deob.analysis.IntBranchResult.ALWAYS_TAKEN
-import dev.openrs2.deob.analysis.IntBranchResult.NEVER_TAKEN
-import dev.openrs2.deob.analysis.IntInterpreter
-import dev.openrs2.deob.analysis.IntValueSet
-import dev.openrs2.deob.filter.ReflectedConstructorFilter
-import dev.openrs2.deob.remap.MethodMappingGenerator
-import dev.openrs2.util.collect.DisjointSet
-import dev.openrs2.util.collect.removeFirstOrNull
 import org.objectweb.asm.Opcodes.GOTO
 import org.objectweb.asm.Opcodes.IFEQ
 import org.objectweb.asm.Opcodes.IFGE
@@ -47,6 +21,32 @@ import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.analysis.Analyzer
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.copy
+import org.openrs2.asm.deleteExpression
+import org.openrs2.asm.filter.MemberFilter
+import org.openrs2.asm.filter.UnionMemberFilter
+import org.openrs2.asm.hasCode
+import org.openrs2.asm.intConstant
+import org.openrs2.asm.isPure
+import org.openrs2.asm.nextReal
+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.util.collect.DisjointSet
+import org.openrs2.util.collect.removeFirstOrNull
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/CopyPropagationTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/CopyPropagationTransformer.kt
similarity index 90%
rename from deob/src/main/java/dev/openrs2/deob/transform/CopyPropagationTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/CopyPropagationTransformer.kt
index 73b82bcf0e..1b22dbf0b5 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/CopyPropagationTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/CopyPropagationTransformer.kt
@@ -1,14 +1,14 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.analysis.CopyPropagationAnalyzer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 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 javax.inject.Singleton
 
 /**
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/CounterTransformer.kt
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/CounterTransformer.kt
index e5fac3f6d0..c59fe80deb 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/CounterTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/EmptyClassTransformer.kt
similarity index 95%
rename from deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/EmptyClassTransformer.kt
index de8e629e6d..3c85494bd0 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/EmptyClassTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.TypeInsnNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/ExceptionTracingTransformer.kt
similarity index 91%
rename from deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/ExceptionTracingTransformer.kt
index 1c4691b411..a82fdcdcf1 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/ExceptionTracingTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 /**
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/FernflowerExceptionTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/FernflowerExceptionTransformer.kt
similarity index 83%
rename from deob/src/main/java/dev/openrs2/deob/transform/FernflowerExceptionTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/FernflowerExceptionTransformer.kt
index 6f075beb90..1ef25f78a3 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/FernflowerExceptionTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/FernflowerExceptionTransformer.kt
@@ -1,14 +1,14 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/FieldOrderTransformer.kt
similarity index 90%
rename from deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/FieldOrderTransformer.kt
index 0c8b3e756c..e0e078818a 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/FieldOrderTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.FieldNode
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/FinalFieldTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/FinalFieldTransformer.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/transform/FinalFieldTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/FinalFieldTransformer.kt
index 26360eeec8..6bdb92fc16 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/FinalFieldTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/FinalFieldTransformer.kt
@@ -1,22 +1,22 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.removeDeadCode
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.analysis.FieldWriteAnalyzer
-import dev.openrs2.deob.analysis.FieldWriteCount
-import dev.openrs2.deob.analysis.ThisInterpreter
-import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.analysis.Analyzer
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberRef
+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.util.collect.DisjointSet
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/FinalTransformer.kt
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/FinalTransformer.kt
index c2a02b5a04..734e65892a 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/FinalTransformer.kt
@@ -1,14 +1,14 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.util.collect.DisjointSet
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/InvokeSpecialTransformer.kt
similarity index 95%
rename from deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/InvokeSpecialTransformer.kt
index a09621aa22..ca80148763 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/InvokeSpecialTransformer.kt
@@ -1,13 +1,13 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 /**
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/MethodOrderTransformer.kt
similarity index 87%
rename from deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/MethodOrderTransformer.kt
index e7a0ab93b5..b7582550ed 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/MethodOrderTransformer.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/MonitorTransformer.kt
similarity index 94%
rename from deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/MonitorTransformer.kt
index 2ffde83934..6312742fb0 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/MonitorTransformer.kt
@@ -1,12 +1,6 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.previousReal
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.commons.JSRInlinerAdapter
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -15,6 +9,12 @@ import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.LabelNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.previousReal
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 /**
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/OpaquePredicateTransformer.kt
similarity index 94%
rename from deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/OpaquePredicateTransformer.kt
index df169a3bec..5caad3f621 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/OpaquePredicateTransformer.kt
@@ -1,12 +1,6 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@@ -14,6 +8,12 @@ import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/OriginalNameTransformer.kt
similarity index 90%
rename from deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/OriginalNameTransformer.kt
index 73f9bd24e8..06e6cc395b 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/OriginalNameTransformer.kt
@@ -1,16 +1,16 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.annotation.OriginalArg
-import dev.openrs2.deob.annotation.OriginalClass
-import dev.openrs2.deob.annotation.OriginalMember
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AnnotationNode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.deob.annotation.OriginalArg
+import org.openrs2.deob.annotation.OriginalClass
+import org.openrs2.deob.annotation.OriginalMember
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
similarity index 88%
rename from deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
index b498c2fbfc..635fa163d5 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
@@ -1,18 +1,18 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.removeDeadCode
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.OriginalPcTable
-import dev.openrs2.deob.annotation.OriginalMember
-import dev.openrs2.deob.util.map.NameMap
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LabelNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.MemberRef
+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.util.map.NameMap
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/OriginalPcSaveTransformer.kt
similarity index 82%
rename from deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/OriginalPcSaveTransformer.kt
index 6eb644933e..760558a547 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/OriginalPcSaveTransformer.kt
@@ -1,11 +1,11 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/OverrideTransformer.kt
similarity index 88%
rename from deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/OverrideTransformer.kt
index 8760a5e7df..7179cb1495 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/OverrideTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AnnotationNode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/RedundantGotoTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/RedundantGotoTransformer.kt
similarity index 85%
rename from deob/src/main/java/dev/openrs2/deob/transform/RedundantGotoTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/RedundantGotoTransformer.kt
index 1960bd11fe..e2b4b32930 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/RedundantGotoTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/RedundantGotoTransformer.kt
@@ -1,15 +1,15 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.removeDeadCode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.removeDeadCode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/RemapTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/RemapTransformer.kt
similarity index 58%
rename from deob/src/main/java/dev/openrs2/deob/transform/RemapTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/RemapTransformer.kt
index c599b42585..d0d313ae70 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/RemapTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/RemapTransformer.kt
@@ -1,10 +1,10 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.Profile
-import dev.openrs2.deob.remap.TypedRemapper
-import dev.openrs2.deob.util.map.NameMap
+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.util.map.NameMap
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/ResetTransformer.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/ResetTransformer.kt
index 8fbf8f340f..27e0421d96 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/ResetTransformer.kt
@@ -1,13 +1,6 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.removeDeadCode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@@ -16,6 +9,13 @@ import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.removeDeadCode
+import org.openrs2.asm.transform.Transformer
 import javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/UnusedArgTransformer.kt
similarity index 92%
rename from deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/UnusedArgTransformer.kt
index 62732dc5de..07756262da 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/UnusedArgTransformer.kt
@@ -1,18 +1,6 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.removeArgument
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.ArgPartition
-import dev.openrs2.deob.Profile
-import dev.openrs2.deob.analysis.ConstSourceInterpreter
-import dev.openrs2.deob.analysis.ConstSourceValue
-import dev.openrs2.deob.remap.MethodMappingGenerator
-import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
@@ -23,6 +11,18 @@ import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
 import org.objectweb.asm.tree.analysis.Analyzer
 import org.objectweb.asm.tree.analysis.Frame
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+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.util.collect.DisjointSet
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/UnusedLocalTransformer.kt
similarity index 85%
rename from deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/UnusedLocalTransformer.kt
index 5a8aefaa8a..b10d5e025a 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/UnusedLocalTransformer.kt
@@ -1,17 +1,17 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.deleteExpression
-import dev.openrs2.asm.isPure
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.analysis.LiveVariableAnalyzer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.classpath.ClassPath
+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 javax.inject.Singleton
 
 @Singleton
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/UnusedMethodTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/UnusedMethodTransformer.kt
similarity index 87%
rename from deob/src/main/java/dev/openrs2/deob/transform/UnusedMethodTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/UnusedMethodTransformer.kt
index ca41ebecdc..a6bb711882 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedMethodTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/UnusedMethodTransformer.kt
@@ -1,22 +1,22 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
 import com.google.common.collect.Multimap
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.asm.filter.UnionMemberFilter
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.Profile
-import dev.openrs2.deob.filter.ReflectedConstructorFilter
-import dev.openrs2.util.collect.DisjointSet
-import dev.openrs2.util.collect.removeFirst
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+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.util.collect.DisjointSet
+import org.openrs2.util.collect.removeFirst
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt b/deob/src/main/java/org/openrs2/deob/transform/VisibilityTransformer.kt
similarity index 93%
rename from deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
rename to deob/src/main/java/org/openrs2/deob/transform/VisibilityTransformer.kt
index 4bb93adc21..996ad6b9e9 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
+++ b/deob/src/main/java/org/openrs2/deob/transform/VisibilityTransformer.kt
@@ -1,24 +1,24 @@
-package dev.openrs2.deob.transform
+package org.openrs2.deob.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
 import com.google.common.collect.Multimap
-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.filter.MemberFilter
-import dev.openrs2.asm.filter.UnionMemberFilter
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.deob.Profile
-import dev.openrs2.deob.filter.ReflectedConstructorFilter
-import dev.openrs2.util.collect.DisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+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.util.collect.DisjointSet
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/game/build.gradle.kts b/game/build.gradle.kts
index a2c4d89c01..bb8f0cbe19 100644
--- a/game/build.gradle.kts
+++ b/game/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClassName = "dev.openrs2.game.GameCommandKt"
+    mainClassName = "org.openrs2.game.GameCommandKt"
 }
 
 dependencies {
diff --git a/game/src/main/java/dev/openrs2/game/GameCommand.kt b/game/src/main/java/org/openrs2/game/GameCommand.kt
similarity index 93%
rename from game/src/main/java/dev/openrs2/game/GameCommand.kt
rename to game/src/main/java/org/openrs2/game/GameCommand.kt
index 0c1c465f67..6831915b4c 100644
--- a/game/src/main/java/dev/openrs2/game/GameCommand.kt
+++ b/game/src/main/java/org/openrs2/game/GameCommand.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.game
+package org.openrs2.game
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
diff --git a/game/src/main/java/dev/openrs2/game/GameModule.kt b/game/src/main/java/org/openrs2/game/GameModule.kt
similarity index 85%
rename from game/src/main/java/dev/openrs2/game/GameModule.kt
rename to game/src/main/java/org/openrs2/game/GameModule.kt
index f49375b693..7149ec4050 100644
--- a/game/src/main/java/dev/openrs2/game/GameModule.kt
+++ b/game/src/main/java/org/openrs2/game/GameModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.game
+package org.openrs2.game
 
 import com.google.inject.AbstractModule
 
diff --git a/game/src/main/java/dev/openrs2/game/GameServer.kt b/game/src/main/java/org/openrs2/game/GameServer.kt
similarity index 82%
rename from game/src/main/java/dev/openrs2/game/GameServer.kt
rename to game/src/main/java/org/openrs2/game/GameServer.kt
index c61463535d..1868755957 100644
--- a/game/src/main/java/dev/openrs2/game/GameServer.kt
+++ b/game/src/main/java/org/openrs2/game/GameServer.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.game
+package org.openrs2.game
 
 import javax.inject.Singleton
 
diff --git a/json/src/main/java/dev/openrs2/json/Json.kt b/json/src/main/java/org/openrs2/json/Json.kt
similarity index 89%
rename from json/src/main/java/dev/openrs2/json/Json.kt
rename to json/src/main/java/org/openrs2/json/Json.kt
index 4626c54419..6178b0cebe 100644
--- a/json/src/main/java/dev/openrs2/json/Json.kt
+++ b/json/src/main/java/org/openrs2/json/Json.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.json
+package org.openrs2.json
 
 import javax.inject.Qualifier
 
diff --git a/json/src/main/java/dev/openrs2/json/JsonModule.kt b/json/src/main/java/org/openrs2/json/JsonModule.kt
similarity index 95%
rename from json/src/main/java/dev/openrs2/json/JsonModule.kt
rename to json/src/main/java/org/openrs2/json/JsonModule.kt
index 5ee0f70893..0147a9d30b 100644
--- a/json/src/main/java/dev/openrs2/json/JsonModule.kt
+++ b/json/src/main/java/org/openrs2/json/JsonModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.json
+package org.openrs2.json
 
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/json/src/main/java/dev/openrs2/json/ObjectMapperProvider.kt b/json/src/main/java/org/openrs2/json/ObjectMapperProvider.kt
similarity index 96%
rename from json/src/main/java/dev/openrs2/json/ObjectMapperProvider.kt
rename to json/src/main/java/org/openrs2/json/ObjectMapperProvider.kt
index f58a0e1e67..3505059f6e 100644
--- a/json/src/main/java/dev/openrs2/json/ObjectMapperProvider.kt
+++ b/json/src/main/java/org/openrs2/json/ObjectMapperProvider.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.json
+package org.openrs2.json
 
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/util/src/main/java/dev/openrs2/util/StringUtils.kt b/util/src/main/java/org/openrs2/util/StringUtils.kt
similarity index 83%
rename from util/src/main/java/dev/openrs2/util/StringUtils.kt
rename to util/src/main/java/org/openrs2/util/StringUtils.kt
index 60216e9ef7..870b2c1259 100644
--- a/util/src/main/java/dev/openrs2/util/StringUtils.kt
+++ b/util/src/main/java/org/openrs2/util/StringUtils.kt
@@ -1,6 +1,6 @@
-package dev.openrs2.util
+package org.openrs2.util
 
-import dev.openrs2.util.charset.Cp1252Charset
+import org.openrs2.util.charset.Cp1252Charset
 
 public fun CharSequence.indefiniteArticle(): String {
     require(isNotEmpty())
diff --git a/util/src/main/java/dev/openrs2/util/charset/Cp1252Charset.kt b/util/src/main/java/org/openrs2/util/charset/Cp1252Charset.kt
similarity index 99%
rename from util/src/main/java/dev/openrs2/util/charset/Cp1252Charset.kt
rename to util/src/main/java/org/openrs2/util/charset/Cp1252Charset.kt
index c8db2cc6f8..7b3ada7cd0 100644
--- a/util/src/main/java/dev/openrs2/util/charset/Cp1252Charset.kt
+++ b/util/src/main/java/org/openrs2/util/charset/Cp1252Charset.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.charset
+package org.openrs2.util.charset
 
 import java.nio.ByteBuffer
 import java.nio.CharBuffer
diff --git a/util/src/main/java/dev/openrs2/util/charset/ModifiedUtf8Charset.kt b/util/src/main/java/org/openrs2/util/charset/ModifiedUtf8Charset.kt
similarity index 99%
rename from util/src/main/java/dev/openrs2/util/charset/ModifiedUtf8Charset.kt
rename to util/src/main/java/org/openrs2/util/charset/ModifiedUtf8Charset.kt
index fb5913b3d3..d58d65ad03 100644
--- a/util/src/main/java/dev/openrs2/util/charset/ModifiedUtf8Charset.kt
+++ b/util/src/main/java/org/openrs2/util/charset/ModifiedUtf8Charset.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.charset
+package org.openrs2.util.charset
 
 import java.nio.ByteBuffer
 import java.nio.CharBuffer
diff --git a/util/src/main/java/dev/openrs2/util/collect/DisjointSet.kt b/util/src/main/java/org/openrs2/util/collect/DisjointSet.kt
similarity index 94%
rename from util/src/main/java/dev/openrs2/util/collect/DisjointSet.kt
rename to util/src/main/java/org/openrs2/util/collect/DisjointSet.kt
index e3b86d006d..041ddf2412 100644
--- a/util/src/main/java/dev/openrs2/util/collect/DisjointSet.kt
+++ b/util/src/main/java/org/openrs2/util/collect/DisjointSet.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.collect
+package org.openrs2.util.collect
 
 /**
  * A data structure containing a set of elements partitioned into a number of
diff --git a/util/src/main/java/dev/openrs2/util/collect/ForestDisjointSet.kt b/util/src/main/java/org/openrs2/util/collect/ForestDisjointSet.kt
similarity index 98%
rename from util/src/main/java/dev/openrs2/util/collect/ForestDisjointSet.kt
rename to util/src/main/java/org/openrs2/util/collect/ForestDisjointSet.kt
index aa9ecde1d0..6df81421d9 100644
--- a/util/src/main/java/dev/openrs2/util/collect/ForestDisjointSet.kt
+++ b/util/src/main/java/org/openrs2/util/collect/ForestDisjointSet.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.collect
+package org.openrs2.util.collect
 
 /**
  * A [DisjointSet] implementation backed by a disjoint-set forest, as described
diff --git a/util/src/main/java/dev/openrs2/util/collect/IterableUtils.kt b/util/src/main/java/org/openrs2/util/collect/IterableUtils.kt
similarity index 94%
rename from util/src/main/java/dev/openrs2/util/collect/IterableUtils.kt
rename to util/src/main/java/org/openrs2/util/collect/IterableUtils.kt
index 6ae07d55e2..bc470c8bde 100644
--- a/util/src/main/java/dev/openrs2/util/collect/IterableUtils.kt
+++ b/util/src/main/java/org/openrs2/util/collect/IterableUtils.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.collect
+package org.openrs2.util.collect
 
 public fun <T> MutableIterable<T>.removeFirst(): T {
     return removeFirstOrNull() ?: throw NoSuchElementException()
diff --git a/util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt b/util/src/main/java/org/openrs2/util/io/DeterministicJarOutputStream.kt
similarity index 96%
rename from util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt
rename to util/src/main/java/org/openrs2/util/io/DeterministicJarOutputStream.kt
index c5a5cbf078..a7376a6bd1 100644
--- a/util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt
+++ b/util/src/main/java/org/openrs2/util/io/DeterministicJarOutputStream.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import java.io.OutputStream
 import java.nio.file.attribute.FileTime
diff --git a/util/src/main/java/dev/openrs2/util/io/InputStreamExtensions.kt b/util/src/main/java/org/openrs2/util/io/InputStreamExtensions.kt
similarity index 96%
rename from util/src/main/java/dev/openrs2/util/io/InputStreamExtensions.kt
rename to util/src/main/java/org/openrs2/util/io/InputStreamExtensions.kt
index 3856e60538..d211b03acd 100644
--- a/util/src/main/java/dev/openrs2/util/io/InputStreamExtensions.kt
+++ b/util/src/main/java/org/openrs2/util/io/InputStreamExtensions.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import java.io.InputStream
 import java.util.Arrays
diff --git a/util/src/main/java/dev/openrs2/util/io/JarInputStreamExtensions.kt b/util/src/main/java/org/openrs2/util/io/JarInputStreamExtensions.kt
similarity index 85%
rename from util/src/main/java/dev/openrs2/util/io/JarInputStreamExtensions.kt
rename to util/src/main/java/org/openrs2/util/io/JarInputStreamExtensions.kt
index ade8bac750..7052939d19 100644
--- a/util/src/main/java/dev/openrs2/util/io/JarInputStreamExtensions.kt
+++ b/util/src/main/java/org/openrs2/util/io/JarInputStreamExtensions.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import java.util.jar.JarEntry
 import java.util.jar.JarInputStream
diff --git a/util/src/main/java/dev/openrs2/util/io/PathExtensions.kt b/util/src/main/java/org/openrs2/util/io/PathExtensions.kt
similarity index 99%
rename from util/src/main/java/dev/openrs2/util/io/PathExtensions.kt
rename to util/src/main/java/org/openrs2/util/io/PathExtensions.kt
index 2b4b6d4efd..26d77d11de 100644
--- a/util/src/main/java/dev/openrs2/util/io/PathExtensions.kt
+++ b/util/src/main/java/org/openrs2/util/io/PathExtensions.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import java.io.BufferedWriter
 import java.io.OutputStream
diff --git a/util/src/main/java/dev/openrs2/util/io/SkipOutputStream.kt b/util/src/main/java/org/openrs2/util/io/SkipOutputStream.kt
similarity index 95%
rename from util/src/main/java/dev/openrs2/util/io/SkipOutputStream.kt
rename to util/src/main/java/org/openrs2/util/io/SkipOutputStream.kt
index 9ac37510cd..0094b38436 100644
--- a/util/src/main/java/dev/openrs2/util/io/SkipOutputStream.kt
+++ b/util/src/main/java/org/openrs2/util/io/SkipOutputStream.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import java.io.OutputStream
 
diff --git a/util/src/test/java/dev/openrs2/util/StringUtilsTest.kt b/util/src/test/java/org/openrs2/util/StringUtilsTest.kt
similarity index 95%
rename from util/src/test/java/dev/openrs2/util/StringUtilsTest.kt
rename to util/src/test/java/org/openrs2/util/StringUtilsTest.kt
index 1dfacf5c2d..5b5dde79bc 100644
--- a/util/src/test/java/dev/openrs2/util/StringUtilsTest.kt
+++ b/util/src/test/java/org/openrs2/util/StringUtilsTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util
+package org.openrs2.util
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/util/src/test/java/dev/openrs2/util/charset/Cp1252CharsetTest.kt b/util/src/test/java/org/openrs2/util/charset/Cp1252CharsetTest.kt
similarity index 99%
rename from util/src/test/java/dev/openrs2/util/charset/Cp1252CharsetTest.kt
rename to util/src/test/java/org/openrs2/util/charset/Cp1252CharsetTest.kt
index 1c568b59b8..7246267b47 100644
--- a/util/src/test/java/dev/openrs2/util/charset/Cp1252CharsetTest.kt
+++ b/util/src/test/java/org/openrs2/util/charset/Cp1252CharsetTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.charset
+package org.openrs2.util.charset
 
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import kotlin.test.Test
diff --git a/util/src/test/java/dev/openrs2/util/charset/ModifiedUtf8CharsetTest.kt b/util/src/test/java/org/openrs2/util/charset/ModifiedUtf8CharsetTest.kt
similarity index 98%
rename from util/src/test/java/dev/openrs2/util/charset/ModifiedUtf8CharsetTest.kt
rename to util/src/test/java/org/openrs2/util/charset/ModifiedUtf8CharsetTest.kt
index fe739a3ad8..db219544cc 100644
--- a/util/src/test/java/dev/openrs2/util/charset/ModifiedUtf8CharsetTest.kt
+++ b/util/src/test/java/org/openrs2/util/charset/ModifiedUtf8CharsetTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.charset
+package org.openrs2.util.charset
 
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import kotlin.test.Test
diff --git a/util/src/test/java/dev/openrs2/util/collect/ForestDisjointSetTest.kt b/util/src/test/java/org/openrs2/util/collect/ForestDisjointSetTest.kt
similarity index 98%
rename from util/src/test/java/dev/openrs2/util/collect/ForestDisjointSetTest.kt
rename to util/src/test/java/org/openrs2/util/collect/ForestDisjointSetTest.kt
index a9da5b6d75..1e40a94b0c 100644
--- a/util/src/test/java/dev/openrs2/util/collect/ForestDisjointSetTest.kt
+++ b/util/src/test/java/org/openrs2/util/collect/ForestDisjointSetTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.collect
+package org.openrs2.util.collect
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/util/src/test/java/dev/openrs2/util/collect/IterableUtilsTest.kt b/util/src/test/java/org/openrs2/util/collect/IterableUtilsTest.kt
similarity index 97%
rename from util/src/test/java/dev/openrs2/util/collect/IterableUtilsTest.kt
rename to util/src/test/java/org/openrs2/util/collect/IterableUtilsTest.kt
index c65ab321a3..0f1523d211 100644
--- a/util/src/test/java/dev/openrs2/util/collect/IterableUtilsTest.kt
+++ b/util/src/test/java/org/openrs2/util/collect/IterableUtilsTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.collect
+package org.openrs2.util.collect
 
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.Test
diff --git a/util/src/test/java/dev/openrs2/util/io/DeterministicJarOutputStreamTest.kt b/util/src/test/java/org/openrs2/util/io/DeterministicJarOutputStreamTest.kt
similarity index 98%
rename from util/src/test/java/dev/openrs2/util/io/DeterministicJarOutputStreamTest.kt
rename to util/src/test/java/org/openrs2/util/io/DeterministicJarOutputStreamTest.kt
index 1cd4024271..df31c8f13d 100644
--- a/util/src/test/java/dev/openrs2/util/io/DeterministicJarOutputStreamTest.kt
+++ b/util/src/test/java/org/openrs2/util/io/DeterministicJarOutputStreamTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
diff --git a/util/src/test/java/dev/openrs2/util/io/SkipOutputStreamTest.kt b/util/src/test/java/org/openrs2/util/io/SkipOutputStreamTest.kt
similarity index 98%
rename from util/src/test/java/dev/openrs2/util/io/SkipOutputStreamTest.kt
rename to util/src/test/java/org/openrs2/util/io/SkipOutputStreamTest.kt
index 7e359ba6bf..47e5a597ed 100644
--- a/util/src/test/java/dev/openrs2/util/io/SkipOutputStreamTest.kt
+++ b/util/src/test/java/org/openrs2/util/io/SkipOutputStreamTest.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.util.io
+package org.openrs2.util.io
 
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import java.io.ByteArrayOutputStream
diff --git a/yaml/src/main/java/dev/openrs2/yaml/ObjectMapperProvider.kt b/yaml/src/main/java/org/openrs2/yaml/ObjectMapperProvider.kt
similarity index 96%
rename from yaml/src/main/java/dev/openrs2/yaml/ObjectMapperProvider.kt
rename to yaml/src/main/java/org/openrs2/yaml/ObjectMapperProvider.kt
index c0aff75f8a..dcb5f04c11 100644
--- a/yaml/src/main/java/dev/openrs2/yaml/ObjectMapperProvider.kt
+++ b/yaml/src/main/java/org/openrs2/yaml/ObjectMapperProvider.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.yaml
+package org.openrs2.yaml
 
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/yaml/src/main/java/dev/openrs2/yaml/Yaml.kt b/yaml/src/main/java/org/openrs2/yaml/Yaml.kt
similarity index 89%
rename from yaml/src/main/java/dev/openrs2/yaml/Yaml.kt
rename to yaml/src/main/java/org/openrs2/yaml/Yaml.kt
index 844cee48fa..3071da26bc 100644
--- a/yaml/src/main/java/dev/openrs2/yaml/Yaml.kt
+++ b/yaml/src/main/java/org/openrs2/yaml/Yaml.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.yaml
+package org.openrs2.yaml
 
 import javax.inject.Qualifier
 
diff --git a/yaml/src/main/java/dev/openrs2/yaml/YamlModule.kt b/yaml/src/main/java/org/openrs2/yaml/YamlModule.kt
similarity index 95%
rename from yaml/src/main/java/dev/openrs2/yaml/YamlModule.kt
rename to yaml/src/main/java/org/openrs2/yaml/YamlModule.kt
index 36a62fb9c5..6f2e0eafbb 100644
--- a/yaml/src/main/java/dev/openrs2/yaml/YamlModule.kt
+++ b/yaml/src/main/java/org/openrs2/yaml/YamlModule.kt
@@ -1,4 +1,4 @@
-package dev.openrs2.yaml
+package org.openrs2.yaml
 
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.ObjectMapper