diff --git a/common/build.gradle b/common/build.gradle
index 8ab38b35..ec06510c 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -79,7 +79,7 @@ shadowJar {
 def otherSubprojects = rootProject.subprojects.findAll { it.name != project.name }
 
 tasks.register("mergeJars") {
-    dependsOn ":client:jar"
+    dependsOn ":minecraft-adapter:jar"
     dependsOn shadowJar
 
     def shadowJarFile = tasks.shadowJar.archiveFile.get().asFile
diff --git a/client/build.gradle b/minecraft-adapter/build.gradle
similarity index 72%
rename from client/build.gradle
rename to minecraft-adapter/build.gradle
index 64969167..5e3d6e08 100644
--- a/client/build.gradle
+++ b/minecraft-adapter/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "net.neoforged.moddev"
 
 base {
-    archivesName = "Discord-MC-Chat-client"
+    archivesName = "Discord-MC-Chat-minecraft-adapter"
 }
 
 neoForge {
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/FabricDMCC.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/FabricDMCC.java
similarity index 76%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/FabricDMCC.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/FabricDMCC.java
index 6626cc89..372b247d 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/FabricDMCC.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/FabricDMCC.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client;
+package com.xujiayao.discord_mc_chat.minecraft;
 
 /**
  * The entry point for Fabric environment.
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/NeoForgeDMCC.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/NeoForgeDMCC.java
similarity index 85%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/NeoForgeDMCC.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/NeoForgeDMCC.java
index 4a073252..0cc838d3 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/NeoForgeDMCC.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/NeoForgeDMCC.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client;
+package com.xujiayao.discord_mc_chat.minecraft;
 
 import com.xujiayao.discord_mc_chat.DMCC;
 import net.neoforged.fml.common.Mod;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinCommands.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinCommands.java
similarity index 95%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinCommands.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinCommands.java
index c008b099..bd8d7b5b 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinCommands.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinCommands.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinMinecraftServer.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinMinecraftServer.java
similarity index 95%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinMinecraftServer.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinMinecraftServer.java
index 6e69083f..fcd7e6f0 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinMinecraftServer.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinMinecraftServer.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
 import com.xujiayao.discord_mc_chat.utils.events.EventManager;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinPlayerAdvancements.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinPlayerAdvancements.java
similarity index 96%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinPlayerAdvancements.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinPlayerAdvancements.java
index d45f309c..636b5125 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinPlayerAdvancements.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinPlayerAdvancements.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
 import com.xujiayao.discord_mc_chat.utils.events.EventManager;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinPlayerList.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinPlayerList.java
similarity index 95%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinPlayerList.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinPlayerList.java
index c74e7cad..efd5b3f1 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinPlayerList.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinPlayerList.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
 import com.xujiayao.discord_mc_chat.utils.events.EventManager;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinSayCommand.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinSayCommand.java
similarity index 94%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinSayCommand.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinSayCommand.java
index 0a310ddd..25457d4c 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinSayCommand.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinSayCommand.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.mojang.brigadier.context.CommandContext;
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinServerGamePacketListenerImpl.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinServerGamePacketListenerImpl.java
similarity index 96%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinServerGamePacketListenerImpl.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinServerGamePacketListenerImpl.java
index 6fcc7399..08c36261 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinServerGamePacketListenerImpl.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinServerGamePacketListenerImpl.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
 import com.xujiayao.discord_mc_chat.utils.events.EventManager;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinServerPlayer.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinServerPlayer.java
similarity index 93%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinServerPlayer.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinServerPlayer.java
index 256c1f41..dcef9315 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinServerPlayer.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinServerPlayer.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
 import com.xujiayao.discord_mc_chat.utils.events.EventManager;
diff --git a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinTellRawCommand.java b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinTellRawCommand.java
similarity index 94%
rename from client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinTellRawCommand.java
rename to minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinTellRawCommand.java
index 2f4e74b1..48e18bd6 100644
--- a/client/src/main/java/com/xujiayao/discord_mc_chat/client/mixins/MixinTellRawCommand.java
+++ b/minecraft-adapter/src/main/java/com/xujiayao/discord_mc_chat/minecraft/mixins/MixinTellRawCommand.java
@@ -1,4 +1,4 @@
-package com.xujiayao.discord_mc_chat.client.mixins;
+package com.xujiayao.discord_mc_chat.minecraft.mixins;
 
 import com.mojang.brigadier.context.CommandContext;
 import com.xujiayao.discord_mc_chat.minecraft.MinecraftEvents;
diff --git a/client/src/main/resources/META-INF/neoforge.mods.toml b/minecraft-adapter/src/main/resources/META-INF/neoforge.mods.toml
similarity index 98%
rename from client/src/main/resources/META-INF/neoforge.mods.toml
rename to minecraft-adapter/src/main/resources/META-INF/neoforge.mods.toml
index c7864d51..e98b7452 100644
--- a/client/src/main/resources/META-INF/neoforge.mods.toml
+++ b/minecraft-adapter/src/main/resources/META-INF/neoforge.mods.toml
@@ -21,7 +21,7 @@ config = "dmcc.mixins.json"
 
 #[[dependencies.discord_mc_chat]]
 
-#modId = "client"
+#modId = "neoforge"
 #type = "required"
 #versionRange = "[${neo_version},)"
 #ordering = "NONE"
diff --git a/client/src/main/resources/dmcc.mixins.json b/minecraft-adapter/src/main/resources/dmcc.mixins.json
similarity index 86%
rename from client/src/main/resources/dmcc.mixins.json
rename to minecraft-adapter/src/main/resources/dmcc.mixins.json
index 855e01b0..1c717703 100644
--- a/client/src/main/resources/dmcc.mixins.json
+++ b/minecraft-adapter/src/main/resources/dmcc.mixins.json
@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "com.xujiayao.discord_mc_chat.client.mixins",
+  "package": "com.xujiayao.discord_mc_chat.minecraft.mixins",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
     "MixinCommands",
diff --git a/settings.gradle b/settings.gradle
index 194a2920..8d23a4f5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,4 +6,4 @@ pluginManagement {
 }
 
 include(":common")
-include(":client")
+include(":minecraft-adapter")