diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
index ba4fc976b..0b7d598a4 100644
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
@@ -6,7 +6,7 @@ import net.citizensnpcs.api.trait.trait.Owner;
 import net.citizensnpcs.api.trait.trait.SpawnLocation;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.npc.CitizensNPCManager;
-import net.citizensnpcs.resource.lib.EntityHumanNPC;
+import net.citizensnpcs.npc.entity.EntityHumanNPC;
 import net.citizensnpcs.trait.text.Text;
 import net.citizensnpcs.util.Messaging;
 
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java b/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java
index 060e1e729..f48c1d1ac 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java
@@ -35,8 +35,6 @@ public class CitizensTraitManager implements TraitManager {
         registerTrait(new TraitFactory(Waypoints.class).withName("waypoints"));
     }
 
-    // TODO: Code duplication? Yes. But don't change it unless you test to make
-    // sure it builds AND works.
     @SuppressWarnings("unchecked")
     @Override
     public <T extends Trait> T getTrait(String name, NPC npc) {
diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
index dff3bbd93..da34a5ede 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
@@ -4,7 +4,6 @@ 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;
 import net.citizensnpcs.util.StringHelper;
 
 import net.minecraft.server.EntityLiving;
diff --git a/src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
similarity index 92%
rename from src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
index 7e468f5fb..ab453a5d2 100644
--- a/src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
@@ -1,9 +1,12 @@
-package net.citizensnpcs.resource.lib;
+package net.citizensnpcs.npc.entity;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Map;
 
+import net.citizensnpcs.npc.network.NPCNetHandler;
+import net.citizensnpcs.npc.network.NPCNetworkManager;
+import net.citizensnpcs.npc.network.NPCSocket;
 import net.citizensnpcs.util.Messaging;
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.ItemInWorldManager;
diff --git a/src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java b/src/main/java/net/citizensnpcs/npc/network/NPCNetHandler.java
similarity index 98%
rename from src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java
rename to src/main/java/net/citizensnpcs/npc/network/NPCNetHandler.java
index c58870cbc..fbbdaee57 100644
--- a/src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java
+++ b/src/main/java/net/citizensnpcs/npc/network/NPCNetHandler.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.resource.lib;
+package net.citizensnpcs.npc.network;
 
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java b/src/main/java/net/citizensnpcs/npc/network/NPCNetworkManager.java
similarity index 96%
rename from src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java
rename to src/main/java/net/citizensnpcs/npc/network/NPCNetworkManager.java
index 4242af942..2205f68e9 100644
--- a/src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java
+++ b/src/main/java/net/citizensnpcs/npc/network/NPCNetworkManager.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.resource.lib;
+package net.citizensnpcs.npc.network;
 
 import java.lang.reflect.Field;
 import java.net.Socket;
diff --git a/src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java b/src/main/java/net/citizensnpcs/npc/network/NPCSocket.java
similarity index 91%
rename from src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java
rename to src/main/java/net/citizensnpcs/npc/network/NPCSocket.java
index c110337ba..f6409fdc1 100644
--- a/src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java
+++ b/src/main/java/net/citizensnpcs/npc/network/NPCSocket.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.resource.lib;
+package net.citizensnpcs.npc.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
index c20c6bb3f..4d044132d 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -5,10 +5,10 @@ import java.util.List;
 
 import net.citizensnpcs.api.ai.NavigationCallback;
 import net.citizensnpcs.api.util.DataKey;
-import net.citizensnpcs.api.util.StorageUtils;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.util.Messaging;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -70,7 +70,10 @@ public class LinearWaypointProvider implements WaypointProvider, Iterable<Waypoi
     @Override
     public void load(DataKey key) {
         for (DataKey root : key.getRelative("waypoints").getIntegerSubKeys()) {
-            waypoints.add(new Waypoint(StorageUtils.loadLocation(root)));
+            root = root.getRelative("location");
+            waypoints.add(new Waypoint(new Location(Bukkit.getWorld(root.getString("world")), root.getDouble("x"), root
+                    .getDouble("y"), root.getDouble("z"), (float) root.getDouble("yaw", 0), (float) root.getDouble(
+                    "pitch", 0))));
         }
         callback.onProviderChanged();
     }
@@ -79,7 +82,14 @@ public class LinearWaypointProvider implements WaypointProvider, Iterable<Waypoi
     public void save(DataKey key) {
         key = key.getRelative("waypoints");
         for (int i = 0; i < waypoints.size(); ++i) {
-            StorageUtils.saveLocation(key.getRelative(Integer.toString(i)), waypoints.get(i).getLocation());
+            Location location = waypoints.get(i).getLocation();
+            key = key.getRelative(Integer.toString(i) + ".location");
+            key.setString("world", location.getWorld().getName());
+            key.setDouble("x", location.getX());
+            key.setDouble("y", location.getY());
+            key.setDouble("z", location.getZ());
+            key.setDouble("yaw", location.getYaw());
+            key.setDouble("pitch", location.getPitch());
         }
     }
-}
+}
\ No newline at end of file