diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java b/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java
similarity index 99%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java
rename to src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java
index 68280cb..356312c 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java
+++ b/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java
@@ -1,10 +1,10 @@
-package org.saturnclient.saturnclient.cosmetics;
+package org.saturnclient.cosmetics;
 
 import java.util.Arrays;
 
+import org.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.Config;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/Emotes.java b/src/main/java/org/saturnclient/cosmetics/Emotes.java
similarity index 89%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/Emotes.java
rename to src/main/java/org/saturnclient/cosmetics/Emotes.java
index 91a53d0..bc0353b 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/Emotes.java
+++ b/src/main/java/org/saturnclient/cosmetics/Emotes.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics;
+package org.saturnclient.cosmetics;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java b/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java
similarity index 98%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java
rename to src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java
index cabc440..c682358 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java
+++ b/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics;
+package org.saturnclient.cosmetics;
 
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.SaturnClient;
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java b/src/main/java/org/saturnclient/cosmetics/Hats.java
similarity index 94%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java
rename to src/main/java/org/saturnclient/cosmetics/Hats.java
index ced3e77..948c998 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java
+++ b/src/main/java/org/saturnclient/cosmetics/Hats.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics;
+package org.saturnclient.cosmetics;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java b/src/main/java/org/saturnclient/cosmetics/cloaks/Cloaks.java
similarity index 98%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
rename to src/main/java/org/saturnclient/cosmetics/cloaks/Cloaks.java
index d624942..54ac5ef 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloaks/Cloaks.java
@@ -1,11 +1,9 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks;
+package org.saturnclient.cosmetics.cloaks;
 
 import net.minecraft.util.Identifier;
 
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData;
-import org.saturnclient.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -17,6 +15,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData;
+import org.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
 import org.saturnclient.saturnclient.SaturnClient;
 
 /**
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/GifDecoder.java b/src/main/java/org/saturnclient/cosmetics/cloaks/GifDecoder.java
similarity index 99%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/GifDecoder.java
rename to src/main/java/org/saturnclient/cosmetics/cloaks/GifDecoder.java
index 5ab50d0..4cd9e5f 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/GifDecoder.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloaks/GifDecoder.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks;
+package org.saturnclient.cosmetics.cloaks;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java b/src/main/java/org/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
similarity index 93%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
rename to src/main/java/org/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
index a38296c..a7a5479 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
+package org.saturnclient.cosmetics.cloaks.utils;
 
 import net.minecraft.util.Identifier;
 
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java b/src/main/java/org/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
similarity index 98%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
rename to src/main/java/org/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
index 1ffd149..a9e752d 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
+package org.saturnclient.cosmetics.cloaks.utils;
 
 import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.texture.NativeImage;
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/RandomUtils.java b/src/main/java/org/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
similarity index 95%
rename from src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
rename to src/main/java/org/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
index 0e20412..744073f 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
@@ -1,4 +1,4 @@
-package org.saturnclient.saturnclient.cosmetics.cloaks.utils;
+package org.saturnclient.cosmetics.cloaks.utils;
 
 import java.util.Random;
 
diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
index 945e3d7..d0c77a9 100644
--- a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
@@ -6,13 +6,13 @@ import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.math.MatrixStack;
 
+import org.saturnclient.cosmetics.Emotes;
+import org.saturnclient.cosmetics.Hats;
+import org.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.modules.ModManager;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.config.Config;
 import org.saturnclient.saturnclient.config.manager.ConfigManager;
-import org.saturnclient.saturnclient.cosmetics.Emotes;
-import org.saturnclient.saturnclient.cosmetics.Hats;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
 import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
 import org.saturnclient.ui2.RenderScope;
diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
index 442f7d9..a0f4b4f 100644
--- a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
@@ -3,10 +3,10 @@ package org.saturnclient.saturnclient.client;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import org.saturnclient.cosmetics.Hats;
+import org.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
-import org.saturnclient.saturnclient.cosmetics.Hats;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 
 import dev.kosmx.playerAnim.api.layered.AnimationStack;
 import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess;
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
index 9726b3e..97cef55 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
@@ -7,8 +7,8 @@ import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.entity.player.PlayerEntity;
 
-import org.saturnclient.saturnclient.cosmetics.CloakFeatureRenderer;
-import org.saturnclient.saturnclient.cosmetics.HatFeatureRenderer;
+import org.saturnclient.cosmetics.CloakFeatureRenderer;
+import org.saturnclient.cosmetics.HatFeatureRenderer;
 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/ui2/resources/SvgTexture.java b/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
index 0bcd0f8..82d5dee 100644
--- a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
+++ b/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
@@ -11,7 +11,7 @@ import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGUniverse;
 
 import org.jetbrains.annotations.Nullable;
-import org.saturnclient.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
+import org.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java b/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java
index e087a43..96fa7f6 100644
--- a/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java
+++ b/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java
@@ -1,10 +1,10 @@
 package org.saturnclient.ui2.screens;
 
+import org.saturnclient.cosmetics.Emotes;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.config.AnimationConfig;
 import org.saturnclient.saturnclient.config.Config;
-import org.saturnclient.saturnclient.cosmetics.Emotes;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.Utils;
 import org.saturnclient.ui2.anim.Fade;
diff --git a/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java b/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java
index c537a31..ad1ff7d 100644
--- a/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java
+++ b/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java
@@ -1,9 +1,9 @@
 package org.saturnclient.ui2.screens.cosmetics;
 
+import org.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.ui2.resources.Textures;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.anim.Fade;
diff --git a/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java b/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java
index be2d1a5..6a15046 100644
--- a/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java
+++ b/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java
@@ -1,9 +1,9 @@
 package org.saturnclient.ui2.screens.cosmetics;
 
+import org.saturnclient.cosmetics.Hats;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.AnimationConfig;
-import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.ui2.resources.Textures;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.anim.Fade;
diff --git a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
index e26449c..6518e91 100644
--- a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
+++ b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
@@ -1,11 +1,11 @@
 package org.saturnclient.ui2.screens.store;
 
+import org.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.AnimationConfig;
 import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.Utils;
 import org.saturnclient.ui2.anim.Fade;
diff --git a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java b/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
index 098e09d..ea32ee5 100644
--- a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
+++ b/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
@@ -1,11 +1,11 @@
 package org.saturnclient.ui2.screens.store;
 
+import org.saturnclient.cosmetics.Hats;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.AnimationConfig;
 import org.saturnclient.saturnclient.config.Theme;
-import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.Utils;
 import org.saturnclient.ui2.anim.Fade;