diff --git a/common b/common
index 215aaf0..e734dc5 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 215aaf0fd0c03d58c6f05f1f572c023003c3d326
+Subproject commit e734dc58a27406b766c22b7706e81d45e14bb7d1
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CameraOverriddenEntity.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/CameraOverriddenEntity.java
similarity index 81%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CameraOverriddenEntity.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/CameraOverriddenEntity.java
index fdcdb2c..10a1cba 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CameraOverriddenEntity.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/CameraOverriddenEntity.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.entity;
 
 public interface CameraOverriddenEntity {
     float freelook$getCameraPitch();
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/EntityModuleFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/EntityModuleFabric.java
similarity index 98%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/EntityModuleFabric.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/EntityModuleFabric.java
index aa42d4f..7119cd6 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/EntityModuleFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/EntityModuleFabric.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.entity;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthRenderState.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/HealthRenderState.java
similarity index 93%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthRenderState.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/HealthRenderState.java
index d5a063b..0fc2ddd 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthRenderState.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/HealthRenderState.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.entity;
 
 import org.saturnclient.common.module.EntityModule;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/CameraMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/CameraMixin.java
similarity index 94%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/CameraMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/CameraMixin.java
index 9ca1875..6608e2a 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/CameraMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/CameraMixin.java
@@ -1,7 +1,7 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.entity;
 
 import org.saturnclient.feature.features.FreelookFeature;
-import org.saturnclient.impl.modules.CameraOverriddenEntity;
+import org.saturnclient.impl.modules.entity.CameraOverriddenEntity;
 import org.saturnclient.saturnclient.SaturnClient;
 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/mixins/EntityMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/EntityMixin.java
similarity index 93%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/EntityMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/EntityMixin.java
index 9e11850..fb16306 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/EntityMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/EntityMixin.java
@@ -1,7 +1,7 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.entity;
 
 import org.saturnclient.feature.features.FreelookFeature;
-import org.saturnclient.impl.modules.CameraOverriddenEntity;
+import org.saturnclient.impl.modules.entity.CameraOverriddenEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/NametagsMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/misc/NametagsMixin.java
similarity index 93%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/NametagsMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/misc/NametagsMixin.java
index 5a33ee0..a31e348 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/NametagsMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/misc/NametagsMixin.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.misc;
 
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
@@ -8,8 +8,9 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
 import org.saturnclient.feature.features.NametagsFeature;
-import org.saturnclient.impl.modules.EntityModuleFabric;
-import org.saturnclient.impl.modules.HealthRenderState;
+import org.saturnclient.impl.modules.entity.EntityModuleFabric;
+import org.saturnclient.impl.modules.entity.HealthRenderState;
+import org.saturnclient.impl.modules.mixins.render.LivingEntityRenderStateMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/GameRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/GameRendererMixin.java
similarity index 96%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/GameRendererMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/GameRendererMixin.java
index 3dfd659..320093c 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/GameRendererMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/GameRendererMixin.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.render.GameRenderer;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LightmapTextureManagerMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LightmapTextureManagerMixin.java
similarity index 95%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LightmapTextureManagerMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LightmapTextureManagerMixin.java
index 564e781..3fb0037 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LightmapTextureManagerMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LightmapTextureManagerMixin.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 // Code approach adapted from Gamma Utils: https://github.com/Sjouwer/gamma-utils
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LivingEntityRenderStateMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRenderStateMixin.java
similarity index 90%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LivingEntityRenderStateMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRenderStateMixin.java
index 2cecd6d..8107001 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LivingEntityRenderStateMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRenderStateMixin.java
@@ -1,9 +1,10 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 
 import org.saturnclient.common.module.EntityModule;
-import org.saturnclient.impl.modules.HealthRenderState;
+import org.saturnclient.impl.modules.entity.HealthRenderState;
+import org.saturnclient.impl.modules.mixins.misc.NametagsMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LivingEntityRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRendererMixin.java
similarity index 94%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LivingEntityRendererMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRendererMixin.java
index 3c26f90..ae59303 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/LivingEntityRendererMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRendererMixin.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.state.LivingEntityRenderState;
@@ -8,7 +8,7 @@ import net.minecraft.entity.passive.PassiveEntity;
 import net.minecraft.entity.player.PlayerEntity;
 
 import org.saturnclient.common.module.EntityModule;
-import org.saturnclient.impl.modules.HealthRenderState;
+import org.saturnclient.impl.modules.entity.HealthRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/RenderMixin.java
similarity index 98%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/RenderMixin.java
index 7b45975..f2328b3 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/RenderMixin.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/TpsMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/world/TpsMixin.java
similarity index 95%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/TpsMixin.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/world/TpsMixin.java
index 0c5d010..30d849a 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/TpsMixin.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/world/TpsMixin.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.world;
 
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NetworkModuleFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/network/NetworkModuleFabric.java
similarity index 95%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NetworkModuleFabric.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/network/NetworkModuleFabric.java
index 61b1b9c..cc32493 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NetworkModuleFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/network/NetworkModuleFabric.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.network;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PlayerModuleFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/player/PlayerModuleFabric.java
similarity index 99%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PlayerModuleFabric.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/player/PlayerModuleFabric.java
index 68be4b9..d3c745b 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PlayerModuleFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/player/PlayerModuleFabric.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.player;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/RenderModuleFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/render/RenderModuleFabric.java
similarity index 97%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/RenderModuleFabric.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/render/RenderModuleFabric.java
index bfde729..da787c6 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/RenderModuleFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/render/RenderModuleFabric.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.render;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.Perspective;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/WorldModuleFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/world/WorldModuleFabric.java
similarity index 95%
rename from versions/1.21.4/src/main/java/org/saturnclient/impl/modules/WorldModuleFabric.java
rename to versions/1.21.4/src/main/java/org/saturnclient/impl/modules/world/WorldModuleFabric.java
index b555a23..ade8fbc 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/WorldModuleFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/world/WorldModuleFabric.java
@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.world;
 
 import net.minecraft.client.MinecraftClient;
 
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/ModuleProviderFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/ModuleProviderFabric.java
index b74f7c6..2b7b41c 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/ModuleProviderFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/ModuleProviderFabric.java
@@ -3,11 +3,11 @@ package org.saturnclient.impl.provider;
 import net.minecraft.client.MinecraftClient;
 
 import org.saturnclient.common.provider.ModuleProvider;
-import org.saturnclient.impl.modules.EntityModuleFabric;
-import org.saturnclient.impl.modules.NetworkModuleFabric;
-import org.saturnclient.impl.modules.PlayerModuleFabric;
-import org.saturnclient.impl.modules.RenderModuleFabric;
-import org.saturnclient.impl.modules.WorldModuleFabric;
+import org.saturnclient.impl.modules.entity.EntityModuleFabric;
+import org.saturnclient.impl.modules.network.NetworkModuleFabric;
+import org.saturnclient.impl.modules.player.PlayerModuleFabric;
+import org.saturnclient.impl.modules.render.RenderModuleFabric;
+import org.saturnclient.impl.modules.world.WorldModuleFabric;
 import org.saturnclient.common.module.*;
 
 /**
diff --git a/versions/1.21.4/src/main/resources/mods.mixins.json b/versions/1.21.4/src/main/resources/mods.mixins.json
index d5b89a1..7ecfd3e 100644
--- a/versions/1.21.4/src/main/resources/mods.mixins.json
+++ b/versions/1.21.4/src/main/resources/mods.mixins.json
@@ -4,15 +4,15 @@
   "package": "org.saturnclient.impl.modules.mixins",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "GameRendererMixin",
-    "LightmapTextureManagerMixin",
-    "LivingEntityRendererMixin",
-    "LivingEntityRenderStateMixin",
-    "NametagsMixin",
-    "RenderMixin",
-    "TpsMixin",
-    "CameraMixin",
-    "EntityMixin"
+    "render.GameRendererMixin",
+    "render.LightmapTextureManagerMixin",
+    "render.LivingEntityRendererMixin",
+    "render.LivingEntityRenderStateMixin",
+    "misc.NametagsMixin",
+    "render.RenderMixin",
+    "world.TpsMixin",
+    "entity.CameraMixin",
+    "entity.EntityMixin"
   ],
   "injectors": {
     "defaultRequire": 1