diff --git a/SceneManager/EntryPoint.cs b/SceneManager/EntryPoint.cs
index f2bff6f..1ee02e6 100644
--- a/SceneManager/EntryPoint.cs
+++ b/SceneManager/EntryPoint.cs
@@ -3,6 +3,7 @@ using System.Reflection;
 using Rage;
 using SceneManager.Utils;
 using SceneManager.Menus;
+using SceneManager.Managers;
 
 [assembly: Rage.Attributes.Plugin("Scene Manager", Author = "Rich", Description = "Control your scenes with custom AI pathing and traffic barrier management.", PrefersSingleInstance = true)]
 
@@ -42,7 +43,7 @@ namespace SceneManager
         private static void TerminationHandler(object sender, EventArgs e)
         {
             BarrierMenu.Cleanup();
-            DeleteAllPaths.Delete();
+            PathManager.DeleteAllPaths();
 
             Game.LogTrivial($"Plugin has shut down.");
             Game.DisplayNotification($"~o~Scene Manager ~r~[Terminated]\n~w~The plugin has shut down.");
diff --git a/SceneManager/Utils/DirectDriver.cs b/SceneManager/Utils/DirectDriver.cs
index a024260..03a0362 100644
--- a/SceneManager/Utils/DirectDriver.cs
+++ b/SceneManager/Utils/DirectDriver.cs
@@ -1,6 +1,9 @@
 using Rage;
 using RAGENativeUI.Elements;
-using SceneManager.Objects;
+using SceneManager.CollectedPeds;
+using SceneManager.Managers;
+using SceneManager.Paths;
+using SceneManager.Waypoints;
 using System.Linq;
 
 namespace SceneManager.Utils
diff --git a/SceneManager/Utils/DismissDriver.cs b/SceneManager/Utils/DismissDriver.cs
index 69ebadf..6228119 100644
--- a/SceneManager/Utils/DismissDriver.cs
+++ b/SceneManager/Utils/DismissDriver.cs
@@ -1,5 +1,6 @@
 using Rage;
-using SceneManager.Objects;
+using SceneManager.CollectedPeds;
+using SceneManager.Managers;
 using System.Linq;
 
 namespace SceneManager.Utils