diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index ca0dd64d..796a6997 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1650,6 +1650,7 @@ Block chunk memory pooling
 Rename MoveToTree
 Major pathfinding work -- breaking MoteToTree
 Pathfinding tiling work
+Refactor recast pathfinding classes
 
 
 
diff --git a/src/main/java/electrosphere/server/ai/nodes/plan/PathfindingNode.java b/src/main/java/electrosphere/server/ai/nodes/plan/PathfindingNode.java
index b7f1b610..1a5591c2 100644
--- a/src/main/java/electrosphere/server/ai/nodes/plan/PathfindingNode.java
+++ b/src/main/java/electrosphere/server/ai/nodes/plan/PathfindingNode.java
@@ -12,7 +12,7 @@ import electrosphere.server.ai.blackboard.BlackboardKeys;
 import electrosphere.server.ai.nodes.AITreeNode;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.interfaces.PathfindingManager;
-import electrosphere.server.pathfinding.PathingProgressiveData;
+import electrosphere.server.pathfinding.recast.PathingProgressiveData;
 
 /**
  * A node that performs pathfinding
diff --git a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java
index 54609edb..a2b4dbcd 100644
--- a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java
+++ b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java
@@ -39,8 +39,8 @@ import electrosphere.server.datacell.interfaces.VoxelCellManager;
 import electrosphere.server.datacell.physics.PhysicsDataCell;
 import electrosphere.server.entity.ServerContentManager;
 import electrosphere.server.entity.serialization.ContentSerialization;
-import electrosphere.server.pathfinding.NavMeshConstructor;
-import electrosphere.server.pathfinding.Pathfinder;
+import electrosphere.server.pathfinding.recast.NavMeshConstructor;
+import electrosphere.server.pathfinding.recast.Pathfinder;
 import electrosphere.server.physics.block.manager.ServerBlockManager;
 import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
 import electrosphere.server.physics.fluid.manager.ServerFluidManager;
diff --git a/src/main/java/electrosphere/server/pathfinding/NavMeshConstructor.java b/src/main/java/electrosphere/server/pathfinding/recast/NavMeshConstructor.java
similarity index 99%
rename from src/main/java/electrosphere/server/pathfinding/NavMeshConstructor.java
rename to src/main/java/electrosphere/server/pathfinding/recast/NavMeshConstructor.java
index 66bbaaa0..28f46b32 100644
--- a/src/main/java/electrosphere/server/pathfinding/NavMeshConstructor.java
+++ b/src/main/java/electrosphere/server/pathfinding/recast/NavMeshConstructor.java
@@ -1,4 +1,4 @@
-package electrosphere.server.pathfinding;
+package electrosphere.server.pathfinding.recast;
 
 import org.joml.Vector3d;
 import org.recast4j.detour.MeshData;
diff --git a/src/main/java/electrosphere/server/pathfinding/Pathfinder.java b/src/main/java/electrosphere/server/pathfinding/recast/Pathfinder.java
similarity index 99%
rename from src/main/java/electrosphere/server/pathfinding/Pathfinder.java
rename to src/main/java/electrosphere/server/pathfinding/recast/Pathfinder.java
index 16700a3c..7d582c2f 100644
--- a/src/main/java/electrosphere/server/pathfinding/Pathfinder.java
+++ b/src/main/java/electrosphere/server/pathfinding/recast/Pathfinder.java
@@ -1,4 +1,4 @@
-package electrosphere.server.pathfinding;
+package electrosphere.server.pathfinding.recast;
 
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/src/main/java/electrosphere/server/pathfinding/PathingProgressiveData.java b/src/main/java/electrosphere/server/pathfinding/recast/PathingProgressiveData.java
similarity index 96%
rename from src/main/java/electrosphere/server/pathfinding/PathingProgressiveData.java
rename to src/main/java/electrosphere/server/pathfinding/recast/PathingProgressiveData.java
index b16964d3..0e4b3e64 100644
--- a/src/main/java/electrosphere/server/pathfinding/PathingProgressiveData.java
+++ b/src/main/java/electrosphere/server/pathfinding/recast/PathingProgressiveData.java
@@ -1,4 +1,4 @@
-package electrosphere.server.pathfinding;
+package electrosphere.server.pathfinding.recast;
 
 import java.util.List;
 
diff --git a/src/test/java/electrosphere/server/pathfinding/NavMeshConstructorTests.java b/src/test/java/electrosphere/server/pathfinding/recast/NavMeshConstructorTests.java
similarity index 97%
rename from src/test/java/electrosphere/server/pathfinding/NavMeshConstructorTests.java
rename to src/test/java/electrosphere/server/pathfinding/recast/NavMeshConstructorTests.java
index ce80efc0..c8b74a8c 100644
--- a/src/test/java/electrosphere/server/pathfinding/NavMeshConstructorTests.java
+++ b/src/test/java/electrosphere/server/pathfinding/recast/NavMeshConstructorTests.java
@@ -1,4 +1,4 @@
-package electrosphere.server.pathfinding;
+package electrosphere.server.pathfinding.recast;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -11,6 +11,7 @@ import org.recast4j.recast.RecastBuilder.RecastBuilderResult;
 import org.recast4j.recast.geom.SingleTrimeshInputGeomProvider;
 
 import electrosphere.entity.state.collidable.TriGeomData;
+import electrosphere.server.pathfinding.recast.NavMeshConstructor;
 import electrosphere.test.annotations.UnitTest;
 import electrosphere.util.math.GeomUtils;