diff --git a/OSCADSharp/OSCADSharp.UnitTests/DifferenceTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/DifferenceTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/IntersectionTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/IntersectionTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/UnionTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/UnionTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADSharp.UnitTests.csproj b/OSCADSharp/OSCADSharp.UnitTests/OSCADSharp.UnitTests.csproj
index f66616f..e721e83 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/OSCADSharp.UnitTests.csproj
+++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADSharp.UnitTests.csproj
@@ -52,19 +52,19 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Compile Include="CubeTests.cs" />
-    <Compile Include="CylinderTests.cs" />
-    <Compile Include="HullTests.cs" />
+    <Compile Include="Solids\CubeTests.cs" />
+    <Compile Include="Solids\CylinderTests.cs" />
+    <Compile Include="Transforms\HullTests.cs" />
     <Compile Include="InterpolationTests.cs" />
-    <Compile Include="MirrorTests.cs" />
+    <Compile Include="Transforms\MirrorTests.cs" />
     <Compile Include="OSCADObjectTests.cs" />
-    <Compile Include="SphereTests.cs" />
+    <Compile Include="Solids\SphereTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Text3DTests.cs" />
-    <Compile Include="UnionTests.cs" />
-    <Compile Include="DifferenceTests.cs" />
-    <Compile Include="IntersectionTests.cs" />
-    <Compile Include="MinkowskiTests.cs" />
+    <Compile Include="Solids\Text3DTests.cs" />
+    <Compile Include="Booleans\UnionTests.cs" />
+    <Compile Include="Booleans\DifferenceTests.cs" />
+    <Compile Include="Booleans\IntersectionTests.cs" />
+    <Compile Include="Transforms\MinkowskiTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OSCADSharp\OSCADSharp.csproj">
diff --git a/OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/CylinderTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/CylinderTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Text3DTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/Text3DTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/HullTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/HullTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/MinkowskiTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/MinkowskiTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs
diff --git a/OSCADSharp/OSCADSharp.UnitTests/MirrorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp.UnitTests/MirrorTests.cs
rename to OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs