diff --git a/Bonk/SpatialHash.cs b/Bonk/BroadPhase/SpatialHash.cs
similarity index 100%
rename from Bonk/SpatialHash.cs
rename to Bonk/BroadPhase/SpatialHash.cs
diff --git a/Bonk/EPA2D.cs b/Bonk/NarrowPhase/EPA2D.cs
similarity index 100%
rename from Bonk/EPA2D.cs
rename to Bonk/NarrowPhase/EPA2D.cs
diff --git a/Bonk/Edge.cs b/Bonk/NarrowPhase/Edge.cs
similarity index 100%
rename from Bonk/Edge.cs
rename to Bonk/NarrowPhase/Edge.cs
diff --git a/Bonk/GJK2D.cs b/Bonk/NarrowPhase/GJK2D.cs
similarity index 100%
rename from Bonk/GJK2D.cs
rename to Bonk/NarrowPhase/GJK2D.cs
diff --git a/Bonk/SimplexVertices.cs b/Bonk/NarrowPhase/SimplexVertices.cs
similarity index 100%
rename from Bonk/SimplexVertices.cs
rename to Bonk/NarrowPhase/SimplexVertices.cs
diff --git a/Bonk/Circle.cs b/Bonk/Shapes/Circle.cs
similarity index 100%
rename from Bonk/Circle.cs
rename to Bonk/Shapes/Circle.cs
diff --git a/Bonk/Line.cs b/Bonk/Shapes/Line.cs
similarity index 100%
rename from Bonk/Line.cs
rename to Bonk/Shapes/Line.cs
diff --git a/Bonk/Polygon.cs b/Bonk/Shapes/Polygon.cs
similarity index 100%
rename from Bonk/Polygon.cs
rename to Bonk/Shapes/Polygon.cs
diff --git a/Bonk/Rectangle.cs b/Bonk/Shapes/Rectangle.cs
similarity index 100%
rename from Bonk/Rectangle.cs
rename to Bonk/Shapes/Rectangle.cs