diff --git a/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java
index 0ab6f8cd..f14364fb 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java
@@ -4,7 +4,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCreativeModeTab;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCreativeModeTab;
 import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinArrow.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinArrow.java
index 1cf9151a..252a8ba6 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinArrow.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinArrow.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
 import java.util.Set;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinArrow;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinArrow;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java
index 61039087..2307dedf 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCommandSourceStack;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCommandSourceStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java
index 4c1f321a..2199d999 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCreativeModeTab;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCreativeModeTab;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinEnchantment.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinEnchantment.java
index 377c79f5..dc7f891b 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinEnchantment.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinEnchantment.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinEnchantment;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinEnchantment;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java
index 9546f0ac..799d0b63 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
 import javax.annotation.Nullable;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinMobEffectInstance;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinMobEffectInstance;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import net.minecraft.world.effect.MobEffectInstance;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinProjectile.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinProjectile.java
index daa8ed71..f0269c57 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinProjectile.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinProjectile.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.mixin.common;
 
 import javax.annotation.Nullable;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinProjectile;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinProjectile;
 import org.auioc.mcmod.arnicalib.utils.game.NbtUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinArrow.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinArrow.java
similarity index 69%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinArrow.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinArrow.java
index 3ea562bf..7988b8a4 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinArrow.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinArrow.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.entity.ITippedArrow;
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCommandSourceStack.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinCommandSourceStack.java
similarity index 70%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCommandSourceStack.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinCommandSourceStack.java
index a0df2c19..06257354 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCommandSourceStack.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinCommandSourceStack.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import net.minecraft.commands.CommandSource;
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCreativeModeTab.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinCreativeModeTab.java
similarity index 57%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCreativeModeTab.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinCreativeModeTab.java
index 50335574..c1c90e80 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCreativeModeTab.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinCreativeModeTab.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 public interface IMixinCreativeModeTab {
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinEnchantment.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinEnchantment.java
similarity index 76%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinEnchantment.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinEnchantment.java
index 59a2471b..8e43c22b 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinEnchantment.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinEnchantment.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.enchantment.IValidSlotsVisibleEnchantment;
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinMobEffectInstance.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinMobEffectInstance.java
similarity index 73%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinMobEffectInstance.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinMobEffectInstance.java
index 3a7f5266..fb300bc3 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinMobEffectInstance.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinMobEffectInstance.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.effect.IHMobEffectInstance;
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinProjectile.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinProjectile.java
similarity index 70%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinProjectile.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinProjectile.java
index 2959e9c5..260a9442 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinProjectile.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/api/IMixinProjectile.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.common;
+package org.auioc.mcmod.arnicalib.mixin.common.api;
 
 import org.auioc.mcmod.arnicalib.api.game.entity.IHProjectile;
 
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java
index 146da3f1..f3d0786b 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.mixin.server;
 
-import org.auioc.mcmod.arnicalib.api.mixin.server.IMixinEyeOfEnder;
+import org.auioc.mcmod.arnicalib.mixin.server.api.IMixinEyeOfEnder;
 import org.auioc.mcmod.arnicalib.server.event.AHServerEventFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java
index 700c2d05..a4396e46 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java
@@ -2,7 +2,7 @@
 
 import java.util.Random;
 import java.util.function.Function;
-import org.auioc.mcmod.arnicalib.api.mixin.server.IMixinEyeOfEnder;
+import org.auioc.mcmod.arnicalib.mixin.server.api.IMixinEyeOfEnder;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/server/IMixinEyeOfEnder.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/api/IMixinEyeOfEnder.java
similarity index 80%
rename from src/main/java/org/auioc/mcmod/arnicalib/api/mixin/server/IMixinEyeOfEnder.java
rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/api/IMixinEyeOfEnder.java
index 54479311..18468ff2 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/server/IMixinEyeOfEnder.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/api/IMixinEyeOfEnder.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.mixin.server;
+package org.auioc.mcmod.arnicalib.mixin.server.api;
 
 import java.util.Random;
 import java.util.function.Function;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java
index 3190e9a3..31bddc14 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/CommandSourceUtils.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.utils.game.command;
 
 import java.util.function.Predicate;
-import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCommandSourceStack;
+import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCommandSourceStack;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.commands.CommandSource;