diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
index 0003c9a..cd114d8 100644
--- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
+++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
@@ -1,5 +1,6 @@
 
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs
index e4e57b1..0606a2a 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs
@@ -2,6 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Linq;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs
index 8ff8f4e..07a562b 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Solids;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs
index 1232fdd..048767d 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Solids;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs b/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs
index 799cb74..ee4ad56 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
index f0fc119..9daa402 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
@@ -2,6 +2,7 @@
 using Moq;
 using OSCADSharp.DataBinding;
 using OSCADSharp.IO;
+using OSCADSharp.Solids;
 using OSCADSharp.Utility;
 using System;
 using System.Collections.Concurrent;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
index 997dcb1..18ec9f7 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
@@ -2,6 +2,7 @@
 using Moq;
 using OSCADSharp.DataBinding;
 using OSCADSharp.IO;
+using OSCADSharp.Solids;
 using OSCADSharp.Utility;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
index 5ae45dc..665fc6a 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
@@ -5,6 +5,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.Utility;
 using OSCADSharp.Spatial;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
index f47a478..2eb2080 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 using System;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
index bf58ee8..7052be5 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
@@ -3,6 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.Utility;
 using OSCADSharp.Spatial;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
index cc78cd4..2a19471 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
index a3dfaf0..e015445 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs
index ec3df58..174698e 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Solids;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs
index 52bf6d0..072e840 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Solids;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
index 4222762..a743bd7 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
index bde1257..d0e52fb 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
index 35fbed0..033a674 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
index f634203..c1400fe 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
index e52b7c5..f5c458c 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.DataBinding;
+using OSCADSharp.Solids;
 using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 using System;
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index 7563a44..3e18185 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -71,10 +71,10 @@
     <Compile Include="Union.cs" />
     <Compile Include="OSCADObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Cube.cs" />
-    <Compile Include="Cylinder.cs" />
-    <Compile Include="Sphere.cs" />
-    <Compile Include="Text3D.cs" />
+    <Compile Include="Solids\Cube.cs" />
+    <Compile Include="Solids\Cylinder.cs" />
+    <Compile Include="Solids\Sphere.cs" />
+    <Compile Include="Solids\Text3D.cs" />
     <Compile Include="ColoredObject.cs" />
     <Compile Include="MinkowskiedObject.cs" />
     <Compile Include="MirroredObject.cs" />
diff --git a/OSCADSharp/OSCADSharp/Cube.cs b/OSCADSharp/OSCADSharp/Solids/Cube.cs
similarity index 99%
rename from OSCADSharp/OSCADSharp/Cube.cs
rename to OSCADSharp/OSCADSharp/Solids/Cube.cs
index 6314b30..68cde3f 100644
--- a/OSCADSharp/OSCADSharp/Cube.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Cube.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Solids
 {
     /// <summary>
     /// A Cube geometry
diff --git a/OSCADSharp/OSCADSharp/Cylinder.cs b/OSCADSharp/OSCADSharp/Solids/Cylinder.cs
similarity index 99%
rename from OSCADSharp/OSCADSharp/Cylinder.cs
rename to OSCADSharp/OSCADSharp/Solids/Cylinder.cs
index f93ca3f..4cfd65a 100644
--- a/OSCADSharp/OSCADSharp/Cylinder.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Cylinder.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Solids
 {
     /// <summary>
     /// A Cylinder geometry
diff --git a/OSCADSharp/OSCADSharp/Sphere.cs b/OSCADSharp/OSCADSharp/Solids/Sphere.cs
similarity index 99%
rename from OSCADSharp/OSCADSharp/Sphere.cs
rename to OSCADSharp/OSCADSharp/Solids/Sphere.cs
index bf711c3..f95e98c 100644
--- a/OSCADSharp/OSCADSharp/Sphere.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Sphere.cs
@@ -9,7 +9,7 @@ using OSCADSharp.Spatial;
 using OSCADSharp.DataBinding;
 using OSCADSharp.Utility;
 
-namespace OSCADSharp
+namespace OSCADSharp.Solids
 {
     /// <summary>
     /// A Sphere geometry
diff --git a/OSCADSharp/OSCADSharp/Text3D.cs b/OSCADSharp/OSCADSharp/Solids/Text3D.cs
similarity index 99%
rename from OSCADSharp/OSCADSharp/Text3D.cs
rename to OSCADSharp/OSCADSharp/Solids/Text3D.cs
index c0cac4d..21ee99c 100644
--- a/OSCADSharp/OSCADSharp/Text3D.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Text3D.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Solids
 {
     /// <summary>
     /// Create text using fonts installed on the local system or provided as separate font file.