diff --git a/src/net/citizensnpcs/editor/EquipmentEditor.java b/src/net/citizensnpcs/editor/EquipmentEditor.java
index 3bb6406ba..fd73c6801 100644
--- a/src/net/citizensnpcs/editor/EquipmentEditor.java
+++ b/src/net/citizensnpcs/editor/EquipmentEditor.java
@@ -1,16 +1,19 @@
 package net.citizensnpcs.editor;
 
+import org.bukkit.entity.Player;
+
 public class EquipmentEditor implements Editor {
+    private Player player;
+
+    public EquipmentEditor(Player player) {
+        this.player = player;
+    }
 
     @Override
     public void begin() {
-        // TODO Auto-generated method stub
-
     }
 
     @Override
     public void end() {
-        // TODO Auto-generated method stub
-
     }
 }
\ No newline at end of file
diff --git a/src/net/citizensnpcs/editor/TextEditor.java b/src/net/citizensnpcs/editor/TextEditor.java
index e81d4a299..2683e0448 100644
--- a/src/net/citizensnpcs/editor/TextEditor.java
+++ b/src/net/citizensnpcs/editor/TextEditor.java
@@ -1,15 +1,19 @@
 package net.citizensnpcs.editor;
 
+import org.bukkit.entity.Player;
+
 public class TextEditor implements Editor {
+    private Player player;
+
+    public TextEditor(Player player) {
+        this.player = player;
+    }
 
     @Override
     public void begin() {
-        // If this doesn't work I quit the internet.
     }
 
     @Override
     public void end() {
-        // TODO Auto-generated method stub
-
     }
 }
\ No newline at end of file
diff --git a/src/net/citizensnpcs/trait/Waypoint.java b/src/net/citizensnpcs/trait/waypoint/Waypoint.java
similarity index 80%
rename from src/net/citizensnpcs/trait/Waypoint.java
rename to src/net/citizensnpcs/trait/waypoint/Waypoint.java
index 5a202f34d..dd1141d61 100644
--- a/src/net/citizensnpcs/trait/Waypoint.java
+++ b/src/net/citizensnpcs/trait/waypoint/Waypoint.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.trait;
+package net.citizensnpcs.trait.waypoint;
 
 import org.bukkit.Location;
 
@@ -8,4 +8,4 @@ public class Waypoint {
     public Waypoint(Location location) {
         this.location = location;
     }
-}
+}
\ No newline at end of file
diff --git a/src/net/citizensnpcs/trait/WaypointProvider.java b/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java
similarity index 87%
rename from src/net/citizensnpcs/trait/WaypointProvider.java
rename to src/net/citizensnpcs/trait/waypoint/WaypointProvider.java
index 415c8f39e..e4d86a7ee 100644
--- a/src/net/citizensnpcs/trait/WaypointProvider.java
+++ b/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.trait;
+package net.citizensnpcs.trait.waypoint;
 
 import net.citizensnpcs.api.npc.ai.NavigationCallback;
 import net.citizensnpcs.editor.Editor;
@@ -6,9 +6,10 @@ import net.citizensnpcs.editor.Editor;
 import org.bukkit.entity.Player;
 
 public interface WaypointProvider {
+
     public Editor createEditor(Player player);
 
     public void addWaypoint(Waypoint waypoint);
 
     public NavigationCallback getCallback();
-}
+}
\ No newline at end of file
diff --git a/src/net/citizensnpcs/trait/Waypoints.java b/src/net/citizensnpcs/trait/waypoint/Waypoints.java
similarity index 87%
rename from src/net/citizensnpcs/trait/Waypoints.java
rename to src/net/citizensnpcs/trait/waypoint/Waypoints.java
index f11998679..0fdd1e1f6 100644
--- a/src/net/citizensnpcs/trait/Waypoints.java
+++ b/src/net/citizensnpcs/trait/waypoint/Waypoints.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.trait;
+package net.citizensnpcs.trait.waypoint;
 
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
@@ -21,6 +21,5 @@ public class Waypoints extends Trait {
 
     @Override
     public void save(DataKey key) {
-        // TODO Auto-generated method stub
     }
-}
+}
\ No newline at end of file