diff --git a/.circleci/config.yml b/.circleci/config.yml
index fc255b2..6619367 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: dotnet nuget push ./Bonk/bin/Release/MoonTools.Core.Bonk.*.nupkg -k $API_KEY -s https://api.nuget.org/v3/index.json
+      - run: dotnet nuget push ./Bonk/bin/Release/MoonTools.Bonk.*.nupkg -k $API_KEY -s https://api.nuget.org/v3/index.json
 
 workflows:
   version: 2
diff --git a/Bonk/AABB.cs b/Bonk/AABB.cs
index 1fccacf..bc2d1de 100644
--- a/Bonk/AABB.cs
+++ b/Bonk/AABB.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// Axis-aligned bounding box.
diff --git a/Bonk/Bonk.csproj b/Bonk/Bonk.csproj
index 7fbe0b2..163906f 100644
--- a/Bonk/Bonk.csproj
+++ b/Bonk/Bonk.csproj
@@ -3,16 +3,16 @@
     <Version>6.0.0</Version>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>.NET Core High Performance Collision Detection</Description>
-    <PackageId>MoonTools.Core.Bonk</PackageId>
-    <RootNamespace>MoonTools.Core.Bonk</RootNamespace>
+    <PackageId>MoonTools.Bonk</PackageId>
+    <RootNamespace>MoonTools.Bonk</RootNamespace>
     <Company>Moonside Games</Company>
     <Authors>Evan Hemsley</Authors>
     <Copyright>Evan Hemsley 2019</Copyright>
-    <Product>MoonTools.Core.Bonk</Product>
+    <Product>MoonTools.Bonk</Product>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyName>MoonTools.Core.Bonk</AssemblyName>
+    <AssemblyName>MoonTools.Bonk</AssemblyName>
     <PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/MoonsideGames/MoonTools.Core.Bonk</PackageProjectUrl>
+    <PackageProjectUrl>https://gitea.moonside.games/MoonsideGames/MoonTools.Bonk</PackageProjectUrl>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -20,9 +20,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MoonTools.Core.Structs" Version="3.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.7.0"/>
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0"/>
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0"/>
+    <PackageReference Include="MoonTools.Structs" Version="3.0.1"/>
   </ItemGroup>
 </Project>
