diff --git a/Quadtree.sln b/Quadtree.sln
index b0a5a2f..489159a 100644
--- a/Quadtree.sln
+++ b/Quadtree.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.35201.131
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quadtree", "Quadtree.csproj", "{F9BB98FE-C82A-405F-BC01-95C0E895E4B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quadtree", "Quadtree\Quadtree.csproj", "{9E96645B-F8F9-4A1F-AED9-09BCAE2D497D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuadtreeTests", "QuadtreeTests\QuadtreeTests.csproj", "{9A4EDDCF-79A3-4EBE-9C9C-7D83D7BAF91A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +13,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F9BB98FE-C82A-405F-BC01-95C0E895E4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9BB98FE-C82A-405F-BC01-95C0E895E4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9BB98FE-C82A-405F-BC01-95C0E895E4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9BB98FE-C82A-405F-BC01-95C0E895E4B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E96645B-F8F9-4A1F-AED9-09BCAE2D497D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E96645B-F8F9-4A1F-AED9-09BCAE2D497D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E96645B-F8F9-4A1F-AED9-09BCAE2D497D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E96645B-F8F9-4A1F-AED9-09BCAE2D497D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A4EDDCF-79A3-4EBE-9C9C-7D83D7BAF91A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A4EDDCF-79A3-4EBE-9C9C-7D83D7BAF91A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A4EDDCF-79A3-4EBE-9C9C-7D83D7BAF91A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A4EDDCF-79A3-4EBE-9C9C-7D83D7BAF91A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {515DF911-1A2B-4213-84A1-5A60C0564C5B}
+		SolutionGuid = {D9E6DF99-F958-43C0-81DC-B0D5631BC411}
 	EndGlobalSection
 EndGlobal
diff --git a/BoundingBox2.cs b/Quadtree/BoundingBox2.cs
similarity index 98%
rename from BoundingBox2.cs
rename to Quadtree/BoundingBox2.cs
index 083ccfe..c24edd7 100644
--- a/BoundingBox2.cs
+++ b/Quadtree/BoundingBox2.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Quadtree
+namespace SpatialCollections
 {
     public enum IntersectionType { Contains, Intersects, Disjoint }
 
diff --git a/IWorldObject.cs b/Quadtree/IWorldObject.cs
similarity index 86%
rename from IWorldObject.cs
rename to Quadtree/IWorldObject.cs
index 760a2ed..2e7d911 100644
--- a/IWorldObject.cs
+++ b/Quadtree/IWorldObject.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Quadtree
+namespace SpatialCollections
 {
     public interface IWorldObject
     {
diff --git a/ListExtensions.cs b/Quadtree/ListExtensions.cs
similarity index 95%
rename from ListExtensions.cs
rename to Quadtree/ListExtensions.cs
index 9646bc6..a5b2309 100644
--- a/ListExtensions.cs
+++ b/Quadtree/ListExtensions.cs
@@ -1,4 +1,4 @@
-namespace Quadtree
+namespace SpatialCollections
 {
     internal static class ListExtensions
     {
diff --git a/Quadtree.cs b/Quadtree/Quadtree.cs
similarity index 99%
rename from Quadtree.cs
rename to Quadtree/Quadtree.cs
index 571d614..9a55611 100644
--- a/Quadtree.cs
+++ b/Quadtree/Quadtree.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Quadtree
+namespace SpatialCollections
 {
     /// <summary>
     ///   <para>Quadtree for fast add, remove, and query of world objects. The world size does not have to be known in
diff --git a/Quadtree.csproj b/Quadtree/Quadtree.csproj
similarity index 100%
rename from Quadtree.csproj
rename to Quadtree/Quadtree.csproj
diff --git a/QuadtreeItem.cs b/Quadtree/QuadtreeItem.cs
similarity index 93%
rename from QuadtreeItem.cs
rename to Quadtree/QuadtreeItem.cs
index 6ed5ff8..8e20f8b 100644
--- a/QuadtreeItem.cs
+++ b/Quadtree/QuadtreeItem.cs
@@ -1,4 +1,4 @@
-namespace Quadtree
+namespace SpatialCollections
 {
     internal struct QuadtreeItem<T>
     {
diff --git a/QuadtreeQuery.cs b/Quadtree/QuadtreeQuery.cs
similarity index 90%
rename from QuadtreeQuery.cs
rename to Quadtree/QuadtreeQuery.cs
index 7e0ad76..64b50c3 100644
--- a/QuadtreeQuery.cs
+++ b/Quadtree/QuadtreeQuery.cs
@@ -1,4 +1,4 @@
-namespace Quadtree
+namespace SpatialCollections
 {
     internal struct QuadtreeQuery
     {
diff --git a/QuadtreeVertex.cs b/Quadtree/QuadtreeVertex.cs
similarity index 95%
rename from QuadtreeVertex.cs
rename to Quadtree/QuadtreeVertex.cs
index 7985deb..7591a93 100644
--- a/QuadtreeVertex.cs
+++ b/Quadtree/QuadtreeVertex.cs
@@ -1,4 +1,4 @@
-namespace Quadtree
+namespace SpatialCollections
 {
     internal struct QuadtreeVertex
     {
diff --git a/QuadtreeTests/QuadtreeTests.csproj b/QuadtreeTests/QuadtreeTests.csproj
new file mode 100644
index 0000000..9946371
--- /dev/null
+++ b/QuadtreeTests/QuadtreeTests.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Quadtree\Quadtree.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
diff --git a/QuadtreeTests/Tests.cs b/QuadtreeTests/Tests.cs
new file mode 100644
index 0000000..c0657f6
--- /dev/null
+++ b/QuadtreeTests/Tests.cs
@@ -0,0 +1,19 @@
+using SpatialCollections;
+
+namespace QuadtreeTests
+{
+    public class Tests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void Test1()
+        {
+            Quadtree quadtree = new(20, 4);
+            Assert.Pass();
+        }
+    }
+}
\ No newline at end of file