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
new file mode 100644
index 00000000..8f205c57
--- /dev/null
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java
@@ -0,0 +1,22 @@
+package org.auioc.mcmod.arnicalib.game.command;
+
+import org.auioc.mcmod.arnicalib.client.command.AHClientCommands;
+import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.tree.CommandNode;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public final class AHCommands {
+
+    public static CommandNode<CommandSourceStack> getServerNode(CommandDispatcher<CommandSourceStack> dispatcher) {
+        return AHServerCommands.getAHNode(dispatcher);
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static CommandNode<CommandSourceStack> getClientNode(CommandDispatcher<CommandSourceStack> dispatcher) {
+        return AHClientCommands.getAHNode(dispatcher);
+    }
+
+}
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandExceptions.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java
similarity index 95%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandExceptions.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java
index 162b6db9..5f0f0a15 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandExceptions.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import org.auioc.mcmod.arnicalib.ArnicaLib;
 import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandHandlers.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandHandlers.java
similarity index 89%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandHandlers.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandHandlers.java
index 3eb12cbc..5811d1e7 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandHandlers.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandHandlers.java
@@ -1,7 +1,7 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
-import org.auioc.mcmod.arnicalib.game.command.BiCommandAction;
-import org.auioc.mcmod.arnicalib.game.command.CommandAction;
+import org.auioc.mcmod.arnicalib.game.command.action.BiCommandAction;
+import org.auioc.mcmod.arnicalib.game.command.action.CommandAction;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandNodeUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandNodeUtils.java
similarity index 97%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandNodeUtils.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandNodeUtils.java
index 80776eb8..17a543df 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandNodeUtils.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandNodeUtils.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandSourceUtils.java
similarity index 98%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandSourceUtils.java
index 31bddc14..e4699d57 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandSourceUtils.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import java.util.function.Predicate;
 import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCommandSourceStack;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/DynamicCommandHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/DynamicCommandHandler.java
similarity index 97%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/DynamicCommandHandler.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/DynamicCommandHandler.java
index 64fed24c..243902db 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/DynamicCommandHandler.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/DynamicCommandHandler.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/BiCommandAction.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java
similarity index 89%
rename from src/main/java/org/auioc/mcmod/arnicalib/game/command/BiCommandAction.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java
index 9aa6bddd..ff719f6a 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/BiCommandAction.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.game.command;
+package org.auioc.mcmod.arnicalib.game.command.action;
 
 import org.apache.commons.lang3.function.FailableBiConsumer;
 import org.apache.commons.lang3.function.FailableToIntBiFunction;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandAction.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java
similarity index 88%
rename from src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandAction.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java
index 89390aed..d31ed947 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandAction.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.game.command;
+package org.auioc.mcmod.arnicalib.game.command.action;
 
 import org.apache.commons.lang3.function.FailableConsumer;
 import org.apache.commons.lang3.function.FailableToIntFunction;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/client/command/argument/LanguageInfoArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java
similarity index 97%
rename from src/main/java/org/auioc/mcmod/arnicalib/client/command/argument/LanguageInfoArgument.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java
index 6eb22e01..b9fb6766 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/client/command/argument/LanguageInfoArgument.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.client.command.argument;
+package org.auioc.mcmod.arnicalib.game.command.argument;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/ExceptionCommandExceptionType.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/exception/ExceptionCommandExceptionType.java
similarity index 95%
rename from src/main/java/org/auioc/mcmod/arnicalib/game/command/ExceptionCommandExceptionType.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/exception/ExceptionCommandExceptionType.java
index dbc9285b..aae85eb9 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/ExceptionCommandExceptionType.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/exception/ExceptionCommandExceptionType.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.game.command;
+package org.auioc.mcmod.arnicalib.game.command.exception;
 
 import java.util.function.Function;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java
similarity index 96%
rename from src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java
index 17bb7948..36bb046a 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.common.command.impl;
+package org.auioc.mcmod.arnicalib.game.command.node;
 
 import static net.minecraft.commands.Commands.literal;
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
@@ -16,9 +16,9 @@
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.MutableComponent;
 
-public class VersionCommand {
+public class VersionCommandNode {
 
-    private static final Marker MARKER = LogUtil.getMarker(VersionCommand.class);
+    private static final Marker MARKER = LogUtil.getMarker(VersionCommandNode.class);
 
     private static final SimpleCommandExceptionType GET_VERSION_REFLECTION_ERROR = new SimpleCommandExceptionType(i18n("failure.reflection"));
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java
index 419408e7..63b398f0 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java
@@ -3,10 +3,10 @@
 import static net.minecraft.commands.Commands.literal;
 import java.util.List;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.common.command.impl.VersionCommand;
+import org.auioc.mcmod.arnicalib.game.command.DynamicCommandHandler;
+import org.auioc.mcmod.arnicalib.game.command.node.VersionCommandNode;
 import org.auioc.mcmod.arnicalib.server.command.impl.RtpCommand;
 import org.auioc.mcmod.arnicalib.utils.game.EnvironmentUtils;
-import org.auioc.mcmod.arnicalib.utils.game.command.DynamicCommandHandler;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.CommandSourceStack;
@@ -16,7 +16,7 @@ public final class AHServerCommands {
     public static final CommandNode<CommandSourceStack> NODE = literal(ArnicaLib.MOD_ID).build();
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-        VersionCommand.addVersionNode(NODE, ArnicaLib.class);
+        VersionCommandNode.addVersionNode(NODE, ArnicaLib.class);
         NODE.addChild(RtpCommand.NODE);
         if (EnvironmentUtils.IS_DEV) addTestNode(NODE);
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java b/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java
index 321b7d1c..50fe7c0c 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java
@@ -4,9 +4,9 @@
 import static net.minecraft.commands.Commands.literal;
 import java.util.List;
 import java.util.Optional;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import org.auioc.mcmod.arnicalib.utils.game.EntityUtils;
 import org.auioc.mcmod.arnicalib.utils.game.RandomTeleporter;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandSourceUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.DoubleArgumentType;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/base/log/Loggers.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java
similarity index 92%
rename from src/main/java/org/auioc/mcmod/arnicalib/base/log/Loggers.java
rename to src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java
index e54553a3..848dff5e 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/base/log/Loggers.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java
@@ -1,8 +1,9 @@
-package org.auioc.mcmod.arnicalib.base.log;
+package org.auioc.mcmod.arnicalib.utils;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 
 /**
  * @deprecated Use {@link LogUtil} instead
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java
index bf330386..3929bd52 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 import java.util.function.Predicate;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandExceptions;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandNodeUtils;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandSourceUtils;
+import org.auioc.mcmod.arnicalib.game.command.CommandExceptions;
+import org.auioc.mcmod.arnicalib.game.command.CommandNodeUtils;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import com.mojang.brigadier.context.ParsedCommandNode;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;