diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java
index f85cd78..e0290e4 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java
@@ -3,9 +3,9 @@ package org.saturnclient.impl;
 import java.awt.image.BufferedImage;
 
 import org.lwjgl.glfw.GLFW;
-import org.saturnclient.common.minecraft.IMinecraftClient;
-import org.saturnclient.common.minecraft.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.IMinecraftClient;
+import org.saturnclient.common.MinecraftProvider;
+import org.saturnclient.common.bindings.SaturnIdentifier;
 import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.ui.SaturnScreen;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java
index b7a0539..cfc166f 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java
@@ -1,8 +1,8 @@
 package org.saturnclient.impl.mixins;
 
 import org.joml.Quaternionf;
-import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf;
-import org.saturnclient.common.minecraft.render.IMatrixStack;
+import org.saturnclient.common.bindings.SaturnQuaternionf;
+import org.saturnclient.common.render.IMatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Invoker;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java
index fa5d029..68a3e05 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java
@@ -3,9 +3,9 @@ package org.saturnclient.impl.mixins;
 import java.io.File;
 import java.io.InputStream;
 
-import org.saturnclient.common.minecraft.IMinecraftClient;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
-import org.saturnclient.common.minecraft.render.IWindow;
+import org.saturnclient.common.IMinecraftClient;
+import org.saturnclient.common.bindings.SaturnIdentifier;
+import org.saturnclient.common.render.IWindow;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java
index d757b39..4f251d1 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java
@@ -1,6 +1,6 @@
 package org.saturnclient.impl.mixins;
 
-import org.saturnclient.common.minecraft.render.IWindow;
+import org.saturnclient.common.render.IWindow;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java
index 4e821c6..68f73e2 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java
@@ -1,6 +1,6 @@
 package org.saturnclient.impl.modules;
 
-import org.saturnclient.common.minecraft.bindings.SaturnItemStack;
+import org.saturnclient.common.bindings.SaturnItemStack;
 import org.saturnclient.modules.interfaces.ArmorDisplayInterface;
 
 import net.minecraft.client.MinecraftClient;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java
index 0c133ec..1dc17e6 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java
@@ -5,7 +5,7 @@ import java.util.stream.Collectors;
 import java.util.Arrays;
 
 import org.saturnclient.modules.interfaces.StatusEffectsInterface;
-import org.saturnclient.common.minecraft.bindings.SaturnSprite;
+import org.saturnclient.common.bindings.SaturnSprite;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.texture.StatusEffectSpriteManager;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
index 7796565..727b45c 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
@@ -9,11 +9,11 @@ import org.saturnclient.client.ServiceClient;
 import org.saturnclient.cosmetics.Emotes;
 import org.saturnclient.cosmetics.Hats;
 import org.saturnclient.cosmetics.cloak.Cloaks;
-import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
+import org.saturnclient.common.MinecraftProvider;
+import org.saturnclient.common.bindings.SaturnClientBindings;
 import org.saturnclient.impl.FabricModuleProvider;
 import org.saturnclient.impl.SaturnClientProvider;
 import org.saturnclient.modules.ModManager;
-import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.Config;
 import org.saturnclient.config.manager.ConfigManager;
 import org.saturnclient.saturnclient.bindings.SaturnEmoteBindingsImpl;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java
index f987724..07d4089 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java
@@ -2,7 +2,7 @@ package org.saturnclient.saturnclient.bindings;
 
 import java.util.UUID;
 
-import org.saturnclient.common.minecraft.bindings.SaturnEmoteBindings;
+import org.saturnclient.common.bindings.SaturnEmoteBindings;
 import org.saturnclient.saturnclient.SaturnClient;
 
 import dev.kosmx.playerAnim.api.layered.AnimationStack;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java
index d7ae386..2cf86e4 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java
@@ -2,7 +2,7 @@ package org.saturnclient.saturnclient.bindings;
 
 import java.util.UUID;
 
-import org.saturnclient.common.minecraft.bindings.SaturnPlatformBindings;
+import org.saturnclient.common.bindings.SaturnPlatformBindings;
 import org.saturnclient.saturnclient.SaturnClient;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
index cedcede..3186db6 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
@@ -5,9 +5,9 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 
-import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.Config;
 import org.saturnclient.client.ServiceClient;
+import org.saturnclient.common.MinecraftProvider;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.ui.screens.EmoteWheel;
 import org.saturnclient.ui.screens.ShiftMenu;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java
index ba8d0c1..586797d 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java
@@ -3,7 +3,7 @@ package org.saturnclient.ui;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
-import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf;
+import org.saturnclient.common.bindings.SaturnQuaternionf;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java
index b73d2c5..bfc077e 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java
@@ -10,11 +10,11 @@ import org.joml.Matrix4f;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import org.saturnclient.common.minecraft.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
-import org.saturnclient.common.minecraft.bindings.SaturnItemStack;
-import org.saturnclient.common.minecraft.bindings.SaturnSprite;
-import org.saturnclient.common.minecraft.render.IMatrixStack;
+import org.saturnclient.common.MinecraftProvider;
+import org.saturnclient.common.bindings.SaturnIdentifier;
+import org.saturnclient.common.bindings.SaturnItemStack;
+import org.saturnclient.common.bindings.SaturnSprite;
+import org.saturnclient.common.render.IMatrixStack;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
 import org.saturnclient.ui.resources.Fonts;