diff --git a/DotRecast.sln b/DotRecast.sln
index 58e4b2c..48fcfe1 100644
--- a/DotRecast.sln
+++ b/DotRecast.sln
@@ -35,9 +35,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Detour.TileCache.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Recast.Demo", "src\DotRecast.Recast.Demo\DotRecast.Recast.Demo.csproj", "{023E1E6A-4895-4573-89AE-3D5D8E0B39C8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{65754308-3C9B-4544-9D7B-F2C16A4E2486}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Recast.DemoTool", "src\DotRecast.Recast.DemoTool\DotRecast.Recast.DemoTool.csproj", "{DF987948-8C23-4337-AF83-D87D6407518D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Recast.Toolset", "src\DotRecast.Recast.Toolset\DotRecast.Recast.Toolset.csproj", "{DF987948-8C23-4337-AF83-D87D6407518D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/DotRecast.Recast.Demo/DotRecast.Recast.Demo.csproj b/src/DotRecast.Recast.Demo/DotRecast.Recast.Demo.csproj
index 82236ba..e914a7a 100644
--- a/src/DotRecast.Recast.Demo/DotRecast.Recast.Demo.csproj
+++ b/src/DotRecast.Recast.Demo/DotRecast.Recast.Demo.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\DotRecast.Recast.DemoTool\DotRecast.Recast.DemoTool.csproj" />
+        <ProjectReference Include="..\DotRecast.Recast.Toolset\DotRecast.Recast.Toolset.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/DotRecast.Recast.Demo/Draw/DebugDraw.cs b/src/DotRecast.Recast.Demo/Draw/DebugDraw.cs
index 2c6f5d3..23a85dd 100644
--- a/src/DotRecast.Recast.Demo/Draw/DebugDraw.cs
+++ b/src/DotRecast.Recast.Demo/Draw/DebugDraw.cs
@@ -20,7 +20,7 @@ freely, subject to the following restrictions:
 
 using System;
 using DotRecast.Core;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using Silk.NET.OpenGL;
 
 namespace DotRecast.Recast.Demo.Draw;
diff --git a/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs b/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs
index 2efa693..5cc73c7 100644
--- a/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs
+++ b/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs
@@ -22,10 +22,10 @@ using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using DotRecast.Core;
 using DotRecast.Detour;
-using DotRecast.Recast.DemoTool.Builder;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Builder;
+using DotRecast.Recast.Toolset.Geom;
 using DotRecast.Recast.Demo.UI;
-using DotRecast.Recast.DemoTool;
+using DotRecast.Recast.Toolset;
 
 namespace DotRecast.Recast.Demo.Draw;
 
diff --git a/src/DotRecast.Recast.Demo/Draw/RecastDebugDraw.cs b/src/DotRecast.Recast.Demo/Draw/RecastDebugDraw.cs
index 16732f3..710f744 100644
--- a/src/DotRecast.Recast.Demo/Draw/RecastDebugDraw.cs
+++ b/src/DotRecast.Recast.Demo/Draw/RecastDebugDraw.cs
@@ -24,7 +24,7 @@ using System.Numerics;
 using DotRecast.Core;
 using DotRecast.Detour;
 
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using Silk.NET.OpenGL;
 
 namespace DotRecast.Recast.Demo.Draw;
diff --git a/src/DotRecast.Recast.Demo/RecastDemo.cs b/src/DotRecast.Recast.Demo/RecastDemo.cs
index a67228c..e809bcd 100644
--- a/src/DotRecast.Recast.Demo/RecastDemo.cs
+++ b/src/DotRecast.Recast.Demo/RecastDemo.cs
@@ -35,14 +35,13 @@ using DotRecast.Core;
 using DotRecast.Detour;
 using DotRecast.Detour.Extras.Unity.Astar;
 using DotRecast.Detour.Io;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
 using DotRecast.Recast.Demo.Messages;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Geom;
 using DotRecast.Recast.Demo.Tools;
 using DotRecast.Recast.Demo.UI;
-using DotRecast.Recast.DemoTool;
-using Silk.NET.GLFW;
+using DotRecast.Recast.Toolset;
 using static DotRecast.Core.RcMath;
 using MouseButton = Silk.NET.Input.MouseButton;
 using Window = Silk.NET.Windowing.Window;
diff --git a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs
index 5b598ea..28516e3 100644
--- a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
 using System;
 using System.Collections.Generic;
 using DotRecast.Core;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Geom;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Geom;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 using static DotRecast.Recast.Demo.Draw.DebugDrawPrimitives;
diff --git a/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs b/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs
index 853de9f..e08c61d 100644
--- a/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs
@@ -22,10 +22,10 @@ using System.Linq;
 using DotRecast.Core;
 using DotRecast.Detour;
 using DotRecast.Detour.Crowd;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 
diff --git a/src/DotRecast.Recast.Demo/Tools/CrowdTool.cs b/src/DotRecast.Recast.Demo/Tools/CrowdTool.cs
index 6433661..de87a9c 100644
--- a/src/DotRecast.Recast.Demo/Tools/CrowdTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/CrowdTool.cs
@@ -25,10 +25,10 @@ using DotRecast.Detour;
 using DotRecast.Detour.Crowd;
 using DotRecast.Detour.Crowd.Tracking;
 
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 using static DotRecast.Recast.Demo.Draw.DebugDrawPrimitives;
diff --git a/src/DotRecast.Recast.Demo/Tools/DynamicUpdateTool.cs b/src/DotRecast.Recast.Demo/Tools/DynamicUpdateTool.cs
index 55b05e8..75773dc 100644
--- a/src/DotRecast.Recast.Demo/Tools/DynamicUpdateTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/DynamicUpdateTool.cs
@@ -25,13 +25,13 @@ using DotRecast.Core;
 using DotRecast.Detour.Dynamic;
 using DotRecast.Detour.Dynamic.Colliders;
 using DotRecast.Detour.Dynamic.Io;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Geom;
 using DotRecast.Recast.Demo.Tools.Gizmos;
 using DotRecast.Recast.Demo.UI;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 using static DotRecast.Recast.Demo.Draw.DebugDrawPrimitives;
diff --git a/src/DotRecast.Recast.Demo/Tools/IRcTool.cs b/src/DotRecast.Recast.Demo/Tools/IRcTool.cs
index 700ca4c..4092354 100644
--- a/src/DotRecast.Recast.Demo/Tools/IRcTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/IRcTool.cs
@@ -20,7 +20,7 @@ freely, subject to the following restrictions:
 
 using DotRecast.Core;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
+using DotRecast.Recast.Toolset;
 
 namespace DotRecast.Recast.Demo.Tools;
 
diff --git a/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs b/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs
index d2f555b..ee4b2af 100644
--- a/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs
@@ -19,11 +19,11 @@ freely, subject to the following restrictions:
 using System.Collections.Generic;
 using DotRecast.Core;
 using DotRecast.Detour.Extras.Jumplink;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Geom;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Geom;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 using static DotRecast.Recast.Demo.Draw.DebugDrawPrimitives;
diff --git a/src/DotRecast.Recast.Demo/Tools/ObstacleTool.cs b/src/DotRecast.Recast.Demo/Tools/ObstacleTool.cs
index 739d85d..43304fd 100644
--- a/src/DotRecast.Recast.Demo/Tools/ObstacleTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/ObstacleTool.cs
@@ -1,7 +1,7 @@
 using DotRecast.Core;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using Serilog;
 
diff --git a/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs b/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs
index 452b410..44b0a7b 100644
--- a/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs
@@ -20,11 +20,11 @@ freely, subject to the following restrictions:
 
 using System;
 using DotRecast.Core;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Geom;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Geom;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 
diff --git a/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs b/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs
index 981c529..afa7fa6 100644
--- a/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs
@@ -2,10 +2,10 @@ using System;
 using System.Collections.Generic;
 using DotRecast.Core;
 using DotRecast.Detour;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
 using static DotRecast.Recast.Demo.Draw.DebugDrawPrimitives;
diff --git a/src/DotRecast.Recast.Demo/Tools/TileTool.cs b/src/DotRecast.Recast.Demo/Tools/TileTool.cs
index 0566764..59cc407 100644
--- a/src/DotRecast.Recast.Demo/Tools/TileTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/TileTool.cs
@@ -1,8 +1,8 @@
 using System;
 using DotRecast.Core;
 using DotRecast.Recast.Demo.Draw;
-using DotRecast.Recast.DemoTool;
-using DotRecast.Recast.DemoTool.Tools;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Tools;
 using ImGuiNET;
 using Serilog;
 using static DotRecast.Recast.Demo.Draw.DebugDraw;
diff --git a/src/DotRecast.Recast.Demo/UI/RcSettingsView.cs b/src/DotRecast.Recast.Demo/UI/RcSettingsView.cs
index c875ca4..4c16071 100644
--- a/src/DotRecast.Recast.Demo/UI/RcSettingsView.cs
+++ b/src/DotRecast.Recast.Demo/UI/RcSettingsView.cs
@@ -24,7 +24,7 @@ using System.Numerics;
 using DotRecast.Core;
 using DotRecast.Recast.Demo.Draw;
 using DotRecast.Recast.Demo.Messages;
-using DotRecast.Recast.DemoTool;
+using DotRecast.Recast.Toolset;
 using ImGuiNET;
 using Serilog;
 
diff --git a/src/DotRecast.Recast.Demo/UI/RcToolsetView.cs b/src/DotRecast.Recast.Demo/UI/RcToolsetView.cs
index a8b8341..3d9bbe7 100644
--- a/src/DotRecast.Recast.Demo/UI/RcToolsetView.cs
+++ b/src/DotRecast.Recast.Demo/UI/RcToolsetView.cs
@@ -22,7 +22,7 @@ using System;
 using System.Numerics;
 using DotRecast.Core;
 using DotRecast.Recast.Demo.Tools;
-using DotRecast.Recast.DemoTool;
+using DotRecast.Recast.Toolset;
 using ImGuiNET;
 
 namespace DotRecast.Recast.Demo.UI;
diff --git a/src/DotRecast.Recast.DemoTool/Builder/DemoNavMeshBuilder.cs b/src/DotRecast.Recast.Toolset/Builder/DemoNavMeshBuilder.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Builder/DemoNavMeshBuilder.cs
rename to src/DotRecast.Recast.Toolset/Builder/DemoNavMeshBuilder.cs
index bb3b3b8..cbf3261 100644
--- a/src/DotRecast.Recast.DemoTool/Builder/DemoNavMeshBuilder.cs
+++ b/src/DotRecast.Recast.Toolset/Builder/DemoNavMeshBuilder.cs
@@ -1,8 +1,8 @@
 using DotRecast.Detour;
-using DotRecast.Recast.DemoTool.Geom;
 using DotRecast.Recast.Geom;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool.Builder
+namespace DotRecast.Recast.Toolset.Builder
 {
     public static class DemoNavMeshBuilder
     {
diff --git a/src/DotRecast.Recast.DemoTool/Builder/NavMeshBuildResult.cs b/src/DotRecast.Recast.Toolset/Builder/NavMeshBuildResult.cs
similarity index 94%
rename from src/DotRecast.Recast.DemoTool/Builder/NavMeshBuildResult.cs
rename to src/DotRecast.Recast.Toolset/Builder/NavMeshBuildResult.cs
index 4b6b4d5..29acdee 100644
--- a/src/DotRecast.Recast.DemoTool/Builder/NavMeshBuildResult.cs
+++ b/src/DotRecast.Recast.Toolset/Builder/NavMeshBuildResult.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using DotRecast.Detour;
 
-namespace DotRecast.Recast.DemoTool.Builder
+namespace DotRecast.Recast.Toolset.Builder
 {
     public class NavMeshBuildResult
     {
diff --git a/src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs b/src/DotRecast.Recast.Toolset/Builder/SampleAreaModifications.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs
rename to src/DotRecast.Recast.Toolset/Builder/SampleAreaModifications.cs
index 2263bba..6fa28d6 100644
--- a/src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs
+++ b/src/DotRecast.Recast.Toolset/Builder/SampleAreaModifications.cs
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
 using System.Collections.Immutable;
 using System.Linq;
 
-namespace DotRecast.Recast.DemoTool.Builder
+namespace DotRecast.Recast.Toolset.Builder
 {
     public class SampleAreaModifications
     {
diff --git a/src/DotRecast.Recast.DemoTool/Builder/SoloNavMeshBuilder.cs b/src/DotRecast.Recast.Toolset/Builder/SoloNavMeshBuilder.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Builder/SoloNavMeshBuilder.cs
rename to src/DotRecast.Recast.Toolset/Builder/SoloNavMeshBuilder.cs
index 8ffd0c8..497491d 100644
--- a/src/DotRecast.Recast.DemoTool/Builder/SoloNavMeshBuilder.cs
+++ b/src/DotRecast.Recast.Toolset/Builder/SoloNavMeshBuilder.cs
@@ -20,9 +20,9 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using DotRecast.Detour;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool.Builder
+namespace DotRecast.Recast.Toolset.Builder
 {
     public class SoloNavMeshBuilder
     {
diff --git a/src/DotRecast.Recast.DemoTool/Builder/TileNavMeshBuilder.cs b/src/DotRecast.Recast.Toolset/Builder/TileNavMeshBuilder.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Builder/TileNavMeshBuilder.cs
rename to src/DotRecast.Recast.Toolset/Builder/TileNavMeshBuilder.cs
index 3c46037..98c1291 100644
--- a/src/DotRecast.Recast.DemoTool/Builder/TileNavMeshBuilder.cs
+++ b/src/DotRecast.Recast.Toolset/Builder/TileNavMeshBuilder.cs
@@ -20,9 +20,9 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using DotRecast.Detour;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool.Builder
+namespace DotRecast.Recast.Toolset.Builder
 {
     public class TileNavMeshBuilder
     {
diff --git a/src/DotRecast.Recast.DemoTool/DemoObjImporter.cs b/src/DotRecast.Recast.Toolset/DemoObjImporter.cs
similarity index 81%
rename from src/DotRecast.Recast.DemoTool/DemoObjImporter.cs
rename to src/DotRecast.Recast.Toolset/DemoObjImporter.cs
index 36152bf..ba44d0d 100644
--- a/src/DotRecast.Recast.DemoTool/DemoObjImporter.cs
+++ b/src/DotRecast.Recast.Toolset/DemoObjImporter.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool
+namespace DotRecast.Recast.Toolset
 {
     public static class DemoObjImporter
     {
diff --git a/src/DotRecast.Recast.DemoTool/DotRecast.Recast.DemoTool.csproj b/src/DotRecast.Recast.Toolset/DotRecast.Recast.Toolset.csproj
similarity index 100%
rename from src/DotRecast.Recast.DemoTool/DotRecast.Recast.DemoTool.csproj
rename to src/DotRecast.Recast.Toolset/DotRecast.Recast.Toolset.csproj
diff --git a/src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs b/src/DotRecast.Recast.Toolset/Geom/DemoInputGeomProvider.cs
similarity index 99%
rename from src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs
rename to src/DotRecast.Recast.Toolset/Geom/DemoInputGeomProvider.cs
index f677b7b..f6f440d 100644
--- a/src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs
+++ b/src/DotRecast.Recast.Toolset/Geom/DemoInputGeomProvider.cs
@@ -24,7 +24,7 @@ using System.Collections.Immutable;
 using DotRecast.Core;
 using DotRecast.Recast.Geom;
 
-namespace DotRecast.Recast.DemoTool.Geom
+namespace DotRecast.Recast.Toolset.Geom
 {
     public class DemoInputGeomProvider : IInputGeomProvider
     {
diff --git a/src/DotRecast.Recast.DemoTool/Geom/DemoOffMeshConnection.cs b/src/DotRecast.Recast.Toolset/Geom/DemoOffMeshConnection.cs
similarity index 97%
rename from src/DotRecast.Recast.DemoTool/Geom/DemoOffMeshConnection.cs
rename to src/DotRecast.Recast.Toolset/Geom/DemoOffMeshConnection.cs
index 16d9caa..d0d90ab 100644
--- a/src/DotRecast.Recast.DemoTool/Geom/DemoOffMeshConnection.cs
+++ b/src/DotRecast.Recast.Toolset/Geom/DemoOffMeshConnection.cs
@@ -20,7 +20,7 @@ freely, subject to the following restrictions:
 
 using DotRecast.Core;
 
-namespace DotRecast.Recast.DemoTool.Geom
+namespace DotRecast.Recast.Toolset.Geom
 {
     public class DemoOffMeshConnection
     {
diff --git a/src/DotRecast.Recast.DemoTool/ISampleTool.cs b/src/DotRecast.Recast.Toolset/ISampleTool.cs
similarity index 77%
rename from src/DotRecast.Recast.DemoTool/ISampleTool.cs
rename to src/DotRecast.Recast.Toolset/ISampleTool.cs
index 7fd496f..97dd0f3 100644
--- a/src/DotRecast.Recast.DemoTool/ISampleTool.cs
+++ b/src/DotRecast.Recast.Toolset/ISampleTool.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool
+namespace DotRecast.Recast.Toolset
 {
     public interface ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/RcNavMeshBuildSettings.cs b/src/DotRecast.Recast.Toolset/RcNavMeshBuildSettings.cs
similarity index 96%
rename from src/DotRecast.Recast.DemoTool/RcNavMeshBuildSettings.cs
rename to src/DotRecast.Recast.Toolset/RcNavMeshBuildSettings.cs
index 1fd9ee7..e0b6906 100644
--- a/src/DotRecast.Recast.DemoTool/RcNavMeshBuildSettings.cs
+++ b/src/DotRecast.Recast.Toolset/RcNavMeshBuildSettings.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool
+namespace DotRecast.Recast.Toolset
 {
     public class RcNavMeshBuildSettings
     {
diff --git a/src/DotRecast.Recast.DemoTool/Sample.cs b/src/DotRecast.Recast.Toolset/Sample.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Sample.cs
rename to src/DotRecast.Recast.Toolset/Sample.cs
index 7ec55e8..4fd7a4e 100644
--- a/src/DotRecast.Recast.DemoTool/Sample.cs
+++ b/src/DotRecast.Recast.Toolset/Sample.cs
@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
 using System;
 using System.Collections.Generic;
 using DotRecast.Detour;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool
+namespace DotRecast.Recast.Toolset
 {
     public class Sample
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/ConvexVolumeToolImpl.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/ConvexVolumeToolImpl.cs
index 01d6507..526e0fa 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/ConvexVolumeToolImpl.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using DotRecast.Core;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class ConvexVolumeToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/CrowdAgentData.cs b/src/DotRecast.Recast.Toolset/Tools/CrowdAgentData.cs
similarity index 88%
rename from src/DotRecast.Recast.DemoTool/Tools/CrowdAgentData.cs
rename to src/DotRecast.Recast.Toolset/Tools/CrowdAgentData.cs
index 2c52c12..4da3bcf 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/CrowdAgentData.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/CrowdAgentData.cs
@@ -1,6 +1,6 @@
 using DotRecast.Core;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class CrowdAgentData
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/CrowdAgentTrail.cs b/src/DotRecast.Recast.Toolset/Tools/CrowdAgentTrail.cs
similarity index 80%
rename from src/DotRecast.Recast.DemoTool/Tools/CrowdAgentTrail.cs
rename to src/DotRecast.Recast.Toolset/Tools/CrowdAgentTrail.cs
index 9c5afab..e4950ba 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/CrowdAgentTrail.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/CrowdAgentTrail.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class CrowdAgentTrail
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/CrowdAgentType.cs b/src/DotRecast.Recast.Toolset/Tools/CrowdAgentType.cs
similarity index 67%
rename from src/DotRecast.Recast.DemoTool/Tools/CrowdAgentType.cs
rename to src/DotRecast.Recast.Toolset/Tools/CrowdAgentType.cs
index b921043..124e628 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/CrowdAgentType.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/CrowdAgentType.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public enum CrowdAgentType
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/CrowdToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/CrowdToolImpl.cs
similarity index 89%
rename from src/DotRecast.Recast.DemoTool/Tools/CrowdToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/CrowdToolImpl.cs
index 0838d2c..4cbb1a3 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/CrowdToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/CrowdToolImpl.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class CrowdToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/CrowdToolMode.cs b/src/DotRecast.Recast.Toolset/Tools/CrowdToolMode.cs
similarity index 95%
rename from src/DotRecast.Recast.DemoTool/Tools/CrowdToolMode.cs
rename to src/DotRecast.Recast.Toolset/Tools/CrowdToolMode.cs
index 772ccad..ac5549a 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/CrowdToolMode.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/CrowdToolMode.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class CrowdToolMode
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/CrowdToolParams.cs b/src/DotRecast.Recast.Toolset/Tools/CrowdToolParams.cs
similarity index 97%
rename from src/DotRecast.Recast.DemoTool/Tools/CrowdToolParams.cs
rename to src/DotRecast.Recast.Toolset/Tools/CrowdToolParams.cs
index 7d64138..b3ca402 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/CrowdToolParams.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/CrowdToolParams.cs
@@ -16,7 +16,7 @@ freely, subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class CrowdToolParams
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/DynamicColliderShape.cs b/src/DotRecast.Recast.Toolset/Tools/DynamicColliderShape.cs
similarity index 80%
rename from src/DotRecast.Recast.DemoTool/Tools/DynamicColliderShape.cs
rename to src/DotRecast.Recast.Toolset/Tools/DynamicColliderShape.cs
index d1c0e89..70c964e 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/DynamicColliderShape.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/DynamicColliderShape.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public enum DynamicColliderShape
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/DynamicUpdateToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/DynamicUpdateToolImpl.cs
similarity index 89%
rename from src/DotRecast.Recast.DemoTool/Tools/DynamicUpdateToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/DynamicUpdateToolImpl.cs
index 03f67ec..ece99f8 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/DynamicUpdateToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/DynamicUpdateToolImpl.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class DynamicUpdateToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/DynamicUpdateToolMode.cs b/src/DotRecast.Recast.Toolset/Tools/DynamicUpdateToolMode.cs
similarity index 94%
rename from src/DotRecast.Recast.DemoTool/Tools/DynamicUpdateToolMode.cs
rename to src/DotRecast.Recast.Toolset/Tools/DynamicUpdateToolMode.cs
index ea84e59..2bccd99 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/DynamicUpdateToolMode.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/DynamicUpdateToolMode.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class DynamicUpdateToolMode
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/JumpLinkBuilderToolImpl.cs
similarity index 97%
rename from src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/JumpLinkBuilderToolImpl.cs
index 8800c87..a359b9c 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/JumpLinkBuilderToolImpl.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using DotRecast.Core;
 using DotRecast.Detour.Extras.Jumplink;
-using DotRecast.Recast.DemoTool.Builder;
-using DotRecast.Recast.DemoTool.Geom;
+using DotRecast.Recast.Toolset.Builder;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class JumpLinkBuilderToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOption.cs b/src/DotRecast.Recast.Toolset/Tools/JumpLinkBuilderToolOption.cs
similarity index 97%
rename from src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOption.cs
rename to src/DotRecast.Recast.Toolset/Tools/JumpLinkBuilderToolOption.cs
index db8a691..9fa1c2e 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOption.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/JumpLinkBuilderToolOption.cs
@@ -18,7 +18,7 @@ freely, subject to the following restrictions:
 
 using DotRecast.Detour.Extras.Jumplink;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class JumpLinkBuilderToolOption
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/ObstacleToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/ObstacleToolImpl.cs
similarity index 94%
rename from src/DotRecast.Recast.DemoTool/Tools/ObstacleToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/ObstacleToolImpl.cs
index 2edfc3a..2ffd72f 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/ObstacleToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/ObstacleToolImpl.cs
@@ -1,7 +1,7 @@
 using DotRecast.Core;
 using DotRecast.Detour.TileCache;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class ObstacleToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/OffMeshConnectionToolImpl.cs
similarity index 94%
rename from src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/OffMeshConnectionToolImpl.cs
index eb1eed6..234abc4 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/OffMeshConnectionToolImpl.cs
@@ -1,10 +1,10 @@
 using System;
 using DotRecast.Core;
-using DotRecast.Recast.DemoTool.Builder;
-using DotRecast.Recast.DemoTool.Geom;
 using DotRecast.Recast.Geom;
+using DotRecast.Recast.Toolset.Builder;
+using DotRecast.Recast.Toolset.Geom;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class OffMeshConnectionToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOption.cs b/src/DotRecast.Recast.Toolset/Tools/OffMeshConnectionToolOption.cs
similarity index 64%
rename from src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOption.cs
rename to src/DotRecast.Recast.Toolset/Tools/OffMeshConnectionToolOption.cs
index d12d67b..fb077ee 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOption.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/OffMeshConnectionToolOption.cs
@@ -1,4 +1,4 @@
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class OffMeshConnectionToolOption
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolImpl.cs
similarity index 99%
rename from src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolImpl.cs
index 6d7187a..668c732 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolImpl.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using DotRecast.Core;
 using DotRecast.Detour;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class TestNavmeshToolImpl : ISampleTool
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolMode.cs b/src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolMode.cs
similarity index 97%
rename from src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolMode.cs
rename to src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolMode.cs
index a88f177..cfe7dd8 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolMode.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolMode.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class TestNavmeshToolMode
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolOption.cs b/src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolOption.cs
similarity index 84%
rename from src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolOption.cs
rename to src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolOption.cs
index db6b898..172a9ae 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolOption.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/TestNavmeshToolOption.cs
@@ -1,6 +1,6 @@
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class TestNavmeshToolOption
     {
diff --git a/src/DotRecast.Recast.DemoTool/Tools/TileToolImpl.cs b/src/DotRecast.Recast.Toolset/Tools/TileToolImpl.cs
similarity index 98%
rename from src/DotRecast.Recast.DemoTool/Tools/TileToolImpl.cs
rename to src/DotRecast.Recast.Toolset/Tools/TileToolImpl.cs
index c8eb280..eb6e165 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/TileToolImpl.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/TileToolImpl.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using System.Collections.Immutable;
 using DotRecast.Core;
-using DotRecast.Recast.DemoTool.Builder;
+using DotRecast.Recast.Toolset.Builder;
 
-namespace DotRecast.Recast.DemoTool.Tools
+namespace DotRecast.Recast.Toolset.Tools
 {
     public class TileToolImpl : ISampleTool
     {