diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java
index 39eb11da..f7313a4a 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.game.command;
 
 import org.auioc.mcmod.arnicalib.mod.client.command.AHClientCommands;
-import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
+import org.auioc.mcmod.arnicalib.mod.server.command.AHServerCommands;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/mod/server/command/AHServerCommands.java
similarity index 89%
rename from src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mod/server/command/AHServerCommands.java
index 361fe0ac..b9bd35ef 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mod/server/command/AHServerCommands.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.server.command;
+package org.auioc.mcmod.arnicalib.mod.server.command;
 
 import static net.minecraft.commands.Commands.literal;
 import java.util.List;
@@ -6,7 +6,7 @@
 import org.auioc.mcmod.arnicalib.game.command.DynamicCommandHandler;
 import org.auioc.mcmod.arnicalib.game.command.node.VersionCommandNode;
 import org.auioc.mcmod.arnicalib.game.cpw.EnvironmentUtils;
-import org.auioc.mcmod.arnicalib.server.command.impl.RtpCommand;
+import org.auioc.mcmod.arnicalib.mod.server.command.impl.RtpCommand;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.CommandSourceStack;
@@ -45,7 +45,7 @@ private static void addTestNode(CommandNode<CommandSourceStack> node) {
             literal("test")
                 .executes(
                     (ctx) -> DynamicCommandHandler.run(
-                        "org.auioc.mcmod.arnicalib.server.command.TestCommandHandler",
+                        "org.auioc.mcmod.arnicalib.mod.server.command.TestCommandHandler",
                         "run",
                         ctx
                     )
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java b/src/main/java/org/auioc/mcmod/arnicalib/mod/server/command/impl/RtpCommand.java
similarity index 98%
rename from src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mod/server/command/impl/RtpCommand.java
index 0ab90030..f6c142fd 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mod/server/command/impl/RtpCommand.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.server.command.impl;
+package org.auioc.mcmod.arnicalib.mod.server.command.impl;
 
 import static net.minecraft.commands.Commands.argument;
 import static net.minecraft.commands.Commands.literal;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java
index 48d05776..0d8aadc9 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java
@@ -3,7 +3,7 @@
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.base.log.LogUtil;
-import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
+import org.auioc.mcmod.arnicalib.mod.server.command.AHServerCommands;
 import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraftforge.event.RegisterCommandsEvent;