diff --git a/sources/src/main/java/io/akarin/server/mixin/core/Bootstrap.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java
similarity index 97%
rename from sources/src/main/java/io/akarin/server/mixin/core/Bootstrap.java
rename to sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java
index 341605bd0..13301606d 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/Bootstrap.java
+++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.bootstrap;
 
 import java.io.File;
 import java.io.PrintStream;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/DummyEula.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java
similarity index 94%
rename from sources/src/main/java/io/akarin/server/mixin/core/DummyEula.java
rename to sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java
index 310b3c804..1598cbf27 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/DummyEula.java
+++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.bootstrap;
 
 import java.io.File;
 
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MetricsBootstrap.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java
similarity index 98%
rename from sources/src/main/java/io/akarin/server/mixin/core/MetricsBootstrap.java
rename to sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java
index 528955d25..6ff1892c2 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/MetricsBootstrap.java
+++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.bootstrap;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java
similarity index 99%
rename from sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java
rename to sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java
index 762632b3c..0b77f3c23 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java
+++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.bootstrap;
 
 import java.io.DataOutputStream;
 import java.net.URL;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/ParallelRegistry.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java
similarity index 99%
rename from sources/src/main/java/io/akarin/server/mixin/core/ParallelRegistry.java
rename to sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java
index 5c90c3633..fc3530765 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/ParallelRegistry.java
+++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.bootstrap;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/Watchcat.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java
similarity index 99%
rename from sources/src/main/java/io/akarin/server/mixin/core/Watchcat.java
rename to sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java
index c08b83a1b..c03909ecf 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/Watchcat.java
+++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.bootstrap;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinPlayerConnection.java b/sources/src/main/java/io/akarin/server/mixin/nsc/MixinPlayerConnection.java
similarity index 90%
rename from sources/src/main/java/io/akarin/server/mixin/core/MixinPlayerConnection.java
rename to sources/src/main/java/io/akarin/server/mixin/nsc/MixinPlayerConnection.java
index 0af09df21..5cb9a6096 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/MixinPlayerConnection.java
+++ b/sources/src/main/java/io/akarin/server/mixin/nsc/MixinPlayerConnection.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.nsc;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/NonblockingServerConnection.java b/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java
similarity index 99%
rename from sources/src/main/java/io/akarin/server/mixin/core/NonblockingServerConnection.java
rename to sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java
index 4cfac70a1..db23cac09 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/NonblockingServerConnection.java
+++ b/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.nsc;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/OptimisticNetworkManager.java b/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java
similarity index 98%
rename from sources/src/main/java/io/akarin/server/mixin/core/OptimisticNetworkManager.java
rename to sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java
index cc8344182..c0f35c660 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/OptimisticNetworkManager.java
+++ b/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java
@@ -1,4 +1,4 @@
-package io.akarin.server.mixin.core;
+package io.akarin.server.mixin.nsc;
 
 import java.util.Queue;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
diff --git a/sources/src/main/resources/mixins.akarin.core.json b/sources/src/main/resources/mixins.akarin.core.json
index f6da265e5..528a83d83 100644
--- a/sources/src/main/resources/mixins.akarin.core.json
+++ b/sources/src/main/resources/mixins.akarin.core.json
@@ -1,26 +1,27 @@
 {
     "required": true,
     "minVersion": "0",
-    "package": "io.akarin.server.mixin.core",
+    "package": "io.akarin.server.mixin",
     "target": "@env(DEFAULT)",
     "compatibilityLevel": "JAVA_8",
     "server": [
-        "Watchcat",
-        "Bootstrap",
-        "DummyEula",
-        "DesyncCatcher",
-        "ParallelRegistry",
-        "MetricsBootstrap",
-        "OptimisticNetworkManager",
-        "NonblockingServerConnection",
+        "bootstrap.Watchcat",
+        "bootstrap.Bootstrap",
+        "bootstrap.DummyEula",
+        "bootstrap.MixinMetrics",
+        "bootstrap.ParallelRegistry",
+        "bootstrap.MetricsBootstrap",
         
-        "MixinMCUtil",
-        "MixinMetrics",
-        "MixinCraftServer",
-        "MixinVersionCommand",
-        "MixinMinecraftServer",
-        "MixinChunkIOExecutor",
-        "MixinPlayerConnection",
-        "MixinTileEntityEnchantTable"
+        "core.MixinMCUtil",
+        "core.DesyncCatcher",
+        "core.MixinCraftServer",
+        "core.MixinVersionCommand",
+        "core.MixinMinecraftServer",
+        "core.MixinChunkIOExecutor",
+        "core.MixinTileEntityEnchantTable",
+        
+        "nsc.MixinPlayerConnection",
+        "nsc.OptimisticNetworkManager",
+        "nsc.NonblockingServerConnection"
     ]
 }
\ No newline at end of file