diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java
index 3893201e..98e6cffc 100644
--- a/src/main/java/com/minelittlepony/MineLittlePony.java
+++ b/src/main/java/com/minelittlepony/MineLittlePony.java
@@ -4,6 +4,7 @@ import com.minelittlepony.gui.GuiPonySettings;
 import com.minelittlepony.hdskins.gui.GuiSkinsMineLP;
 import com.minelittlepony.pony.data.IPonyData;
 import com.minelittlepony.pony.data.PonyDataSerialiser;
+import com.minelittlepony.pony.data.PonyManager;
 import com.minelittlepony.render.skull.PonySkullRenderer;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.voxelmodpack.hdskins.HDSkinManager;
diff --git a/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
index 89958da6..f36ef107 100644
--- a/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
+++ b/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
@@ -1,9 +1,9 @@
 package com.minelittlepony.hdskins.gui;
 
 import com.minelittlepony.MineLittlePony;
-import com.minelittlepony.PonyManager;
 import com.minelittlepony.gui.IconicToggle;
 import com.minelittlepony.gui.Style;
+import com.minelittlepony.pony.data.PonyManager;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
diff --git a/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java b/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java
index 30e97ac0..bc5af1ac 100644
--- a/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java
+++ b/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java
@@ -1,8 +1,9 @@
 package com.minelittlepony.mixin;
 
 import com.minelittlepony.MineLittlePony;
-import com.minelittlepony.PonyManager;
 import com.minelittlepony.pony.data.PonyLevel;
+import com.minelittlepony.pony.data.PonyManager;
+
 import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.util.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/minelittlepony/PonyManager.java b/src/main/java/com/minelittlepony/pony/data/PonyManager.java
similarity index 98%
rename from src/main/java/com/minelittlepony/PonyManager.java
rename to src/main/java/com/minelittlepony/pony/data/PonyManager.java
index 3b1c681c..50002867 100644
--- a/src/main/java/com/minelittlepony/PonyManager.java
+++ b/src/main/java/com/minelittlepony/pony/data/PonyManager.java
@@ -1,12 +1,11 @@
-package com.minelittlepony;
+package com.minelittlepony.pony.data;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
-import com.minelittlepony.pony.data.IPony;
-import com.minelittlepony.pony.data.Pony;
-import com.minelittlepony.pony.data.PonyLevel;
+import com.minelittlepony.MineLittlePony;
+import com.minelittlepony.PonyConfig;
 import com.minelittlepony.util.math.MathUtil;
 import com.voxelmodpack.hdskins.ISkinCacheClearListener;
 import com.voxelmodpack.hdskins.util.MoreStreams;