diff --git a/src/DotRecast.Detour.Crowd/DtCrowd.cs b/src/DotRecast.Detour.Crowd/DtCrowd.cs
index 5f19345..45559f5 100644
--- a/src/DotRecast.Detour.Crowd/DtCrowd.cs
+++ b/src/DotRecast.Detour.Crowd/DtCrowd.cs
@@ -19,17 +19,12 @@ freely, subject to the following restrictions:
 */
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 using DotRecast.Core;
-using DotRecast.Detour.Crowd.Tracking;
 
 
 namespace DotRecast.Detour.Crowd
 {
-    
-
     /**
  * Members in this module implement local steering and dynamic avoidance features.
  *
diff --git a/src/DotRecast.Detour.Crowd/Tracking/DtCrowdAgentDebugInfo.cs b/src/DotRecast.Detour.Crowd/DtCrowdAgentDebugInfo.cs
similarity index 96%
rename from src/DotRecast.Detour.Crowd/Tracking/DtCrowdAgentDebugInfo.cs
rename to src/DotRecast.Detour.Crowd/DtCrowdAgentDebugInfo.cs
index 7091eb7..47a7648 100644
--- a/src/DotRecast.Detour.Crowd/Tracking/DtCrowdAgentDebugInfo.cs
+++ b/src/DotRecast.Detour.Crowd/DtCrowdAgentDebugInfo.cs
@@ -20,7 +20,7 @@ freely, subject to the following restrictions:
 
 using DotRecast.Core;
 
-namespace DotRecast.Detour.Crowd.Tracking
+namespace DotRecast.Detour.Crowd
 {
     public class DtCrowdAgentDebugInfo
     {
diff --git a/src/DotRecast.Detour.Crowd/Tracking/DtObstacleAvoidanceDebugData.cs b/src/DotRecast.Detour.Crowd/DtObstacleAvoidanceDebugData.cs
similarity index 98%
rename from src/DotRecast.Detour.Crowd/Tracking/DtObstacleAvoidanceDebugData.cs
rename to src/DotRecast.Detour.Crowd/DtObstacleAvoidanceDebugData.cs
index 7c25954..104369f 100644
--- a/src/DotRecast.Detour.Crowd/Tracking/DtObstacleAvoidanceDebugData.cs
+++ b/src/DotRecast.Detour.Crowd/DtObstacleAvoidanceDebugData.cs
@@ -21,10 +21,8 @@ freely, subject to the following restrictions:
 using System;
 using DotRecast.Core;
 
-namespace DotRecast.Detour.Crowd.Tracking
+namespace DotRecast.Detour.Crowd
 {
-    
-
     public class DtObstacleAvoidanceDebugData
     {
         private int m_nsamples;
diff --git a/src/DotRecast.Detour.Crowd/DtObstacleAvoidanceQuery.cs b/src/DotRecast.Detour.Crowd/DtObstacleAvoidanceQuery.cs
index abb8b31..2717491 100644
--- a/src/DotRecast.Detour.Crowd/DtObstacleAvoidanceQuery.cs
+++ b/src/DotRecast.Detour.Crowd/DtObstacleAvoidanceQuery.cs
@@ -20,7 +20,7 @@ freely, subject to the following restrictions:
 
 using System;
 using DotRecast.Core;
-using DotRecast.Detour.Crowd.Tracking;
+
 
 namespace DotRecast.Detour.Crowd
 {
diff --git a/src/DotRecast.Recast.Demo/Tools/CrowdSampleTool.cs b/src/DotRecast.Recast.Demo/Tools/CrowdSampleTool.cs
index 64a1715..9992bc9 100644
--- a/src/DotRecast.Recast.Demo/Tools/CrowdSampleTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/CrowdSampleTool.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using DotRecast.Core;
 using DotRecast.Detour;
 using DotRecast.Detour.Crowd;
-using DotRecast.Detour.Crowd.Tracking;
+
 using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
 using DotRecast.Recast.Toolset;
diff --git a/src/DotRecast.Recast.Toolset/Tools/RcCrowdTool.cs b/src/DotRecast.Recast.Toolset/Tools/RcCrowdTool.cs
index 9124726..5ff640a 100644
--- a/src/DotRecast.Recast.Toolset/Tools/RcCrowdTool.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/RcCrowdTool.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using DotRecast.Core;
 using DotRecast.Detour;
 using DotRecast.Detour.Crowd;
-using DotRecast.Detour.Crowd.Tracking;
+
 using DotRecast.Recast.Toolset.Builder;
 
 namespace DotRecast.Recast.Toolset.Tools