diff --git a/orebfuscator-common/pom.xml b/orebfuscator-common/pom.xml
deleted file mode 100644
index 2bce888d..00000000
--- a/orebfuscator-common/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>net.imprex</groupId>
-    <artifactId>orebfuscator</artifactId>
-    <version>${revision}</version>
-  </parent>
-
-  <artifactId>orebfuscator-common</artifactId>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>${dependency.bukkit.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.joml</groupId>
-      <artifactId>joml</artifactId>
-      <version>${dependency.joml.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-api/pom.xml b/orebfuscator-compatibility/orebfuscator-compatibility-api/pom.xml
index 141e83ac..ba3671b0 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-api/pom.xml
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-api/pom.xml
@@ -19,12 +19,6 @@
       <version>${dependency.bukkit.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>net.imprex</groupId>
-      <artifactId>orebfuscator-common</artifactId>
-      <version>${revision}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>net.imprex</groupId>
       <artifactId>orebfuscator-nms-api</artifactId>
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorCompatibility.java b/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorCompatibility.java
index 7193e949..f6f35324 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorCompatibility.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorCompatibility.java
@@ -7,12 +7,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
 import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.ChunkPosition;
-import net.imprex.orebfuscator.util.MinecraftVersion;
-import net.imprex.orebfuscator.util.OFCLogger;
 import net.imprex.orebfuscator.util.ServerVersion;
 
 public class OrebfuscatorCompatibility {
@@ -32,7 +32,7 @@ public static void initialize(Plugin plugin, Config config) {
     }
 
     try {
-      OFCLogger.debug("Loading compatibility layer for: " + className);
+      OfcLogger.debug("Loading compatibility layer for: " + className);
       Class<? extends CompatibilityLayer> nmsManager = Class.forName(className).asSubclass(CompatibilityLayer.class);
       Constructor<? extends CompatibilityLayer> constructor = nmsManager.getConstructor(Plugin.class, Config.class);
       OrebfuscatorCompatibility.instance = constructor.newInstance(plugin, config);
@@ -42,7 +42,7 @@ public static void initialize(Plugin plugin, Config config) {
       throw new RuntimeException("Couldn't initialize compatibility layer", e);
     }
 
-    OFCLogger.debug("Compatibility layer successfully loaded");
+    OfcLogger.debug("Compatibility layer successfully loaded");
   }
 
   public static boolean isGameThread() {
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityLayer.java b/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityLayer.java
index f4d2aaf6..01564f63 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityLayer.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityLayer.java
@@ -4,8 +4,8 @@
 
 import org.bukkit.World;
 
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public interface CompatibilityLayer {
 
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitChunkLoader.java b/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitChunkLoader.java
index 7f00ae07..89c941d1 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitChunkLoader.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitChunkLoader.java
@@ -9,11 +9,11 @@
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.ChunkDirection;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.ChunkDirection;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class BukkitChunkLoader implements Runnable {
 
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitCompatibilityLayer.java b/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitCompatibilityLayer.java
index 9ed18352..806ab74d 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitCompatibilityLayer.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitCompatibilityLayer.java
@@ -5,11 +5,11 @@
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
 import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class BukkitCompatibilityLayer implements CompatibilityLayer {
 
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaCompatibilityLayer.java b/orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaCompatibilityLayer.java
index 18615f07..ab557a86 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaCompatibilityLayer.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaCompatibilityLayer.java
@@ -2,9 +2,9 @@
 
 import org.bukkit.plugin.Plugin;
 
+import dev.imprex.orebfuscator.config.api.Config;
 import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
 import net.imprex.orebfuscator.compatibility.paper.AbstractPaperCompatibilityLayer;
-import net.imprex.orebfuscator.config.Config;
 
 public class FoliaCompatibilityLayer extends AbstractPaperCompatibilityLayer {
 
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/AbstractPaperCompatibilityLayer.java b/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/AbstractPaperCompatibilityLayer.java
index 9018b671..48dd94ae 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/AbstractPaperCompatibilityLayer.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/AbstractPaperCompatibilityLayer.java
@@ -4,11 +4,11 @@
 
 import org.bukkit.World;
 
+import dev.imprex.orebfuscator.util.ChunkDirection;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.OrebfuscatorNms;
 import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.ChunkDirection;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public abstract class AbstractPaperCompatibilityLayer implements CompatibilityLayer {
 
diff --git a/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/PaperCompatibilityLayer.java b/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/PaperCompatibilityLayer.java
index b1a7f0ea..a72d8a23 100644
--- a/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/PaperCompatibilityLayer.java
+++ b/orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/PaperCompatibilityLayer.java
@@ -2,9 +2,9 @@
 
 import org.bukkit.plugin.Plugin;
 
+import dev.imprex.orebfuscator.config.api.Config;
 import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
 import net.imprex.orebfuscator.compatibility.bukkit.BukkitScheduler;
-import net.imprex.orebfuscator.config.Config;
 
 public class PaperCompatibilityLayer extends AbstractPaperCompatibilityLayer {
 
diff --git a/orebfuscator-core/pom.xml b/orebfuscator-core/pom.xml
new file mode 100644
index 00000000..0e99199b
--- /dev/null
+++ b/orebfuscator-core/pom.xml
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>net.imprex</groupId>
+    <artifactId>orebfuscator</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <groupId>dev.imprex.orebfuscator</groupId>
+  <artifactId>orebfuscator-core</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <!-- Netty -->
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${dependency.netty.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${dependency.netty.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>${dependency.bukkit.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.joml</groupId>
+      <artifactId>joml</artifactId>
+      <version>${dependency.joml.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractRegionFileCache.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/cache/AbstractRegionFileCache.java
similarity index 94%
rename from orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractRegionFileCache.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/cache/AbstractRegionFileCache.java
index 732babbd..0382248f 100644
--- a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractRegionFileCache.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/cache/AbstractRegionFileCache.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.nms;
+package dev.imprex.orebfuscator.cache;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -10,9 +10,9 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.util.ChunkPosition;
-import net.imprex.orebfuscator.util.SimpleCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.util.SimpleCache;
 
 public abstract class AbstractRegionFileCache<T> {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ByteBufUtil.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/ByteBufUtil.java
similarity index 96%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ByteBufUtil.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/ByteBufUtil.java
index 88316bba..c1062b8c 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ByteBufUtil.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/ByteBufUtil.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/DirectPalette.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/DirectPalette.java
similarity index 89%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/DirectPalette.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/DirectPalette.java
index 4c711aa3..884625fc 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/DirectPalette.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/DirectPalette.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/Palette.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/Palette.java
similarity index 81%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/Palette.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/Palette.java
index 54a084df..bd005e2d 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/Palette.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/Palette.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/VarBitBuffer.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/VarBitBuffer.java
similarity index 76%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/VarBitBuffer.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/VarBitBuffer.java
index 6e1aaf02..85890c68 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/VarBitBuffer.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/VarBitBuffer.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 public interface VarBitBuffer {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ZeroVarBitBuffer.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/ZeroVarBitBuffer.java
similarity index 93%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ZeroVarBitBuffer.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/ZeroVarBitBuffer.java
index c88f82f1..969523d8 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ZeroVarBitBuffer.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/chunk/ZeroVarBitBuffer.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 public class ZeroVarBitBuffer implements VarBitBuffer {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/AdvancedConfig.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/AdvancedConfig.java
similarity index 88%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/AdvancedConfig.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/AdvancedConfig.java
index 1e488ef9..93427ce5 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/AdvancedConfig.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/AdvancedConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 public interface AdvancedConfig {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/BlockFlags.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/BlockFlags.java
similarity index 96%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/BlockFlags.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/BlockFlags.java
index fe40fb3d..41a7732f 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/BlockFlags.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/BlockFlags.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 public interface BlockFlags {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/CacheConfig.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/CacheConfig.java
similarity index 78%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/CacheConfig.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/CacheConfig.java
index 41a2b671..339ff1ca 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/CacheConfig.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/CacheConfig.java
@@ -1,8 +1,8 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 import java.nio.file.Path;
 
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 
 public interface CacheConfig {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/Config.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/Config.java
similarity index 85%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/Config.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/Config.java
index 3ba715e8..9f8d0d80 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/Config.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/Config.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 import org.bukkit.World;
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/GeneralConfig.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/GeneralConfig.java
similarity index 80%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/GeneralConfig.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/GeneralConfig.java
index da9cdd9a..96a5972c 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/GeneralConfig.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/GeneralConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 public interface GeneralConfig {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/ObfuscationConfig.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/ObfuscationConfig.java
similarity index 58%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/ObfuscationConfig.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/ObfuscationConfig.java
index f7878bbd..9bcc1923 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/ObfuscationConfig.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/ObfuscationConfig.java
@@ -1,6 +1,6 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
-import net.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockProperties;
 
 public interface ObfuscationConfig extends WorldConfig {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/ProximityConfig.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/ProximityConfig.java
similarity index 80%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/ProximityConfig.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/ProximityConfig.java
index 8b09f079..e7dd8d2c 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/ProximityConfig.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/ProximityConfig.java
@@ -1,10 +1,10 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 import java.util.Map;
 
 import org.joml.Matrix4f;
 
-import net.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockProperties;
 
 public interface ProximityConfig extends WorldConfig {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/WorldConfig.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/WorldConfig.java
similarity index 80%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/WorldConfig.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/WorldConfig.java
index 994f17a9..8b19b235 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/WorldConfig.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/WorldConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 public interface WorldConfig {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/WorldConfigBundle.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/WorldConfigBundle.java
similarity index 90%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/WorldConfigBundle.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/WorldConfigBundle.java
index 7064c754..1cba822d 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/WorldConfigBundle.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/api/WorldConfigBundle.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config.api;
 
 public interface WorldConfigBundle {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/components/WorldMatcher.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/components/WorldMatcher.java
similarity index 96%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/components/WorldMatcher.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/components/WorldMatcher.java
index c8e5ab37..c2322746 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/components/WorldMatcher.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/components/WorldMatcher.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config.components;
+package dev.imprex.orebfuscator.config.components;
 
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/context/ConfigParsingContext.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/context/ConfigParsingContext.java
similarity index 97%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/context/ConfigParsingContext.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/context/ConfigParsingContext.java
index 6ff42143..6b50f3a0 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/context/ConfigParsingContext.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/context/ConfigParsingContext.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config.context;
+package dev.imprex.orebfuscator.config.context;
 
 public interface ConfigParsingContext {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/context/DefaultConfigParsingContext.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/context/DefaultConfigParsingContext.java
similarity index 96%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/context/DefaultConfigParsingContext.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/context/DefaultConfigParsingContext.java
index ef16b8c3..5947b6dc 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/context/DefaultConfigParsingContext.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/config/context/DefaultConfigParsingContext.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config.context;
+package dev.imprex.orebfuscator.config.context;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 
-import net.imprex.orebfuscator.util.OFCLogger;
+import dev.imprex.orebfuscator.logging.OfcLogger;
 
 public class DefaultConfigParsingContext implements ConfigParsingContext {
 
@@ -143,7 +143,7 @@ public String report() {
         .append(ANSI_RESET);
 
     String message = builder.toString();
-    OFCLogger.log(hasErrors() ? Level.SEVERE : Level.WARNING, message);
+    OfcLogger.log(hasErrors() ? Level.SEVERE : Level.WARNING, message);
     return message;
   }
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/OFCLogger.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/logging/OfcLogger.java
similarity index 84%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/OFCLogger.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/logging/OfcLogger.java
index 6a4942eb..ae681318 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/OFCLogger.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/logging/OfcLogger.java
@@ -1,11 +1,11 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.logging;
 
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public final class OFCLogger {
+public final class OfcLogger {
 
   public static Logger LOGGER = Logger.getLogger("Orebfuscator");
 
@@ -13,15 +13,15 @@ public final class OFCLogger {
   private static boolean verbose = false;
 
   public static void setVerboseLogging(boolean verbose) {
-    OFCLogger.verbose = verbose;
-    if (OFCLogger.verbose) {
+    OfcLogger.verbose = verbose;
+    if (OfcLogger.verbose) {
       debug("Verbose logging has been enabled");
     }
   }
 
   public static void debug(String message) {
-    if (OFCLogger.verbose) {
-      OFCLogger.LOGGER.log(Level.INFO, "[Debug] " + message);
+    if (OfcLogger.verbose) {
+      OfcLogger.LOGGER.log(Level.INFO, "[Debug] " + message);
     }
 
     synchronized (VERBOSE_LOG) {
@@ -63,7 +63,7 @@ public static void info(String message) {
    * Log with a specified level
    */
   public static void log(Level level, String message) {
-    OFCLogger.LOGGER.log(level, message);
+    OfcLogger.LOGGER.log(level, message);
   }
 
   /**
@@ -84,6 +84,6 @@ public static void error(String message, Throwable e) {
    * Log with a specified level and throwable
    */
   public static void log(Level level, String message, Throwable throwable) {
-    OFCLogger.LOGGER.log(level, message, throwable);
+    OfcLogger.LOGGER.log(level, message, throwable);
   }
 }
\ No newline at end of file
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockPos.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockPos.java
similarity index 98%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockPos.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockPos.java
index fe5a94b2..3954bcd0 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockPos.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockPos.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import org.bukkit.World;
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockProperties.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockProperties.java
similarity index 98%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockProperties.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockProperties.java
index dacb5605..2eff51bf 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockProperties.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockProperties.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockStateProperties.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockStateProperties.java
similarity index 98%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockStateProperties.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockStateProperties.java
index 4c8c9d91..922e2afa 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockStateProperties.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/BlockStateProperties.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 public class BlockStateProperties {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ChunkDirection.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/ChunkDirection.java
similarity index 96%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ChunkDirection.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/ChunkDirection.java
index 74d4e503..4a47dbc3 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ChunkDirection.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/ChunkDirection.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 public enum ChunkDirection {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ChunkPosition.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/ChunkPosition.java
similarity index 96%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ChunkPosition.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/ChunkPosition.java
index 8ec20bfb..4acfc189 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ChunkPosition.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/ChunkPosition.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.util.Objects;
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/JavaVersion.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/JavaVersion.java
similarity index 96%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/JavaVersion.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/JavaVersion.java
index faef0c48..fdf6e155 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/JavaVersion.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/JavaVersion.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 public final class JavaVersion {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MathUtil.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/MathUtil.java
similarity index 94%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MathUtil.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/MathUtil.java
index 16136df6..095a8fa8 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MathUtil.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/MathUtil.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 public class MathUtil {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MinecraftVersion.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/MinecraftVersion.java
similarity index 94%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MinecraftVersion.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/MinecraftVersion.java
index 67aefa29..c2cd5022 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MinecraftVersion.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/MinecraftVersion.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,6 +7,8 @@
 
 import org.bukkit.Bukkit;
 
+import dev.imprex.orebfuscator.logging.OfcLogger;
+
 public final class MinecraftVersion {
 
   private static final class NmsMapping {
@@ -26,7 +28,7 @@ public static String get(Version version) {
       for (NmsMapping mapping : MAPPINGS) {
         if (version.isAtOrAbove(mapping.version)) {
           if (mapping.version.minor() != version.minor()) {
-            OFCLogger.warn(String.format("Using nms mapping with mismatched minor versions: %s - %s",
+            OfcLogger.warn(String.format("Using nms mapping with mismatched minor versions: %s - %s",
                 mapping.version, version));
           }
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/NamespacedKey.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/NamespacedKey.java
similarity index 99%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/NamespacedKey.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/NamespacedKey.java
index 6959213b..6aa87ec5 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/NamespacedKey.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/NamespacedKey.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.util.Locale;
 import java.util.UUID;
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/SimpleCache.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/SimpleCache.java
similarity index 95%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/SimpleCache.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/SimpleCache.java
index 37bdfb57..d5122138 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/SimpleCache.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/SimpleCache.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/Version.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/Version.java
similarity index 98%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/Version.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/Version.java
index 14d44f65..d4fb5ffa 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/Version.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/Version.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.io.IOException;
 import java.util.Objects;
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/WeightedIntRandom.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/WeightedIntRandom.java
similarity index 97%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/WeightedIntRandom.java
rename to orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/WeightedIntRandom.java
index 19481bbf..e8358852 100644
--- a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/WeightedIntRandom.java
+++ b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/WeightedIntRandom.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/orebfuscator-common/src/test/java/net/imprex/orebfuscator/util/BlockPosTest.java b/orebfuscator-core/src/test/java/dev/imprex/orebfuscator/util/BlockPosTest.java
similarity index 97%
rename from orebfuscator-common/src/test/java/net/imprex/orebfuscator/util/BlockPosTest.java
rename to orebfuscator-core/src/test/java/dev/imprex/orebfuscator/util/BlockPosTest.java
index 5ce176de..54fdc2ba 100644
--- a/orebfuscator-common/src/test/java/net/imprex/orebfuscator/util/BlockPosTest.java
+++ b/orebfuscator-core/src/test/java/dev/imprex/orebfuscator/util/BlockPosTest.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.util;
+package dev.imprex.orebfuscator.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/orebfuscator-nms/orebfuscator-nms-api/pom.xml b/orebfuscator-nms/orebfuscator-nms-api/pom.xml
index 48104863..e8673578 100644
--- a/orebfuscator-nms/orebfuscator-nms-api/pom.xml
+++ b/orebfuscator-nms/orebfuscator-nms-api/pom.xml
@@ -20,8 +20,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>net.imprex</groupId>
-      <artifactId>orebfuscator-common</artifactId>
+      <groupId>dev.imprex.orebfuscator</groupId>
+      <artifactId>orebfuscator-core</artifactId>
       <version>${revision}</version>
       <scope>compile</scope>
     </dependency>
diff --git a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorNms.java b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorNms.java
index a826afcf..61055c4e 100644
--- a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorNms.java
+++ b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorNms.java
@@ -5,15 +5,15 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import net.imprex.orebfuscator.config.Config;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import net.imprex.orebfuscator.nms.NmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.MinecraftVersion;
-import net.imprex.orebfuscator.util.NamespacedKey;
-import net.imprex.orebfuscator.util.OFCLogger;
 import net.imprex.orebfuscator.util.ServerVersion;
 
 public class OrebfuscatorNms {
@@ -30,7 +30,7 @@ public static void initialize(Config config) {
       nmsVersion += "_mojang";
     }
 
-    OFCLogger.debug("Searching NMS adapter for server version \"" + nmsVersion + "\"!");
+    OfcLogger.debug("Searching NMS adapter for server version \"" + nmsVersion + "\"!");
 
     try {
       String className = "net.imprex.orebfuscator.nms." + nmsVersion + ".NmsManager";
@@ -43,7 +43,7 @@ public static void initialize(Config config) {
       throw new RuntimeException("Couldn't initialize NMS adapter", e);
     }
 
-    OFCLogger.debug("NMS adapter for server version \"" + nmsVersion + "\" found!");
+    OfcLogger.debug("NMS adapter for server version \"" + nmsVersion + "\" found!");
   }
 
   public static AbstractRegionFileCache<?> getRegionFileCache() {
diff --git a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractNmsManager.java b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractNmsManager.java
index a4e7d9e0..cf01323f 100644
--- a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractNmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractNmsManager.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.MathUtil;
-import net.imprex.orebfuscator.util.NamespacedKey;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.MathUtil;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 
 public abstract class AbstractNmsManager implements NmsManager {
 
diff --git a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/NmsManager.java
index 5d5041ca..56504894 100644
--- a/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/NmsManager.java
@@ -3,9 +3,10 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 
 public interface NmsManager {
 
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ServerVersion.java b/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/util/ServerVersion.java
similarity index 100%
rename from orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/ServerVersion.java
rename to orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/util/ServerVersion.java
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java
index b3c7a675..ec3cea25 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java
@@ -20,13 +20,13 @@
 import com.comphenix.protocol.wrappers.WrappedBlockData;
 import com.google.common.collect.ImmutableList;
 
-import net.imprex.orebfuscator.config.Config;
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.server.v1_16_R1.Block;
 import net.minecraft.server.v1_16_R1.BlockPosition;
 import net.minecraft.server.v1_16_R1.Blocks;
@@ -122,11 +122,11 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ChunkProviderServer serverChunkCache = level(world).getChunkProvider();
     BlockPosition.MutableBlockPosition position = new BlockPosition.MutableBlockPosition();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.c(pos.x, pos.y, pos.z);
       serverChunkCache.flagDirty(position);
     }
@@ -142,7 +142,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
     Map<ChunkCoordIntPair, List<MultiBlockChangeInfo>> sectionPackets = new HashMap<>();
     List<Packet<PacketListenerPlayOut>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/RegionFileCache.java
index a34d063d..f9ab9c4c 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_16_R1.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.server.v1_16_R1.ChunkCoordIntPair;
 import net.minecraft.server.v1_16_R1.RegionFile;
 import net.minecraft.server.v1_16_R1.RegionFileCompression;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/NmsManager.java
index 6a25c179..6b46ec1f 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/NmsManager.java
@@ -17,13 +17,13 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
 
-import net.imprex.orebfuscator.config.Config;
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.server.v1_16_R2.Block;
 import net.minecraft.server.v1_16_R2.BlockPosition;
 import net.minecraft.server.v1_16_R2.Blocks;
@@ -122,11 +122,11 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ChunkProviderServer serverChunkCache = level(world).getChunkProvider();
     BlockPosition.MutableBlockPosition position = new BlockPosition.MutableBlockPosition();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.c(pos.x, pos.y, pos.z);
       serverChunkCache.flagDirty(position);
     }
@@ -142,7 +142,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
     Map<SectionPosition, Map<Short, IBlockData>> sectionPackets = new HashMap<>();
     List<Packet<PacketListenerPlayOut>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/RegionFileCache.java
index 46f642aa..8f21e330 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.server.v1_16_R2.ChunkCoordIntPair;
 import net.minecraft.server.v1_16_R2.RegionFile;
 import net.minecraft.server.v1_16_R2.RegionFileCompression;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/NmsManager.java
index bc526a47..07ad70df 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/NmsManager.java
@@ -17,13 +17,13 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
 
-import net.imprex.orebfuscator.config.Config;
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.server.v1_16_R3.Block;
 import net.minecraft.server.v1_16_R3.BlockPosition;
 import net.minecraft.server.v1_16_R3.Blocks;
@@ -122,11 +122,11 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ChunkProviderServer serverChunkCache = level(world).getChunkProvider();
     BlockPosition.MutableBlockPosition position = new BlockPosition.MutableBlockPosition();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.c(pos.x, pos.y, pos.z);
       serverChunkCache.flagDirty(position);
     }
@@ -142,7 +142,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
     Map<SectionPosition, Map<Short, IBlockData>> sectionPackets = new HashMap<>();
     List<Packet<PacketListenerPlayOut>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/RegionFileCache.java
index 8732889a..c83356c4 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.server.v1_16_R3.ChunkCoordIntPair;
 import net.minecraft.server.v1_16_R3.RegionFile;
 import net.minecraft.server.v1_16_R3.RegionFileCompression;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/NmsManager.java
index f317e892..e73c3db3 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/NmsManager.java
@@ -18,12 +18,12 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
 
-import net.imprex.orebfuscator.config.Config;
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkProvider();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.getLevel();
     ServerChunkCache serverChunkCache = level.getChunkProvider();
@@ -139,7 +139,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Map<Short, BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/RegionFileCache.java
index f53400b7..1f8a67b9 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/NmsManager.java
index c58792db..278bcf19 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/NmsManager.java
@@ -16,14 +16,14 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
@@ -119,18 +119,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.getLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -139,7 +139,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/RegionFileCache.java
index 251d374e..8c47d18a 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/NmsManager.java
index 94f4ef81..4b3fb1a8 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/NmsManager.java
@@ -16,14 +16,14 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
@@ -119,18 +119,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.getLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -139,7 +139,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/RegionFileCache.java
index 5fed479d..f2bcffde 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/NmsManager.java
index e39a7a2e..824b5836 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.getLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/RegionFileCache.java
index db92754c..c61e9815 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/NmsManager.java
index 05cbf593..cfa67b46 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.getLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/RegionFileCache.java
index f3702b1b..6da00995 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/NmsManager.java
index 126614df..87b6529c 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.getLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/RegionFileCache.java
index 9fedc6c3..48b6fa66 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/NmsManager.java
index 82d01ddd..061fdbe0 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/RegionFileCache.java
index f4cc984a..1f272bde 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/NmsManager.java
index 86b77258..5f966f9f 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/RegionFileCache.java
index 8061a4fe..c19db0f1 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/NmsManager.java
index b6228a87..ca11a4af 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/RegionFileCache.java
index 6d1b69c4..1f585ce4 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R3/src/main/java/net/imprex/orebfuscator/nms/v1_20_R3/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/NmsManager.java
index e9ee66df..95135dc2 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/RegionFileCache.java
index b314d1b0..ea7e3d1b 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_20_R4/src/main/java/net/imprex/orebfuscator/nms/v1_20_R4/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/NmsManager.java
index 5bd8c06b..be9bef13 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/RegionFileCache.java
index d7c4a307..b61a5004 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R1/src/main/java/net/imprex/orebfuscator/nms/v1_21_R1/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/NmsManager.java
index 506f0f75..450aa095 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/RegionFileCache.java
index 67d6223e..683e7b3d 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R2/src/main/java/net/imprex/orebfuscator/nms/v1_21_R2/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/NmsManager.java
index 342a4e79..222df9e2 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/RegionFileCache.java
index f3c58f1f..fc8e844b 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R3/src/main/java/net/imprex/orebfuscator/nms/v1_21_R3/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/NmsManager.java
index 38d3780f..b96fd3e1 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.serverLevel();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/RegionFileCache.java
index 22463e60..889cc92f 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R4/src/main/java/net/imprex/orebfuscator/nms/v1_21_R4/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_21_R4.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/NmsManager.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/NmsManager.java
index 654cef07..570f4550 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/NmsManager.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/NmsManager.java
@@ -15,14 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
+import dev.imprex.orebfuscator.util.NamespacedKey;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
-import net.imprex.orebfuscator.config.Config;
 import net.imprex.orebfuscator.nms.AbstractNmsManager;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
-import net.imprex.orebfuscator.util.NamespacedKey;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -118,18 +118,18 @@ public int getBlockState(World world, int x, int y, int z) {
   }
 
   @Override
-  public void sendBlockUpdates(World world, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(World world, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerChunkCache serverChunkCache = level(world).getChunkSource();
     BlockPos.MutableBlockPos position = new BlockPos.MutableBlockPos();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       position.set(pos.x, pos.y, pos.z);
       serverChunkCache.blockChanged(position);
     }
   }
 
   @Override
-  public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.util.BlockPos> iterable) {
+  public void sendBlockUpdates(Player player, Iterable<dev.imprex.orebfuscator.util.BlockPos> iterable) {
     ServerPlayer serverPlayer = player(player);
     ServerLevel level = serverPlayer.level();
     ServerChunkCache serverChunkCache = level.getChunkSource();
@@ -138,7 +138,7 @@ public void sendBlockUpdates(Player player, Iterable<net.imprex.orebfuscator.uti
     Map<SectionPos, Short2ObjectMap<BlockState>> sectionPackets = new HashMap<>();
     List<Packet<ClientGamePacketListener>> blockEntityPackets = new ArrayList<>();
 
-    for (net.imprex.orebfuscator.util.BlockPos pos : iterable) {
+    for (dev.imprex.orebfuscator.util.BlockPos pos : iterable) {
       if (!serverChunkCache.isChunkLoaded(pos.x >> 4, pos.z >> 4)) {
         continue;
       }
diff --git a/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/RegionFileCache.java b/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/RegionFileCache.java
index 06088bf5..56924346 100644
--- a/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/RegionFileCache.java
+++ b/orebfuscator-nms/orebfuscator-nms-v1_21_R5/src/main/java/net/imprex/orebfuscator/nms/v1_21_R5/RegionFileCache.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_21_R5.CraftServer;
 
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
diff --git a/orebfuscator-plugin/pom.xml b/orebfuscator-plugin/pom.xml
index af2113bc..775add0e 100644
--- a/orebfuscator-plugin/pom.xml
+++ b/orebfuscator-plugin/pom.xml
@@ -102,8 +102,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>net.imprex</groupId>
-      <artifactId>orebfuscator-common</artifactId>
+      <groupId>dev.imprex.orebfuscator</groupId>
+      <artifactId>orebfuscator-core</artifactId>
       <version>${revision}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/Chunk.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/Chunk.java
similarity index 97%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/Chunk.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/Chunk.java
index 0f8ef83e..47f7c7b3 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/Chunk.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/Chunk.java
@@ -1,10 +1,11 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import java.util.Arrays;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
+import net.imprex.orebfuscator.chunk.ChunkStruct;
 import net.imprex.orebfuscator.util.HeightAccessor;
 
 public class Chunk implements AutoCloseable {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkCapabilities.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/ChunkCapabilities.java
similarity index 94%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkCapabilities.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/ChunkCapabilities.java
index 0ccc7f41..816a2c11 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkCapabilities.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/ChunkCapabilities.java
@@ -1,6 +1,6 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
-import net.imprex.orebfuscator.util.MinecraftVersion;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
 
 public final class ChunkCapabilities {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkSection.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/ChunkSection.java
similarity index 98%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkSection.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/ChunkSection.java
index 870cc62c..3ea8e82c 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkSection.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/ChunkSection.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import io.netty.buffer.ByteBuf;
 import net.imprex.orebfuscator.OrebfuscatorNms;
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/IndirectPalette.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/IndirectPalette.java
similarity index 97%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/IndirectPalette.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/IndirectPalette.java
index 3748a60f..2384f524 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/IndirectPalette.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/IndirectPalette.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import java.util.Arrays;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/SimpleVarBitBuffer.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/SimpleVarBitBuffer.java
similarity index 97%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/SimpleVarBitBuffer.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/SimpleVarBitBuffer.java
index 22c5f790..d99aa8e2 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/SimpleVarBitBuffer.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/SimpleVarBitBuffer.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 public class SimpleVarBitBuffer implements VarBitBuffer {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/SingleValuePalette.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/SingleValuePalette.java
similarity index 96%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/SingleValuePalette.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/SingleValuePalette.java
index cced6ee1..b5939a42 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/SingleValuePalette.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/chunk/SingleValuePalette.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.chunk;
+package dev.imprex.orebfuscator.chunk;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/AbstractWorldConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/AbstractWorldConfig.java
similarity index 87%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/AbstractWorldConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/AbstractWorldConfig.java
index 424179db..8499e4b6 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/AbstractWorldConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/AbstractWorldConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,14 +6,15 @@
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.config.components.WeightedBlockList;
-import net.imprex.orebfuscator.config.components.WorldMatcher;
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.config.api.WorldConfig;
+import dev.imprex.orebfuscator.config.components.WeightedBlockList;
+import dev.imprex.orebfuscator.config.components.WorldMatcher;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.MathUtil;
+import dev.imprex.orebfuscator.util.WeightedIntRandom;
 import net.imprex.orebfuscator.util.HeightAccessor;
-import net.imprex.orebfuscator.util.MathUtil;
-import net.imprex.orebfuscator.util.OFCLogger;
-import net.imprex.orebfuscator.util.WeightedIntRandom;
 
 public abstract class AbstractWorldConfig implements WorldConfig {
 
@@ -130,7 +131,7 @@ public boolean shouldObfuscate(int y) {
 
 
   WeightedIntRandom[] createWeightedRandoms(HeightAccessor heightAccessor) {
-    OFCLogger.debug(String.format("Creating weighted randoms for %s for world %s:", name, heightAccessor));
+    OfcLogger.debug(String.format("Creating weighted randoms for %s for world %s:", name, heightAccessor));
     return WeightedBlockList.create(heightAccessor, this.weightedBlockLists);
   }
 }
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorAdvancedConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorAdvancedConfig.java
similarity index 92%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorAdvancedConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorAdvancedConfig.java
index a254b0cc..1f7e35ef 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorAdvancedConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorAdvancedConfig.java
@@ -1,9 +1,10 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.util.OFCLogger;
+import dev.imprex.orebfuscator.config.api.AdvancedConfig;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.logging.OfcLogger;
 
 public class OrebfuscatorAdvancedConfig implements AdvancedConfig {
 
@@ -67,9 +68,9 @@ public void initialize() {
     this.obfuscationThreads = (int) (obfuscationWorkerThreadsSet ? obfuscationThreads : availableThreads);
     this.proximityThreads = (int) (proximityHiderThreadsSet ? proximityThreads : Math.ceil(availableThreads / 2f));
 
-    OFCLogger.setVerboseLogging(this.verbose);
-    OFCLogger.debug("advanced.obfuscationWorkerThreads = " + this.obfuscationThreads);
-    OFCLogger.debug("advanced.proximityHiderThreads = " + this.proximityThreads);
+    OfcLogger.setVerboseLogging(this.verbose);
+    OfcLogger.debug("advanced.obfuscationWorkerThreads = " + this.obfuscationThreads);
+    OfcLogger.debug("advanced.proximityHiderThreads = " + this.proximityThreads);
   }
 
   public void serialize(ConfigurationSection section) {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorBlockFlags.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorBlockFlags.java
similarity index 90%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorBlockFlags.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorBlockFlags.java
index be79024d..95e7632c 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorBlockFlags.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorBlockFlags.java
@@ -1,10 +1,11 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import java.util.Map.Entry;
 
+import dev.imprex.orebfuscator.config.api.BlockFlags;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.BlockStateProperties;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.util.BlockProperties;
-import net.imprex.orebfuscator.util.BlockStateProperties;
 
 public class OrebfuscatorBlockFlags implements BlockFlags {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorCacheConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorCacheConfig.java
similarity index 94%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorCacheConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorCacheConfig.java
index fa7f6652..0ef82fd6 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorCacheConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorCacheConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -10,9 +10,10 @@
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.util.ChunkPosition;
-import net.imprex.orebfuscator.util.OFCLogger;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 
 public class OrebfuscatorCacheConfig implements CacheConfig {
 
@@ -68,7 +69,7 @@ public void deserialize(ConfigurationSection section, ConfigParsingContext conte
 
     // try create diskCache.directory
     if (this.enabledValue && this.enableDiskCacheValue) {
-      OFCLogger.debug("Using '" + this.baseDirectory.toAbsolutePath() + "' as chunk cache path");
+      OfcLogger.debug("Using '" + this.baseDirectory.toAbsolutePath() + "' as chunk cache path");
       try {
         if (Files.notExists(this.baseDirectory)) {
           Files.createDirectories(this.baseDirectory);
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorConfig.java
similarity index 93%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorConfig.java
index 19d6b98a..3e113f76 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -21,17 +21,25 @@
 
 import com.google.common.hash.Hashing;
 
+import dev.imprex.orebfuscator.config.api.AdvancedConfig;
+import dev.imprex.orebfuscator.config.api.BlockFlags;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.config.api.Config;
+import dev.imprex.orebfuscator.config.api.GeneralConfig;
+import dev.imprex.orebfuscator.config.api.ObfuscationConfig;
+import dev.imprex.orebfuscator.config.api.ProximityConfig;
+import dev.imprex.orebfuscator.config.api.WorldConfigBundle;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.config.context.DefaultConfigParsingContext;
+import dev.imprex.orebfuscator.config.migrations.ConfigMigrator;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
+import dev.imprex.orebfuscator.util.WeightedIntRandom;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorCompatibility;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.config.context.DefaultConfigParsingContext;
-import net.imprex.orebfuscator.config.migrations.ConfigMigrator;
-import net.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.util.HeightAccessor;
-import net.imprex.orebfuscator.util.MinecraftVersion;
-import net.imprex.orebfuscator.util.OFCLogger;
-import net.imprex.orebfuscator.util.WeightedIntRandom;
 
 public class OrebfuscatorConfig implements Config {
 
@@ -342,14 +350,14 @@ private <T extends AbstractWorldConfig> T findConfig(Stream<? extends T> configs
           .collect(Collectors.toList());
 
       if (matchingConfigs.size() > 1) {
-        OFCLogger.warn(
+        OfcLogger.warn(
             String.format("world '%s' has more than one %s config choosing first one", worldName, configType));
       }
 
       T config = matchingConfigs.size() > 0 ? matchingConfigs.get(0) : null;
       String configName = config == null ? "null" : config.getName();
 
-      OFCLogger.debug(String.format("using '%s' %s config for world '%s'", configName, configType, worldName));
+      OfcLogger.debug(String.format("using '%s' %s config for world '%s'", configName, configType, worldName));
 
       return config;
     }
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorGeneralConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorGeneralConfig.java
similarity index 91%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorGeneralConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorGeneralConfig.java
index 080e0797..888c0a62 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorGeneralConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorGeneralConfig.java
@@ -1,8 +1,9 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.config.api.GeneralConfig;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
 
 public class OrebfuscatorGeneralConfig implements GeneralConfig {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorObfuscationConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorObfuscationConfig.java
similarity index 91%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorObfuscationConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorObfuscationConfig.java
index 1bb9df4e..b5ab511c 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorObfuscationConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorObfuscationConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -7,9 +7,10 @@
 
 import org.bukkit.configuration.ConfigurationSection;
 
+import dev.imprex.orebfuscator.config.api.ObfuscationConfig;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.util.BlockProperties;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.util.BlockProperties;
 
 public class OrebfuscatorObfuscationConfig extends AbstractWorldConfig implements ObfuscationConfig {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java
similarity index 95%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java
index 405ca56a..75a4b06d 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -8,10 +8,12 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.joml.Matrix4f;
 
+import dev.imprex.orebfuscator.config.api.BlockFlags;
+import dev.imprex.orebfuscator.config.api.ProximityConfig;
+import dev.imprex.orebfuscator.config.components.WeightedBlockList;
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.util.BlockProperties;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.components.WeightedBlockList;
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.util.BlockProperties;
 
 public class OrebfuscatorProximityConfig extends AbstractWorldConfig implements ProximityConfig {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/ProximityHeightCondition.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/ProximityHeightCondition.java
similarity index 94%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/ProximityHeightCondition.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/ProximityHeightCondition.java
index ffe40596..aaed0a24 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/ProximityHeightCondition.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/ProximityHeightCondition.java
@@ -1,6 +1,6 @@
-package net.imprex.orebfuscator.config;
+package dev.imprex.orebfuscator.config;
 
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockPos;
 
 /**
  * Only use 25 MSBs of blockFlags for ProximityHeightCondition 12 bit min y | 12 bit max y | 1 bit present
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/components/WeightedBlockList.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/components/WeightedBlockList.java
similarity index 87%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/components/WeightedBlockList.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/components/WeightedBlockList.java
index af4b9e4b..2a550f91 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/components/WeightedBlockList.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/components/WeightedBlockList.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config.components;
+package dev.imprex.orebfuscator.config.components;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,14 +9,14 @@
 
 import org.bukkit.configuration.ConfigurationSection;
 
+import dev.imprex.orebfuscator.config.context.ConfigParsingContext;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockProperties;
+import dev.imprex.orebfuscator.util.MathUtil;
+import dev.imprex.orebfuscator.util.WeightedIntRandom;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.context.ConfigParsingContext;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.BlockProperties;
 import net.imprex.orebfuscator.util.HeightAccessor;
-import net.imprex.orebfuscator.util.MathUtil;
-import net.imprex.orebfuscator.util.OFCLogger;
-import net.imprex.orebfuscator.util.WeightedIntRandom;
 
 public class WeightedBlockList {
 
@@ -45,7 +45,7 @@ public static WeightedIntRandom[] create(HeightAccessor heightAccessor, List<Wei
         for (WeightedBlockList list : next) {
           for (Map.Entry<BlockProperties, Integer> entry : list.blocks.entrySet()) {
             if (!builder.add(entry.getKey().getDefaultBlockState().getId(), entry.getValue())) {
-              OFCLogger.warn(String.format("duplicate randomBlock entry for %s in %s",
+              OfcLogger.warn(String.format("duplicate randomBlock entry for %s in %s",
                   entry.getKey().getKey(), list.name));
             }
           }
@@ -62,7 +62,7 @@ public static WeightedIntRandom[] create(HeightAccessor heightAccessor, List<Wei
       next.clear();
     }
 
-    OFCLogger.debug(String.format("Successfully created %s weigthed randoms", count));
+    OfcLogger.debug(String.format("Successfully created %s weigthed randoms", count));
 
     return heightMap;
   }
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigration.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigration.java
similarity index 91%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigration.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigration.java
index c1200fd1..b2c30cf2 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigration.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigration.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config.migrations;
+package dev.imprex.orebfuscator.config.migrations;
 
 import java.util.List;
 import java.util.Map;
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV1.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV1.java
similarity index 97%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV1.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV1.java
index 08e31615..3580768a 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV1.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV1.java
@@ -1,4 +1,4 @@
-package net.imprex.orebfuscator.config.migrations;
+package dev.imprex.orebfuscator.config.migrations;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV2.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV2.java
similarity index 93%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV2.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV2.java
index ae21effc..20cdce80 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV2.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV2.java
@@ -1,8 +1,8 @@
-package net.imprex.orebfuscator.config.migrations;
+package dev.imprex.orebfuscator.config.migrations;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockPos;
 
 class ConfigMigrationV2 implements ConfigMigration {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV3.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV3.java
similarity index 97%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV3.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV3.java
index a33dddfb..6934d8b1 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrationV3.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrationV3.java
@@ -1,11 +1,11 @@
-package net.imprex.orebfuscator.config.migrations;
+package dev.imprex.orebfuscator.config.migrations;
 
 import java.util.List;
 import java.util.Map;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockPos;
 
 class ConfigMigrationV3 implements ConfigMigration {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrator.java b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrator.java
similarity index 80%
rename from orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrator.java
rename to orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrator.java
index a8f06caf..f09b0ef7 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/config/migrations/ConfigMigrator.java
+++ b/orebfuscator-plugin/src/main/java/dev/imprex/orebfuscator/config/migrations/ConfigMigrator.java
@@ -1,11 +1,11 @@
-package net.imprex.orebfuscator.config.migrations;
+package dev.imprex.orebfuscator.config.migrations;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.imprex.orebfuscator.util.OFCLogger;
+import dev.imprex.orebfuscator.logging.OfcLogger;
 
 public class ConfigMigrator {
 
@@ -31,12 +31,12 @@ public static void migrateToLatestVersion(ConfigurationSection section) {
         break;
       }
 
-      OFCLogger.info("Starting to migrate config to version " + targetVersion);
+      OfcLogger.info("Starting to migrate config to version " + targetVersion);
 
       section = migration.migrate(section);
       section.set("version", targetVersion);
 
-      OFCLogger.info("Successfully migrated config to version " + targetVersion);
+      OfcLogger.info("Successfully migrated config to version " + targetVersion);
     }
   }
 }
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/MetricsSystem.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/MetricsSystem.java
index 41be5fdc..86d0ccd3 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/MetricsSystem.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/MetricsSystem.java
@@ -10,8 +10,8 @@
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
-import net.imprex.orebfuscator.util.MathUtil;
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.util.MathUtil;
 
 public class MetricsSystem {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/Orebfuscator.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/Orebfuscator.java
index 2cee85c2..eaaf70d8 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/Orebfuscator.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/Orebfuscator.java
@@ -10,16 +10,16 @@
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
 import net.imprex.orebfuscator.api.OrebfuscatorService;
 import net.imprex.orebfuscator.cache.ObfuscationCache;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
 import net.imprex.orebfuscator.obfuscation.ObfuscationSystem;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayerMap;
 import net.imprex.orebfuscator.proximity.ProximityDirectorThread;
 import net.imprex.orebfuscator.proximity.ProximityPacketListener;
 import net.imprex.orebfuscator.util.HeightAccessor;
-import net.imprex.orebfuscator.util.MinecraftVersion;
-import net.imprex.orebfuscator.util.OFCLogger;
 
 public class Orebfuscator extends JavaPlugin implements Listener {
 
@@ -36,7 +36,7 @@ public class Orebfuscator extends JavaPlugin implements Listener {
 
   @Override
   public void onLoad() {
-    OFCLogger.LOGGER = getLogger();
+    OfcLogger.LOGGER = getLogger();
   }
 
   @Override
@@ -98,7 +98,7 @@ public void onEnable() {
       // add commands
       getCommand("orebfuscator").setExecutor(new OrebfuscatorCommand(this));
     } catch (Exception e) {
-      OFCLogger.error("An error occurred while enabling plugin", e);
+      OfcLogger.error("An error occurred while enabling plugin", e);
 
       this.getServer().getPluginManager().registerEvent(PluginEnableEvent.class, this, EventPriority.NORMAL,
           this::onEnableFailed, this);
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/OrebfuscatorCommand.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/OrebfuscatorCommand.java
index 8e152466..8c88dd58 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/OrebfuscatorCommand.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/OrebfuscatorCommand.java
@@ -29,10 +29,10 @@
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonWriter;
 
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.JavaVersion;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
 import net.imprex.orebfuscator.util.HeightAccessor;
-import net.imprex.orebfuscator.util.JavaVersion;
-import net.imprex.orebfuscator.util.MinecraftVersion;
-import net.imprex.orebfuscator.util.OFCLogger;
 import net.imprex.orebfuscator.util.PermissionUtil;
 
 public class OrebfuscatorCommand implements CommandExecutor, TabCompleter {
@@ -112,7 +112,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
       Base64.Encoder encoder = Base64.getUrlEncoder();
 
-      String latestLog = OFCLogger.getLatestVerboseLog();
+      String latestLog = OfcLogger.getLatestVerboseLog();
       root.addProperty("verboseLog", encoder.encodeToString(latestLog.getBytes(StandardCharsets.UTF_8)));
 
       try {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/UpdateSystem.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/UpdateSystem.java
index 83bdfa58..e3b4eb93 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/UpdateSystem.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/UpdateSystem.java
@@ -18,12 +18,12 @@
 
 import com.google.gson.annotations.SerializedName;
 
-import net.imprex.orebfuscator.config.GeneralConfig;
+import dev.imprex.orebfuscator.config.api.GeneralConfig;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.MinecraftVersion;
+import dev.imprex.orebfuscator.util.Version;
 import net.imprex.orebfuscator.util.AbstractHttpService;
 import net.imprex.orebfuscator.util.ConsoleUtil;
-import net.imprex.orebfuscator.util.MinecraftVersion;
-import net.imprex.orebfuscator.util.OFCLogger;
-import net.imprex.orebfuscator.util.Version;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
@@ -62,7 +62,7 @@ public UpdateSystem(Orebfuscator orebfuscator) {
   private CompletableFuture<Optional<ModrinthVersion>> requestLatestVersion() {
     String installedVersion = this.orebfuscator.getDescription().getVersion();
     if (!this.generalConfig.checkForUpdates() || isDevVersion(installedVersion)) {
-      OFCLogger.debug("UpdateSystem - Update check disabled or dev version detected; skipping");
+      OfcLogger.debug("UpdateSystem - Update check disabled or dev version detected; skipping");
       return CompletableFuture.completedFuture(Optional.empty());
     }
 
@@ -77,13 +77,13 @@ private CompletableFuture<Optional<ModrinthVersion>> requestLatestVersion() {
               .findFirst();
 
           latestVersion.ifPresentOrElse(
-              v -> OFCLogger.debug("UpdateSystem - Fetched latest version " + v.version),
-              () -> OFCLogger.debug("UpdateSystem - Couldn't fetch latest version"));
+              v -> OfcLogger.debug("UpdateSystem - Fetched latest version " + v.version),
+              () -> OfcLogger.debug("UpdateSystem - Couldn't fetch latest version"));
 
           return latestVersion.map(v -> version.isBelow(v.version) ? v : null);
         })
     ).exceptionally(throwable -> {
-      OFCLogger.log(Level.WARNING, "UpdateSystem - Unable to fetch latest version", throwable);
+      OfcLogger.log(Level.WARNING, "UpdateSystem - Unable to fetch latest version", throwable);
       return Optional.empty();
     });
   }
@@ -92,7 +92,7 @@ private CompletableFuture<Optional<ModrinthVersion>> getLatestVersion() {
     Instant validUntil = this.validUntil.get();
     if (validUntil != null && validUntil.compareTo(Instant.now()) < 0 && this.validUntil.compareAndSet(validUntil,
         null)) {
-      OFCLogger.debug("UpdateSystem - Cleared latest cached version");
+      OfcLogger.debug("UpdateSystem - Cleared latest cached version");
       this.latestVersion.set(null);
     }
 
@@ -103,7 +103,7 @@ private CompletableFuture<Optional<ModrinthVersion>> getLatestVersion() {
 
     CompletableFuture<Optional<ModrinthVersion>> newFuture = new CompletableFuture<>();
     if (this.latestVersion.compareAndSet(null, newFuture)) {
-      OFCLogger.debug("UpdateSystem - Starting to check for updates");
+      OfcLogger.debug("UpdateSystem - Starting to check for updates");
       this.requestLatestVersion().thenAccept(version -> {
         this.validUntil.set(Instant.now().plus(CACHE_DURATION));
         newFuture.complete(version);
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/AsyncChunkSerializer.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/AsyncChunkSerializer.java
index 156aefa8..73585a2f 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/AsyncChunkSerializer.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/AsyncChunkSerializer.java
@@ -10,8 +10,8 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.Orebfuscator;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 /**
  * This class works similar to a bounded buffer for cache read and write requests but also functions as the only
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CacheFileCleanupTask.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CacheFileCleanupTask.java
index ccfa3ee6..13dc5f14 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CacheFileCleanupTask.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CacheFileCleanupTask.java
@@ -7,11 +7,11 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 
+import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.logging.OfcLogger;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.CacheConfig;
-import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
-import net.imprex.orebfuscator.util.OFCLogger;
 
 public class CacheFileCleanupTask implements Runnable {
 
@@ -26,7 +26,7 @@ public CacheFileCleanupTask(Orebfuscator orebfuscator) {
   @Override
   public void run() {
     if (Files.notExists(this.cacheConfig.baseDirectory())) {
-      OFCLogger.debug("Skipping CacheFileCleanupTask as the cache directory doesn't exist.");
+      OfcLogger.debug("Skipping CacheFileCleanupTask as the cache directory doesn't exist.");
       return;
     }
 
@@ -45,7 +45,7 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attributes) thro
             Files.delete(path);
 
             CacheFileCleanupTask.this.deleteCount++;
-            OFCLogger.debug("deleted cache file: " + path);
+            OfcLogger.debug("deleted cache file: " + path);
           }
           return FileVisitResult.CONTINUE;
         }
@@ -55,7 +55,7 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attributes) thro
     }
 
     if (this.deleteCount > 0) {
-      OFCLogger.info(String.format("CacheFileCleanupTask successfully deleted %d cache file(s)", this.deleteCount));
+      OfcLogger.info(String.format("CacheFileCleanupTask successfully deleted %d cache file(s)", this.deleteCount));
     }
   }
 }
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ChunkSerializer.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ChunkSerializer.java
index 59f5ea4a..cc71ace0 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ChunkSerializer.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ChunkSerializer.java
@@ -4,8 +4,8 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class ChunkSerializer {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CompressedObfuscationResult.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CompressedObfuscationResult.java
index 7eb2f613..cb68b894 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CompressedObfuscationResult.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/CompressedObfuscationResult.java
@@ -9,10 +9,10 @@
 import java.util.Collection;
 import java.util.Optional;
 
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.obfuscation.ObfuscationRequest;
 import net.imprex.orebfuscator.obfuscation.ObfuscationResult;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.ChunkPosition;
 import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ObfuscationCache.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ObfuscationCache.java
index 4eb6dc40..79562664 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ObfuscationCache.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/cache/ObfuscationCache.java
@@ -7,13 +7,13 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalNotification;
 
+import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorCompatibility;
 import net.imprex.orebfuscator.OrebfuscatorStatistics;
-import net.imprex.orebfuscator.config.CacheConfig;
 import net.imprex.orebfuscator.obfuscation.ObfuscationRequest;
 import net.imprex.orebfuscator.obfuscation.ObfuscationResult;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class ObfuscationCache {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkStruct.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkStruct.java
index b351b711..d253f651 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkStruct.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/ChunkStruct.java
@@ -12,7 +12,8 @@
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.chunk.ChunkCapabilities;
+import dev.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.util.HeightAccessor;
 
 public class ChunkStruct {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/WrappedClientboundLevelChunkPacketData.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/WrappedClientboundLevelChunkPacketData.java
index 4b20d3bc..f95f8e3f 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/WrappedClientboundLevelChunkPacketData.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/chunk/WrappedClientboundLevelChunkPacketData.java
@@ -9,7 +9,7 @@
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.utility.MinecraftReflection;
 
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockPos;
 
 public class WrappedClientboundLevelChunkPacketData {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationListener.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationListener.java
index 6d7fda2e..c8a0f08b 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationListener.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationListener.java
@@ -19,9 +19,9 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.UpdateSystem;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
 import net.imprex.orebfuscator.util.ConsoleUtil;
 import net.imprex.orebfuscator.util.PermissionUtil;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationWorker.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationWorker.java
index f2007153..55f82de8 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationWorker.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationWorker.java
@@ -10,15 +10,15 @@
 
 import com.google.common.collect.Iterables;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.config.api.BlockFlags;
+import dev.imprex.orebfuscator.config.api.ObfuscationConfig;
+import dev.imprex.orebfuscator.config.api.WorldConfigBundle;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorNms;
 import net.imprex.orebfuscator.cache.ObfuscationCache;
-import net.imprex.orebfuscator.config.BlockFlags;
-import net.imprex.orebfuscator.config.ObfuscationConfig;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
-import net.imprex.orebfuscator.config.WorldConfigBundle;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class DeobfuscationWorker {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationListener.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationListener.java
index c5de280f..a43ef5e7 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationListener.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationListener.java
@@ -19,15 +19,15 @@
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.config.api.AdvancedConfig;
+import dev.imprex.orebfuscator.logging.OfcLogger;
+import dev.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorCompatibility;
 import net.imprex.orebfuscator.chunk.ChunkStruct;
-import net.imprex.orebfuscator.config.AdvancedConfig;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayer;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayerMap;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.OFCLogger;
 import net.imprex.orebfuscator.util.PermissionUtil;
 import net.imprex.orebfuscator.util.ServerVersion;
 
@@ -116,7 +116,7 @@ public void onPacketSending(PacketEvent event) {
       } else if (chunk != null) {
         this.complete(event, struct, chunk);
       } else {
-        OFCLogger.warn(String.format("skipping chunk[world=%s, x=%d, z=%d] because obfuscation result is missing",
+        OfcLogger.warn(String.format("skipping chunk[world=%s, x=%d, z=%d] because obfuscation result is missing",
             struct.world.getName(), struct.chunkX, struct.chunkZ));
         this.asynchronousManager.signalPacketTransmission(event);
       }
@@ -129,10 +129,10 @@ private boolean shouldNotObfuscate(Player player) {
 
   private void completeExceptionally(PacketEvent event, ChunkStruct struct, Throwable throwable) {
     if (throwable instanceof TimeoutException) {
-      OFCLogger.warn(String.format("Obfuscation for chunk[world=%s, x=%d, z=%d] timed out",
+      OfcLogger.warn(String.format("Obfuscation for chunk[world=%s, x=%d, z=%d] timed out",
           struct.world.getName(), struct.chunkX, struct.chunkZ));
     } else {
-      OFCLogger.error(String.format("An error occurred while obfuscating chunk[world=%s, x=%d, z=%d]",
+      OfcLogger.error(String.format("An error occurred while obfuscating chunk[world=%s, x=%d, z=%d]",
           struct.world.getName(), struct.chunkX, struct.chunkZ), throwable);
     }
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationProcessor.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationProcessor.java
index 2d896aa6..611da34b 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationProcessor.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationProcessor.java
@@ -7,18 +7,18 @@
 
 import org.bukkit.World;
 
+import dev.imprex.orebfuscator.chunk.Chunk;
+import dev.imprex.orebfuscator.chunk.ChunkSection;
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.config.ProximityHeightCondition;
+import dev.imprex.orebfuscator.config.api.BlockFlags;
+import dev.imprex.orebfuscator.config.api.ObfuscationConfig;
+import dev.imprex.orebfuscator.config.api.ProximityConfig;
+import dev.imprex.orebfuscator.config.api.WorldConfigBundle;
+import dev.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.chunk.Chunk;
-import net.imprex.orebfuscator.chunk.ChunkSection;
 import net.imprex.orebfuscator.chunk.ChunkStruct;
-import net.imprex.orebfuscator.config.BlockFlags;
-import net.imprex.orebfuscator.config.ObfuscationConfig;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
-import net.imprex.orebfuscator.config.ProximityConfig;
-import net.imprex.orebfuscator.config.ProximityHeightCondition;
-import net.imprex.orebfuscator.config.WorldConfigBundle;
-import net.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.util.HeightAccessor;
 
 public class ObfuscationProcessor {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationRequest.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationRequest.java
index 7258e45d..929b4305 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationRequest.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationRequest.java
@@ -7,10 +7,10 @@
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.chunk.ChunkStruct;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class ObfuscationRequest {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationResult.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationResult.java
index dd43f71a..2d245e5d 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationResult.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationResult.java
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.Set;
 
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.ChunkPosition;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 
 public class ObfuscationResult {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSystem.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSystem.java
index e2add2fa..aa1563e0 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSystem.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSystem.java
@@ -5,10 +5,10 @@
 
 import org.bukkit.block.Block;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.cache.ObfuscationCache;
 import net.imprex.orebfuscator.chunk.ChunkStruct;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
 
 public class ObfuscationSystem {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTask.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTask.java
index 41c6bec9..4367b44b 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTask.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTask.java
@@ -6,12 +6,12 @@
 
 import org.bukkit.World;
 
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.ChunkDirection;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.OrebfuscatorCompatibility;
 import net.imprex.orebfuscator.chunk.ChunkStruct;
 import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.ChunkDirection;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class ObfuscationTask {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTaskDispatcher.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTaskDispatcher.java
index f1748af5..9bb68bff 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTaskDispatcher.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationTaskDispatcher.java
@@ -6,8 +6,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
 
+import dev.imprex.orebfuscator.config.api.AdvancedConfig;
 import net.imprex.orebfuscator.Orebfuscator;
-import net.imprex.orebfuscator.config.AdvancedConfig;
 
 class ObfuscationTaskDispatcher {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayer.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayer.java
index 36e8b99b..32d41399 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayer.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayer.java
@@ -11,10 +11,10 @@
 
 import com.google.common.base.Objects;
 
+import dev.imprex.orebfuscator.config.api.AdvancedConfig;
+import dev.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.ChunkPosition;
 import net.imprex.orebfuscator.Orebfuscator;
-import net.imprex.orebfuscator.config.AdvancedConfig;
-import net.imprex.orebfuscator.util.BlockPos;
-import net.imprex.orebfuscator.util.ChunkPosition;
 
 public class OrebfuscatorPlayer {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayerChunk.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayerChunk.java
index c9d79868..acff2eb1 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayerChunk.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/player/OrebfuscatorPlayerChunk.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import net.imprex.orebfuscator.util.BlockPos;
+import dev.imprex.orebfuscator.util.BlockPos;
 
 public class OrebfuscatorPlayerChunk {
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityDirectorThread.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityDirectorThread.java
index e5c2f9cb..ce557949 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityDirectorThread.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityDirectorThread.java
@@ -16,9 +16,9 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+import dev.imprex.orebfuscator.config.api.AdvancedConfig;
+import dev.imprex.orebfuscator.logging.OfcLogger;
 import net.imprex.orebfuscator.Orebfuscator;
-import net.imprex.orebfuscator.config.AdvancedConfig;
-import net.imprex.orebfuscator.util.OFCLogger;
 import net.imprex.orebfuscator.util.RingTimer;
 
 public class ProximityDirectorThread extends Thread implements Listener {
@@ -180,7 +180,7 @@ public void run() {
     }
 
     if (this.phaser.isTerminated() && this.running) {
-      OFCLogger.error("Looks like we encountered an invalid state, please report this:",
+      OfcLogger.error("Looks like we encountered an invalid state, please report this:",
           new IllegalStateException("Proximity Phaser terminated!"));
     }
   }
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityPacketListener.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityPacketListener.java
index b7047494..79a07fc2 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityPacketListener.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityPacketListener.java
@@ -12,10 +12,10 @@
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.wrappers.ChunkCoordIntPair;
 
+import dev.imprex.orebfuscator.chunk.ChunkCapabilities;
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.config.api.ProximityConfig;
 import net.imprex.orebfuscator.Orebfuscator;
-import net.imprex.orebfuscator.chunk.ChunkCapabilities;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
-import net.imprex.orebfuscator.config.ProximityConfig;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayer;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayerMap;
 import net.imprex.orebfuscator.util.PermissionUtil;
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityWorker.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityWorker.java
index bcde8411..f072d76a 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityWorker.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/proximity/ProximityWorker.java
@@ -11,15 +11,15 @@
 import org.joml.FrustumIntersection;
 import org.joml.Quaternionf;
 
+import dev.imprex.orebfuscator.config.OrebfuscatorConfig;
+import dev.imprex.orebfuscator.config.api.ProximityConfig;
+import dev.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorCompatibility;
 import net.imprex.orebfuscator.OrebfuscatorNms;
-import net.imprex.orebfuscator.config.OrebfuscatorConfig;
-import net.imprex.orebfuscator.config.ProximityConfig;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayer;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayerChunk;
 import net.imprex.orebfuscator.player.OrebfuscatorPlayerMap;
-import net.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.util.FastGazeUtil;
 import net.imprex.orebfuscator.util.PermissionUtil;
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/AbstractHttpService.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/AbstractHttpService.java
index b6a6dbe8..1ab196ce 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/AbstractHttpService.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/AbstractHttpService.java
@@ -16,6 +16,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import dev.imprex.orebfuscator.util.Version;
 import net.imprex.orebfuscator.Orebfuscator;
 
 public abstract class AbstractHttpService {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/ConsoleUtil.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/ConsoleUtil.java
index 07ae4f72..0a51380f 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/ConsoleUtil.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/ConsoleUtil.java
@@ -7,6 +7,8 @@
 
 import org.bukkit.ChatColor;
 
+import dev.imprex.orebfuscator.logging.OfcLogger;
+
 public final class ConsoleUtil {
 
   private static final int BOX_PADDING = 3;
@@ -24,7 +26,7 @@ public static String replaceAnsiColorWithChatColor(String value) {
 
   public static void printBox(Level level, String... lines) {
     for (String line : createBox(lines)) {
-      OFCLogger.log(level, line);
+      OfcLogger.log(level, line);
     }
   }
 
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/FastGazeUtil.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/FastGazeUtil.java
index 105d3899..bc7c7fe4 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/FastGazeUtil.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/FastGazeUtil.java
@@ -3,6 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 
+import dev.imprex.orebfuscator.util.BlockPos;
 import net.imprex.orebfuscator.OrebfuscatorNms;
 
 public class FastGazeUtil {
diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/HeightAccessor.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/HeightAccessor.java
index d4bc98bb..31901bb8 100644
--- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/HeightAccessor.java
+++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/util/HeightAccessor.java
@@ -13,7 +13,8 @@
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 
-import net.imprex.orebfuscator.chunk.ChunkCapabilities;
+import dev.imprex.orebfuscator.chunk.ChunkCapabilities;
+import dev.imprex.orebfuscator.logging.OfcLogger;
 
 public class HeightAccessor {
 
@@ -32,7 +33,7 @@ private static MethodAccessor getWorldMethod(String methodName) {
       if (methodAccessor == null) {
         throw new RuntimeException("unable to find method: World::" + methodName + "()");
       }
-      OFCLogger.debug("HeightAccessor found method: World::" + methodName + "()");
+      OfcLogger.debug("HeightAccessor found method: World::" + methodName + "()");
       return methodAccessor;
     }
     return null;
diff --git a/orebfuscator-plugin/src/test/java/net/imprex/orebfuscator/config/ProximityHeightConditionTest.java b/orebfuscator-plugin/src/test/java/net/imprex/orebfuscator/config/ProximityHeightConditionTest.java
index b52b07e4..49674058 100644
--- a/orebfuscator-plugin/src/test/java/net/imprex/orebfuscator/config/ProximityHeightConditionTest.java
+++ b/orebfuscator-plugin/src/test/java/net/imprex/orebfuscator/config/ProximityHeightConditionTest.java
@@ -6,6 +6,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import dev.imprex.orebfuscator.config.ProximityHeightCondition;
+
 public class ProximityHeightConditionTest {
 
   private static final int TEST_MIN = ProximityHeightCondition.clampY(-0xFFF);
diff --git a/pom.xml b/pom.xml
index e548b45c..8cd3692f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,10 +54,10 @@
   <modules>
     <module>orebfuscator-api</module>
     <module>orebfuscator-api-example</module>
-    <module>orebfuscator-common</module>
     <module>orebfuscator-compatibility</module>
     <module>orebfuscator-nms</module>
     <module>orebfuscator-plugin</module>
+    <module>orebfuscator-core</module>
   </modules>
 
   <profiles>