diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index e0a66a3ad..5abeafd1d 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -7,7 +7,6 @@ import java.util.logging.Level;
 
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
-import net.citizensnpcs.api.DataKey;
 import net.citizensnpcs.api.exception.NPCException;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
@@ -18,6 +17,10 @@ import net.citizensnpcs.api.npc.trait.trait.Inventory;
 import net.citizensnpcs.api.npc.trait.trait.Owner;
 import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
 import net.citizensnpcs.api.npc.trait.trait.Spawned;
+import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.DatabaseStorage;
+import net.citizensnpcs.api.util.Storage;
+import net.citizensnpcs.api.util.YamlStorage;
 import net.citizensnpcs.command.CommandManager;
 import net.citizensnpcs.command.Injector;
 import net.citizensnpcs.command.command.AdminCommands;
@@ -30,9 +33,6 @@ import net.citizensnpcs.command.exception.ServerCommandException;
 import net.citizensnpcs.command.exception.UnhandledCommandException;
 import net.citizensnpcs.command.exception.WrappedCommandException;
 import net.citizensnpcs.npc.CitizensNPCManager;
-import net.citizensnpcs.storage.DatabaseStorage;
-import net.citizensnpcs.storage.Storage;
-import net.citizensnpcs.storage.YamlStorage;
 import net.citizensnpcs.trait.LookClose;
 import net.citizensnpcs.trait.Sneak;
 import net.citizensnpcs.util.Messaging;
diff --git a/src/net/citizensnpcs/Settings.java b/src/net/citizensnpcs/Settings.java
index d21ee1963..f0355b1d2 100644
--- a/src/net/citizensnpcs/Settings.java
+++ b/src/net/citizensnpcs/Settings.java
@@ -2,8 +2,8 @@ package net.citizensnpcs;
 
 import java.io.File;
 
-import net.citizensnpcs.api.DataKey;
-import net.citizensnpcs.storage.YamlStorage;
+import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.YamlStorage;
 import net.citizensnpcs.util.Messaging;
 
 public class Settings {
diff --git a/src/net/citizensnpcs/Template.java b/src/net/citizensnpcs/Template.java
index 1137c1eb7..25ace8bf2 100644
--- a/src/net/citizensnpcs/Template.java
+++ b/src/net/citizensnpcs/Template.java
@@ -1,6 +1,6 @@
 package net.citizensnpcs;
 
-import net.citizensnpcs.api.DataKey;
+import net.citizensnpcs.api.util.DataKey;
 
 public class Template {
     private final DataKey template;
diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/net/citizensnpcs/npc/CitizensNPCManager.java
index ce7a04017..546031681 100644
--- a/src/net/citizensnpcs/npc/CitizensNPCManager.java
+++ b/src/net/citizensnpcs/npc/CitizensNPCManager.java
@@ -9,7 +9,7 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCManager;
 import net.citizensnpcs.api.npc.trait.Character;
 import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
-import net.citizensnpcs.storage.Storage;
+import net.citizensnpcs.api.util.Storage;
 import net.citizensnpcs.util.ByIdArray;
 import net.citizensnpcs.util.NPCBuilder;
 
diff --git a/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
index c548cb159..b104e24f8 100644
--- a/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
+++ b/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
@@ -1,7 +1,7 @@
 package net.citizensnpcs.npc.entity;
 
-import net.citizensnpcs.api.DataKey;
 import net.citizensnpcs.api.exception.NPCLoadException;
+import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.CitizensNPCManager;
 import net.citizensnpcs.resource.lib.EntityHumanNPC;
diff --git a/src/net/citizensnpcs/trait/LookClose.java b/src/net/citizensnpcs/trait/LookClose.java
index 1eaaae964..b44ba5108 100644
--- a/src/net/citizensnpcs/trait/LookClose.java
+++ b/src/net/citizensnpcs/trait/LookClose.java
@@ -3,11 +3,11 @@ package net.citizensnpcs.trait;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 
-import net.citizensnpcs.api.DataKey;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.trait.SaveId;
 import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.minecraft.server.EntityLiving;
 
diff --git a/src/net/citizensnpcs/trait/Sneak.java b/src/net/citizensnpcs/trait/Sneak.java
index b394e2951..2c6735e7b 100644
--- a/src/net/citizensnpcs/trait/Sneak.java
+++ b/src/net/citizensnpcs/trait/Sneak.java
@@ -1,10 +1,10 @@
 package net.citizensnpcs.trait;
 
-import net.citizensnpcs.api.DataKey;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.trait.SaveId;
 import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.npc.entity.CitizensHumanNPC;
 
 import net.minecraft.server.EntityPlayer;