diff --git a/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
index 9ace9ae92..e16ccdf26 100644
--- a/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
@@ -6,6 +6,7 @@ import net.citizensnpcs.api.ai.Navigator;
 import net.citizensnpcs.api.ai.TargetType;
 import net.citizensnpcs.api.ai.event.NavigationBeginEvent;
 import net.citizensnpcs.api.ai.event.NavigationCancelEvent;
+import net.citizensnpcs.api.ai.event.NavigationCompleteEvent;
 import net.citizensnpcs.api.ai.event.NavigationReplaceEvent;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.npc.CitizensNPC;
diff --git a/src/main/java/net/citizensnpcs/npc/ai/NavigationCompleteEvent.java b/src/main/java/net/citizensnpcs/npc/ai/NavigationCompleteEvent.java
deleted file mode 100644
index 2deacc008..000000000
--- a/src/main/java/net/citizensnpcs/npc/ai/NavigationCompleteEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.citizensnpcs.npc.ai;
-
-import net.citizensnpcs.api.ai.Navigator;
-import net.citizensnpcs.api.ai.event.NavigationEvent;
-
-import org.bukkit.event.HandlerList;
-
-public class NavigationCompleteEvent extends NavigationEvent {
-    public NavigationCompleteEvent(Navigator navigator) {
-        super(navigator);
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    private static final HandlerList handlers = new HandlerList();
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/WaypointGoal.java b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointGoal.java
index f4cc15b83..b927a6eec 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/WaypointGoal.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointGoal.java
@@ -6,7 +6,7 @@ import net.citizensnpcs.api.ai.Goal;
 import net.citizensnpcs.api.ai.GoalSelector;
 import net.citizensnpcs.api.ai.Navigator;
 import net.citizensnpcs.api.ai.event.NavigationCancelEvent;
-import net.citizensnpcs.npc.ai.NavigationCompleteEvent;
+import net.citizensnpcs.api.ai.event.NavigationCompleteEvent;
 
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;