diff --git a/Bonk/BroadPhase/SpatialHash.cs b/Bonk/BroadPhase/SpatialHash.cs
index 72dc32c..fc6d7f7 100644
--- a/Bonk/BroadPhase/SpatialHash.cs
+++ b/Bonk/BroadPhase/SpatialHash.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// Used to quickly check if two shapes are potentially overlapping.
diff --git a/Bonk/IShape2D.cs b/Bonk/IShape2D.cs
index 05d7616..df8da4f 100644
--- a/Bonk/IShape2D.cs
+++ b/Bonk/IShape2D.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     public interface IShape2D : IEquatable<IShape2D>
     {
diff --git a/Bonk/MinkowskiDifference.cs b/Bonk/MinkowskiDifference.cs
index 89d7c0d..4dea095 100644
--- a/Bonk/MinkowskiDifference.cs
+++ b/Bonk/MinkowskiDifference.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// A Minkowski difference between two shapes.
@@ -56,4 +56,4 @@ namespace MoonTools.Core.Bonk
             return !(a == b);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Bonk/NarrowPhase/Edge.cs b/Bonk/NarrowPhase/Edge.cs
index 902a30a..faf9704 100644
--- a/Bonk/NarrowPhase/Edge.cs
+++ b/Bonk/NarrowPhase/Edge.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     internal struct Edge
     {
diff --git a/Bonk/NarrowPhase/NarrowPhase.cs b/Bonk/NarrowPhase/NarrowPhase.cs
index 337e7ce..8609947 100644
--- a/Bonk/NarrowPhase/NarrowPhase.cs
+++ b/Bonk/NarrowPhase/NarrowPhase.cs
@@ -1,7 +1,7 @@
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 using System.Numerics;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     public static class NarrowPhase
     {
diff --git a/Bonk/NarrowPhase/SimplexVertexBuffer.cs b/Bonk/NarrowPhase/SimplexVertexBuffer.cs
index ce2dd2f..c4ade0c 100644
--- a/Bonk/NarrowPhase/SimplexVertexBuffer.cs
+++ b/Bonk/NarrowPhase/SimplexVertexBuffer.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     internal unsafe struct SimplexVertexBuffer
     {
diff --git a/Bonk/Shapes/Circle.cs b/Bonk/Shapes/Circle.cs
index 34aa9e2..cb6a3f2 100644
--- a/Bonk/Shapes/Circle.cs
+++ b/Bonk/Shapes/Circle.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// A Circle is a shape defined by a radius.
diff --git a/Bonk/Shapes/Line.cs b/Bonk/Shapes/Line.cs
index 7deb40c..7ac0d55 100644
--- a/Bonk/Shapes/Line.cs
+++ b/Bonk/Shapes/Line.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// A line is a shape defined by exactly two points in space.
diff --git a/Bonk/Shapes/Point.cs b/Bonk/Shapes/Point.cs
index 4aaed68..a70bc6a 100644
--- a/Bonk/Shapes/Point.cs
+++ b/Bonk/Shapes/Point.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     public struct Point : IShape2D, IEquatable<Point>
     {
diff --git a/Bonk/Shapes/Polygon.cs b/Bonk/Shapes/Polygon.cs
index 90dc44c..684f778 100644
--- a/Bonk/Shapes/Polygon.cs
+++ b/Bonk/Shapes/Polygon.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// A Shape defined by an arbitrary collection of vertices.
diff --git a/Bonk/Shapes/Rectangle.cs b/Bonk/Shapes/Rectangle.cs
index fc6db8e..c78c40b 100644
--- a/Bonk/Shapes/Rectangle.cs
+++ b/Bonk/Shapes/Rectangle.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// A rectangle is a shape defined by a minimum and maximum X value and a minimum and maximum Y value.
diff --git a/Bonk/Shapes/RectanglePolygonComparison.cs b/Bonk/Shapes/RectanglePolygonComparison.cs
index 36821d7..449845a 100644
--- a/Bonk/Shapes/RectanglePolygonComparison.cs
+++ b/Bonk/Shapes/RectanglePolygonComparison.cs
@@ -1,6 +1,6 @@
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     internal static class RectanglePolygonComparison
     {
diff --git a/Bonk/Simplex.cs b/Bonk/Simplex.cs
index 60a62fd..fd9ec17 100644
--- a/Bonk/Simplex.cs
+++ b/Bonk/Simplex.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Numerics;
-using MoonTools.Core.Structs;
+using MoonTools.Structs;
 using System;
 
-namespace MoonTools.Core.Bonk
+namespace MoonTools.Bonk
 {
     /// <summary>
     /// A simplex is a shape with up to n - 2 vertices in the nth dimension.
diff --git a/Bonk/Vector2Extensions.cs b/Bonk/Vector2Extensions.cs
index 319ac07..8321c23 100644
--- a/Bonk/Vector2Extensions.cs
+++ b/Bonk/Vector2Extensions.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace MoonTools.Core.Bonk.Extensions
+namespace MoonTools.Bonk.Extensions
 {
     internal static class Vector2Extensions
     {
@@ -15,4 +15,4 @@ namespace MoonTools.Core.Bonk.Extensions
             return a.Cross(b) > 0 ? Vector2.Normalize(new Vector2(ab.Y, ab.X)) : Vector2.Normalize(new Vector2(ab.Y, -ab.X));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/README.md b/README.md
index 0e9b5d9..05e427e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# MoonTools.Core.Bonk
+# MoonTools.Bonk
 
-[![NuGet Badge](https://buildstats.info/nuget/MoonTools.Core.Bonk)](https://www.nuget.org/packages/MoonTools.Core.Bonk/)
-[![CircleCI](https://circleci.com/gh/MoonsideGames/MoonTools.Core.Bonk.svg?style=svg)](https://circleci.com/gh/MoonsideGames/MoonTools.Core.Bonk)
+[![NuGet Badge](https://buildstats.info/nuget/MoonTools.Bonk)](https://www.nuget.org/packages/MoonTools.Bonk/)
+[![CircleCI](https://circleci.com/gh/MoonsideGames/MoonTools.Bonk.svg?style=svg)](https://circleci.com/gh/MoonsideGames/MoonTools.Bonk)
 
 Bonk is a fast and modular collision detection system for .NET that is part of the MoonTools suite. It can be used with any .NET-based game engine.
 
diff --git a/Test/AABBTest.cs b/Test/AABBTest.cs
index be842f3..345f694 100644
--- a/Test/AABBTest.cs
+++ b/Test/AABBTest.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 using FluentAssertions;
-using MoonTools.Core.Bonk;
+using MoonTools.Bonk;
 using System.Numerics;
 
 namespace Tests
diff --git a/Test/EPA2DTest.cs b/Test/EPA2DTest.cs
index 6ffc348..38751c3 100644
--- a/Test/EPA2DTest.cs
+++ b/Test/EPA2DTest.cs
@@ -3,8 +3,8 @@ using FluentAssertions;
 
 using System;
 using System.Numerics;
-using MoonTools.Core.Structs;
-using MoonTools.Core.Bonk;
+using MoonTools.Structs;
+using MoonTools.Bonk;
 
 namespace Tests
 {
@@ -13,9 +13,9 @@ namespace Tests
         [Test]
         public void RectangleOverlap()
         {
-            var squareA = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var squareA = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformA = Transform2D.DefaultTransform;
-            var squareB = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var squareB = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = new Transform2D(new Vector2(1.5f, 0));
 
             var (result, simplex) = NarrowPhase.FindCollisionSimplex(squareA, transformA, squareB, transformB);
@@ -27,7 +27,7 @@ namespace Tests
             intersection.X.Should().Be(1f);
             intersection.Y.Should().Be(0);
 
-            var movedTransform = new Transform2D(transformA.Position - (intersection * 1.01f)); // move a tiny bit past
+            var movedTransform = new Transform2D(transformA.Position - (intersection * 2)); // move past
 
             NarrowPhase.TestCollision(squareA, movedTransform, squareB, transformB).Should().BeFalse();
         }
@@ -52,7 +52,7 @@ namespace Tests
             intersection.X.Should().BeApproximately(ix, 0.01f);
             intersection.Y.Should().BeApproximately(iy, 0.01f);
 
-            var movedTransform = new Transform2D(transformA.Position - (intersection * 1.01f)); // move a tiny bit past
+            var movedTransform = new Transform2D(transformA.Position - (intersection * 2)); // move past
 
             NarrowPhase.TestCollision(circleA, movedTransform, circleB, transformB).Should().BeFalse();
         }
@@ -62,7 +62,7 @@ namespace Tests
         {
             var line = new Line(new Position2D(-4, -4), new Position2D(4, 4));
             var transformA = Transform2D.DefaultTransform;
-            var square = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var square = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = Transform2D.DefaultTransform;
 
             var (result, simplex) = NarrowPhase.FindCollisionSimplex(line, transformA, square, transformB);
@@ -71,7 +71,10 @@ namespace Tests
 
             var intersection = NarrowPhase.Intersect(line, transformA, square, transformB, simplex);
 
-            var movedTransform = new Transform2D(transformA.Position - (intersection * 1.01f)); // move a tiny bit past
+            intersection.X.Should().Be(1);
+            intersection.Y.Should().Be(-1);
+
+            var movedTransform = new Transform2D(transformA.Position - (intersection * 2)); // move past
 
             NarrowPhase.TestCollision(line, movedTransform, square, transformB).Should().BeFalse();
         }
diff --git a/Test/Equality.cs b/Test/Equality.cs
index d441c83..ac57b4f 100644
--- a/Test/Equality.cs
+++ b/Test/Equality.cs
@@ -1,8 +1,8 @@
 using NUnit.Framework;
 using FluentAssertions;
 
-using MoonTools.Core.Bonk;
-using MoonTools.Core.Structs;
+using MoonTools.Bonk;
+using MoonTools.Structs;
 using System.Numerics;
 using System.Collections.Immutable;
 
diff --git a/Test/GJK2DTest.cs b/Test/GJK2DTest.cs
index 540d08b..ab1d84f 100644
--- a/Test/GJK2DTest.cs
+++ b/Test/GJK2DTest.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
-using MoonTools.Core.Bonk;
-using MoonTools.Core.Structs;
+using MoonTools.Bonk;
+using MoonTools.Structs;
 using System.Numerics;
 using FluentAssertions;
 using System.Collections.Immutable;
@@ -354,10 +354,10 @@ namespace Tests
         [Test]
         public void RectanglesNotOverlapping()
         {
-            var rectangleA = new MoonTools.Core.Bonk.Rectangle(-6, -6, 6, 6);
+            var rectangleA = new MoonTools.Bonk.Rectangle(-6, -6, 6, 6);
             var transformA = new Transform2D(new Position2D(39, 249));
 
-            var rectangleB = new MoonTools.Core.Bonk.Rectangle(0, 0, 16, 16);
+            var rectangleB = new MoonTools.Bonk.Rectangle(0, 0, 16, 16);
             var transformB = new Transform2D(new Position2D(16, 240));
 
             NarrowPhase.TestCollision(rectangleA, transformA, rectangleB, transformB).Should().BeFalse();
@@ -366,10 +366,10 @@ namespace Tests
         [Test]
         public void RotatedRectanglesOverlapping()
         {
-            var rectangleA = new MoonTools.Core.Bonk.Rectangle(-1, -1, 2, 2);
+            var rectangleA = new MoonTools.Bonk.Rectangle(-1, -1, 2, 2);
             var transformA = new Transform2D(new Vector2(-1, 0), -90f);
 
-            var rectangleB = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleB = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = new Transform2D(new Vector2(1, 0));
 
             NarrowPhase.TestCollision(rectangleA, transformA, rectangleB, transformB).Should().BeTrue();
@@ -378,10 +378,10 @@ namespace Tests
         [Test]
         public void RectanglesTouchingGJK2D()
         {
-            var rectangleA = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleA = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformA = new Transform2D(new Position2D(-1, 0));
 
-            var rectangleB = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleB = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = new Transform2D(new Vector2(1, 0));
 
             NarrowPhase.TestCollision(rectangleA, transformA, rectangleB, transformB).Should().BeTrue();
@@ -390,10 +390,10 @@ namespace Tests
         [Test]
         public void RectanglesOverlappingGJK2D()
         {
-            var rectangleA = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleA = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformA = new Transform2D(new Position2D(0, 0));
 
-            var rectangleB = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleB = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = new Transform2D(new Vector2(1, 0));
 
             NarrowPhase.TestCollision(rectangleA, transformA, rectangleB, transformB).Should().BeTrue();
@@ -402,10 +402,10 @@ namespace Tests
         [Test]
         public void RectanglesTouchingOverlap()
         {
-            var rectangleA = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleA = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformA = new Transform2D(new Position2D(-1, 0));
 
-            var rectangleB = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleB = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = new Transform2D(new Vector2(1, 0));
 
             NarrowPhase.TestRectangleOverlap(rectangleA, transformA, rectangleB, transformB).Should().BeTrue();
@@ -414,10 +414,10 @@ namespace Tests
         [Test]
         public void RectanglesOverlappingOverlap()
         {
-            var rectangleA = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleA = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformA = new Transform2D(new Position2D(0, 0));
 
-            var rectangleB = new MoonTools.Core.Bonk.Rectangle(-1, -1, 1, 1);
+            var rectangleB = new MoonTools.Bonk.Rectangle(-1, -1, 1, 1);
             var transformB = new Transform2D(new Vector2(1, 0));
 
             NarrowPhase.TestRectangleOverlap(rectangleA, transformA, rectangleB, transformB).Should().BeTrue();
diff --git a/Test/SpatialHashTest.cs b/Test/SpatialHashTest.cs
index 2d4b153..83ce7b9 100644
--- a/Test/SpatialHashTest.cs
+++ b/Test/SpatialHashTest.cs
@@ -1,7 +1,7 @@
 using FluentAssertions;
 using NUnit.Framework;
-using MoonTools.Core.Structs;
-using MoonTools.Core.Bonk;
+using MoonTools.Structs;
+using MoonTools.Bonk;
 using System.Numerics;
 
 namespace Tests