diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java
index 6840d3572..7fe58cd65 100644
--- a/src/main/java/noppes/npcs/DataDisplay.java
+++ b/src/main/java/noppes/npcs/DataDisplay.java
@@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTUtil;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.StringUtils;
 import noppes.npcs.config.ConfigMain;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.controllers.data.SkinOverlay;
 import noppes.npcs.entity.EntityNPCInterface;
 import noppes.npcs.entity.data.DataSkinOverlays;
diff --git a/src/main/java/noppes/npcs/client/ClientCacheHandler.java b/src/main/java/noppes/npcs/client/ClientCacheHandler.java
index 86c4158b9..05e5b9aca 100644
--- a/src/main/java/noppes/npcs/client/ClientCacheHandler.java
+++ b/src/main/java/noppes/npcs/client/ClientCacheHandler.java
@@ -1,7 +1,7 @@
 package noppes.npcs.client;
 
 import net.minecraft.util.ResourceLocation;
-import noppes.npcs.AnimationData;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.client.gui.OverlayQuestTracking;
 import noppes.npcs.client.gui.customoverlay.OverlayCustom;
 import noppes.npcs.client.renderer.ImageData;
diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java
index bb02036b6..0307b5236 100644
--- a/src/main/java/noppes/npcs/client/ClientEventHandler.java
+++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java
@@ -2,7 +2,6 @@ package noppes.npcs.client;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.PlayerEvent;
 import cpw.mods.fml.relauncher.Side;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBase;
@@ -12,7 +11,7 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.client.event.*;
 import net.minecraftforge.event.entity.living.LivingEvent;
-import noppes.npcs.AnimationData;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.client.gui.customoverlay.OverlayCustom;
 import noppes.npcs.client.renderer.RenderCNPCPlayer;
 import noppes.npcs.constants.EnumAnimationPart;
diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
index 1882b92d4..657b6d455 100644
--- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java
+++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
@@ -32,6 +32,7 @@ import noppes.npcs.constants.EnumGuiType;
 import noppes.npcs.constants.EnumPacketClient;
 import noppes.npcs.controllers.RecipeController;
 import noppes.npcs.controllers.data.Animation;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.controllers.data.RecipeCarpentry;
 import noppes.npcs.entity.EntityDialogNpc;
 import noppes.npcs.entity.EntityNPCInterface;
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
index d0aebabeb..4822ae324 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
@@ -2,7 +2,7 @@ package noppes.npcs.client.gui.global;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.AnimationData;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.client.Client;
 import noppes.npcs.client.gui.util.*;
 import noppes.npcs.constants.EnumAnimationPart;
diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java
index 0426520cd..b81cb4ebd 100644
--- a/src/main/java/noppes/npcs/client/model/ModelMPM.java
+++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java
@@ -19,10 +19,7 @@ import noppes.npcs.client.model.util.ModelScaleRenderer;
 import noppes.npcs.client.renderer.RenderNPCInterface;
 import noppes.npcs.constants.EnumAnimation;
 import noppes.npcs.constants.EnumAnimationPart;
-import noppes.npcs.controllers.data.Animation;
-import noppes.npcs.controllers.data.Frame;
-import noppes.npcs.controllers.data.FramePart;
-import noppes.npcs.controllers.data.SkinOverlay;
+import noppes.npcs.controllers.data.*;
 import noppes.npcs.entity.EntityCustomNpc;
 import noppes.npcs.entity.data.ModelPartData;
 import noppes.npcs.entity.data.ModelScalePart;
diff --git a/src/main/java/noppes/npcs/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
similarity index 97%
rename from src/main/java/noppes/npcs/AnimationData.java
rename to src/main/java/noppes/npcs/controllers/data/AnimationData.java
index 9f785eb1e..ec0f32753 100644
--- a/src/main/java/noppes/npcs/AnimationData.java
+++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
@@ -1,8 +1,10 @@
-package noppes.npcs;
+package noppes.npcs.controllers.data;
 
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.DataDisplay;
+import noppes.npcs.Server;
 import noppes.npcs.api.handler.data.IAnimationData;
 import noppes.npcs.api.handler.data.IAnimation;
 import noppes.npcs.constants.EnumPacketClient;
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index f224e4fb7..d48dfdd15 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -6,7 +6,6 @@ import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IExtendedEntityProperties;
-import noppes.npcs.AnimationData;
 import noppes.npcs.LogWriter;
 import noppes.npcs.api.entity.ICustomNpc;
 import noppes.npcs.api.handler.*;
diff --git a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java
index 1a589dc83..41accf7fa 100644
--- a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java
+++ b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java
@@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
-import noppes.npcs.AnimationData;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.client.ClientCacheHandler;
 import noppes.npcs.client.ClientEventHandler;
 import noppes.npcs.constants.EnumAnimationPart;
diff --git a/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java b/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java
index 3bcebf12b..6ed39d539 100644
--- a/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java
+++ b/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.renderer.entity.RenderPlayer;
-import noppes.npcs.AnimationData;
+import noppes.npcs.controllers.data.AnimationData;
 import noppes.npcs.client.ClientCacheHandler;
 import noppes.npcs.constants.EnumAnimationPart;
 import noppes.npcs.controllers.data.Frame;