diff --git a/src/main/java/kamkeel/npcs/command/ConfigCommand.java b/src/main/java/kamkeel/npcs/command/ConfigCommand.java
index 1f9dee87d..f31a1dc18 100644
--- a/src/main/java/kamkeel/npcs/command/ConfigCommand.java
+++ b/src/main/java/kamkeel/npcs/command/ConfigCommand.java
@@ -3,7 +3,7 @@ package kamkeel.npcs.command;
 import foxz.utils.Market;
 import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.enums.EnumConfigOperation;
-import kamkeel.npcs.network.packets.client.ConfigCommandPacket;
+import kamkeel.npcs.network.packets.data.ConfigCommandPacket;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.block.BlockLeavesBase;
diff --git a/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java b/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
index fb595bb0b..70c5488a3 100644
--- a/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
+++ b/src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
@@ -1,7 +1,7 @@
 package noppes.npcs.blocks;
 
 import kamkeel.npcs.network.PacketHandler;
-import kamkeel.npcs.network.packets.client.gui.GuiRedstonePacket;
+import kamkeel.npcs.network.packets.data.gui.GuiRedstonePacket;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/noppes/npcs/blocks/BlockWaypoint.java b/src/main/java/noppes/npcs/blocks/BlockWaypoint.java
index caff78b41..7920b46d9 100644
--- a/src/main/java/noppes/npcs/blocks/BlockWaypoint.java
+++ b/src/main/java/noppes/npcs/blocks/BlockWaypoint.java
@@ -1,7 +1,7 @@
 package noppes.npcs.blocks;
 
 import kamkeel.npcs.network.PacketHandler;
-import kamkeel.npcs.network.packets.client.gui.GuiWaypointPacket;
+import kamkeel.npcs.network.packets.data.gui.GuiWaypointPacket;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/noppes/npcs/controllers/data/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
index 82e6abcac..0b27f1e05 100644
--- a/src/main/java/noppes/npcs/controllers/data/AnimationData.java
+++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
@@ -4,7 +4,7 @@ package noppes.npcs.controllers.data;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import kamkeel.npcs.network.PacketHandler;
-import kamkeel.npcs.network.packets.client.UpdateAnimationsPacket;
+import kamkeel.npcs.network.packets.data.UpdateAnimationsPacket;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
diff --git a/src/main/java/noppes/npcs/controllers/data/MarkData.java b/src/main/java/noppes/npcs/controllers/data/MarkData.java
index 3f50be35f..15f89ddda 100644
--- a/src/main/java/noppes/npcs/controllers/data/MarkData.java
+++ b/src/main/java/noppes/npcs/controllers/data/MarkData.java
@@ -1,7 +1,7 @@
 package noppes.npcs.controllers.data;
 
 import kamkeel.npcs.network.PacketHandler;
-import kamkeel.npcs.network.packets.client.MarkDataPacket;
+import kamkeel.npcs.network.packets.data.MarkDataPacket;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java
index 7ae32545b..92b408696 100644
--- a/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java
+++ b/src/main/java/noppes/npcs/entity/data/DataSkinOverlays.java
@@ -1,7 +1,7 @@
 package noppes.npcs.entity.data;
 
 import kamkeel.npcs.network.PacketHandler;
-import kamkeel.npcs.network.packets.client.PlayerUpdateSkinOverlaysPacket;
+import kamkeel.npcs.network.packets.data.PlayerUpdateSkinOverlaysPacket;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import noppes.npcs.api.ISkinOverlay;