diff --git a/src/main/java/org/saturnclient/saturnmods/HudMod.java b/src/main/java/org/saturnclient/modules/HudMod.java
similarity index 85%
rename from src/main/java/org/saturnclient/saturnmods/HudMod.java
rename to src/main/java/org/saturnclient/modules/HudMod.java
index 93c4237..881e02d 100644
--- a/src/main/java/org/saturnclient/saturnmods/HudMod.java
+++ b/src/main/java/org/saturnclient/modules/HudMod.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnmods;
+package org.saturnclient.modules;
 
 import net.minecraft.client.gui.DrawContext;
 
diff --git a/src/main/java/org/saturnclient/saturnmods/ModDimensions.java b/src/main/java/org/saturnclient/modules/ModDimensions.java
similarity index 98%
rename from src/main/java/org/saturnclient/saturnmods/ModDimensions.java
rename to src/main/java/org/saturnclient/modules/ModDimensions.java
index 698e200..deafd46 100644
--- a/src/main/java/org/saturnclient/saturnmods/ModDimensions.java
+++ b/src/main/java/org/saturnclient/modules/ModDimensions.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnmods;
+package org.saturnclient.modules;
 
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
diff --git a/src/main/java/org/saturnclient/saturnmods/ModManager.java b/src/main/java/org/saturnclient/modules/ModManager.java
similarity index 83%
rename from src/main/java/org/saturnclient/saturnmods/ModManager.java
rename to src/main/java/org/saturnclient/modules/ModManager.java
index 83b88e0..67296c5 100644
--- a/src/main/java/org/saturnclient/saturnmods/ModManager.java
+++ b/src/main/java/org/saturnclient/modules/ModManager.java
@@ -1,15 +1,14 @@
-package org.saturnclient.saturnmods;
+package org.saturnclient.modules;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 
+import org.saturnclient.modules.mods.*;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.menus.HudEditor;
-import org.saturnclient.saturnmods.mods.*;
 
 public class ModManager {
 
@@ -28,11 +27,10 @@ public class ModManager {
         });
 
         HudRenderCallback.EVENT.register((context, _o) -> {
-            MinecraftClient client = SaturnClient.client;
-            TextRenderer textRenderer = client.textRenderer;
+            TextRenderer textRenderer = SaturnClient.client.textRenderer;
 
             if (textRenderer != null &&
-                    !(client.currentScreen instanceof HudEditor)) {
+                    !(SaturnClient.client.currentScreen instanceof HudEditor)) {
                 SaturnClientConfig.textRenderer = textRenderer;
 
                 for (SaturnMod m : MODS) {
diff --git a/src/main/java/org/saturnclient/saturnmods/SaturnMod.java b/src/main/java/org/saturnclient/modules/SaturnMod.java
similarity index 89%
rename from src/main/java/org/saturnclient/saturnmods/SaturnMod.java
rename to src/main/java/org/saturnclient/modules/SaturnMod.java
index 3d0ec34..9f950f9 100644
--- a/src/main/java/org/saturnclient/saturnmods/SaturnMod.java
+++ b/src/main/java/org/saturnclient/modules/SaturnMod.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnmods;
+package org.saturnclient.modules;
 
 import org.saturnclient.saturnclient.config.ConfigManager;
 
diff --git a/src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java
similarity index 95%
rename from src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java
rename to src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java
index 321ee53..4b0127a 100644
--- a/src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java
+++ b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnmods.mods;
+package org.saturnclient.modules.mods;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -8,12 +8,13 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
+
+import org.saturnclient.modules.HudMod;
+import org.saturnclient.modules.ModDimensions;
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.Textures;
 
 public class ArmorDisplay implements SaturnMod, HudMod {
diff --git a/src/main/java/org/saturnclient/saturnmods/mods/Coordinates.java b/src/main/java/org/saturnclient/modules/mods/Coordinates.java
similarity index 91%
rename from src/main/java/org/saturnclient/saturnmods/mods/Coordinates.java
rename to src/main/java/org/saturnclient/modules/mods/Coordinates.java
index 500a46f..01898fe 100644
--- a/src/main/java/org/saturnclient/saturnmods/mods/Coordinates.java
+++ b/src/main/java/org/saturnclient/modules/mods/Coordinates.java
@@ -1,15 +1,16 @@
-package org.saturnclient.saturnmods.mods;
+package org.saturnclient.modules.mods;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
+
+import org.saturnclient.modules.HudMod;
+import org.saturnclient.modules.ModDimensions;
+import org.saturnclient.modules.SaturnMod;
+import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.Textures;
 
 public class Coordinates implements SaturnMod, HudMod {
diff --git a/src/main/java/org/saturnclient/saturnmods/mods/Crosshair.java b/src/main/java/org/saturnclient/modules/mods/Crosshair.java
similarity index 92%
rename from src/main/java/org/saturnclient/saturnmods/mods/Crosshair.java
rename to src/main/java/org/saturnclient/modules/mods/Crosshair.java
index d32416d..dba7296 100644
--- a/src/main/java/org/saturnclient/saturnmods/mods/Crosshair.java
+++ b/src/main/java/org/saturnclient/modules/mods/Crosshair.java
@@ -1,9 +1,10 @@
-package org.saturnclient.saturnmods.mods;
+package org.saturnclient.modules.mods;
 
 import net.minecraft.util.Identifier;
+
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.Textures;
 
 public class Crosshair implements SaturnMod {
diff --git a/src/main/java/org/saturnclient/saturnmods/mods/FpsDisplay.java b/src/main/java/org/saturnclient/modules/mods/FpsDisplay.java
similarity index 92%
rename from src/main/java/org/saturnclient/saturnmods/mods/FpsDisplay.java
rename to src/main/java/org/saturnclient/modules/mods/FpsDisplay.java
index db025be..0406ff0 100644
--- a/src/main/java/org/saturnclient/saturnmods/mods/FpsDisplay.java
+++ b/src/main/java/org/saturnclient/modules/mods/FpsDisplay.java
@@ -1,14 +1,15 @@
-package org.saturnclient.saturnmods.mods;
+package org.saturnclient.modules.mods;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.util.Identifier;
+
+import org.saturnclient.modules.HudMod;
+import org.saturnclient.modules.ModDimensions;
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.Textures;
 
 public class FpsDisplay implements SaturnMod, HudMod {
diff --git a/src/main/java/org/saturnclient/saturnmods/mods/FreeLook.java b/src/main/java/org/saturnclient/modules/mods/FreeLook.java
similarity index 92%
rename from src/main/java/org/saturnclient/saturnmods/mods/FreeLook.java
rename to src/main/java/org/saturnclient/modules/mods/FreeLook.java
index 4943604..21e4cc2 100644
--- a/src/main/java/org/saturnclient/saturnmods/mods/FreeLook.java
+++ b/src/main/java/org/saturnclient/modules/mods/FreeLook.java
@@ -1,8 +1,8 @@
-package org.saturnclient.saturnmods.mods;
+package org.saturnclient.modules.mods;
 
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.Textures;
 
 import net.minecraft.client.option.Perspective;
diff --git a/src/main/java/org/saturnclient/saturnmods/mods/Particles.java b/src/main/java/org/saturnclient/modules/mods/Particles.java
similarity index 94%
rename from src/main/java/org/saturnclient/saturnmods/mods/Particles.java
rename to src/main/java/org/saturnclient/modules/mods/Particles.java
index 88bf0be..5a8c4d2 100644
--- a/src/main/java/org/saturnclient/saturnmods/mods/Particles.java
+++ b/src/main/java/org/saturnclient/modules/mods/Particles.java
@@ -1,10 +1,11 @@
-package org.saturnclient.saturnmods.mods;
+package org.saturnclient.modules.mods;
 
 import net.minecraft.util.Identifier;
+
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.Textures;
 
 public class Particles implements SaturnMod {
diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
index 03da3f9..1d6c57d 100644
--- a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
@@ -6,6 +6,7 @@ import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 
+import org.saturnclient.modules.ModManager;
 import org.saturnclient.saturnclient.auth.Auth;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.ThemeManager;
@@ -14,7 +15,6 @@ import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
 import org.saturnclient.saturnclient.menus.SaturnMenu;
 import org.saturnclient.saturnclient.menus.SaturnTitleScreen;
-import org.saturnclient.saturnmods.ModManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java b/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
index ad95816..b3c19d2 100644
--- a/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
+++ b/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
@@ -5,8 +5,9 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.option.Perspective;
 import net.minecraft.client.util.InputUtil;
+
+import org.saturnclient.modules.mods.FreeLook;
 import org.saturnclient.saturnclient.menus.SaturnMenu;
-import org.saturnclient.saturnmods.mods.FreeLook;
 import org.lwjgl.glfw.GLFW;
 
 /**
diff --git a/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java b/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java
index 5c56147..0c930dd 100644
--- a/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java
+++ b/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java
@@ -5,11 +5,11 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
+import org.saturnclient.modules.HudMod;
+import org.saturnclient.modules.ModDimensions;
+import org.saturnclient.modules.ModManager;
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.config.ConfigManager;
-import org.saturnclient.saturnmods.HudMod;
-import org.saturnclient.saturnmods.ModDimensions;
-import org.saturnclient.saturnmods.ModManager;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.SaturnUi;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/saturnclient/saturnclient/menus/ModMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/ModMenu.java
index 339e39f..5ef44fe 100644
--- a/src/main/java/org/saturnclient/saturnclient/menus/ModMenu.java
+++ b/src/main/java/org/saturnclient/saturnclient/menus/ModMenu.java
@@ -1,11 +1,12 @@
 package org.saturnclient.saturnclient.menus;
 
 import net.minecraft.text.Text;
+
+import org.saturnclient.modules.ModManager;
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnmods.ModManager;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.components.SaturnModComp;
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/CameraMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/CameraMixin.java
index a0a2156..35d3a24 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/CameraMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/CameraMixin.java
@@ -1,10 +1,10 @@
 package org.saturnclient.saturnclient.mixin;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
 
+import org.saturnclient.modules.mods.FreeLook;
+import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.mod_utils.CameraOverriddenEntity;
-import org.saturnclient.saturnmods.mods.FreeLook;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java b/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java
index 457207b..9ad5b43 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/Crosshair.java
@@ -30,8 +30,8 @@ public class Crosshair {
 
     @Inject(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V", ordinal = 0))
     private void drawCrosshair(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
-        if (org.saturnclient.saturnmods.mods.Crosshair.enabled.value
-                && org.saturnclient.saturnmods.mods.Crosshair.range_indicator.value
+        if (org.saturnclient.modules.mods.Crosshair.enabled.value
+                && org.saturnclient.modules.mods.Crosshair.range_indicator.value
                 && this.client.targetedEntity != null
                 && this.client.targetedEntity.isAlive()) {
             RenderSystem.setShaderTexture(0, textureLocation);
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/EntityMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/EntityMixin.java
index f452cd8..839c242 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/EntityMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/EntityMixin.java
@@ -4,8 +4,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.MathHelper;
 
+import org.saturnclient.modules.mods.FreeLook;
 import org.saturnclient.saturnclient.mod_utils.CameraOverriddenEntity;
-import org.saturnclient.saturnmods.mods.FreeLook;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/TotemParticleMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/TotemParticleMixin.java
index c2ff037..5292d46 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/TotemParticleMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/TotemParticleMixin.java
@@ -6,7 +6,7 @@ import net.minecraft.client.particle.TotemParticle;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.ColorHelper;
 
-import org.saturnclient.saturnmods.mods.Particles;
+import org.saturnclient.modules.mods.Particles;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/org/saturnclient/ui/components/SaturnModComp.java b/src/main/java/org/saturnclient/ui/components/SaturnModComp.java
index 86f8b1d..4706a34 100644
--- a/src/main/java/org/saturnclient/ui/components/SaturnModComp.java
+++ b/src/main/java/org/saturnclient/ui/components/SaturnModComp.java
@@ -2,10 +2,10 @@ package org.saturnclient.ui.components;
 
 import net.minecraft.client.gui.DrawContext;
 
+import org.saturnclient.modules.SaturnMod;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.saturnclient.menus.ConfigEditor;
-import org.saturnclient.saturnmods.SaturnMod;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.SaturnWidget;
 import org.saturnclient.ui.Textures;