diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
index 45d990b..3a3ec27 100644
--- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
+++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
@@ -1,4 +1,5 @@
 
+using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 
 namespace OSCADSharp.ConsoleTests
diff --git a/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs b/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs
index 35c75b2..799cb74 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
index 07ddbf5..57df87e 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
@@ -3,6 +3,7 @@ using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.Utility;
+using OSCADSharp.Spatial;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
index 173127b..53025b6 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
index 28c539d..a03fa34 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSCADSharp.Utility;
+using OSCADSharp.Spatial;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
index bfa1ab2..56c187a 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
index 5aa9053..7798ece 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
index fb2c572..ec6f2d2 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
index 5ff2565..4219246 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
index dcd435b..f2be633 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
index d9a7967..70f1dda 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp/BindableVector.cs b/OSCADSharp/OSCADSharp/BindableVector.cs
index c428da3..767d1df 100644
--- a/OSCADSharp/OSCADSharp/BindableVector.cs
+++ b/OSCADSharp/OSCADSharp/BindableVector.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/ColoredObject.cs b/OSCADSharp/OSCADSharp/ColoredObject.cs
index 73888cb..7c8e1e0 100644
--- a/OSCADSharp/OSCADSharp/ColoredObject.cs
+++ b/OSCADSharp/OSCADSharp/ColoredObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Cube.cs b/OSCADSharp/OSCADSharp/Cube.cs
index d724857..c98a08f 100644
--- a/OSCADSharp/OSCADSharp/Cube.cs
+++ b/OSCADSharp/OSCADSharp/Cube.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Cylinder.cs b/OSCADSharp/OSCADSharp/Cylinder.cs
index d959def..d0e7a9d 100644
--- a/OSCADSharp/OSCADSharp/Cylinder.cs
+++ b/OSCADSharp/OSCADSharp/Cylinder.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Difference.cs b/OSCADSharp/OSCADSharp/Difference.cs
index a7a2d89..8542ab7 100644
--- a/OSCADSharp/OSCADSharp/Difference.cs
+++ b/OSCADSharp/OSCADSharp/Difference.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/IO/OutputSettings.cs b/OSCADSharp/OSCADSharp/IO/OutputSettings.cs
index 9b01eda..0e837bb 100644
--- a/OSCADSharp/OSCADSharp/IO/OutputSettings.cs
+++ b/OSCADSharp/OSCADSharp/IO/OutputSettings.cs
@@ -16,7 +16,7 @@ namespace OSCADSharp.IO
         /// <summary>
         /// Code-gen header
         /// </summary>
-        internal static readonly string OSCADSharpHeader = String.Format("/*Code Generated using OSCADSharp on {0}. {1}{2}For more information, please visit https://github.com/Exolun/OSCADSharp */{3}", 
+        public static string OSCADSharpHeader { get; private set; } = String.Format("/*Code Generated using OSCADSharp on {0}. {1}{2}For more information, please visit https://github.com/Exolun/OSCADSharp */{3}",
             DateTime.Now.ToString(), Environment.NewLine, Environment.NewLine, Environment.NewLine);
 
         /// <summary>
diff --git a/OSCADSharp/OSCADSharp/Intersection.cs b/OSCADSharp/OSCADSharp/Intersection.cs
index 2001f79..daad434 100644
--- a/OSCADSharp/OSCADSharp/Intersection.cs
+++ b/OSCADSharp/OSCADSharp/Intersection.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/MinkowskiedObject.cs b/OSCADSharp/OSCADSharp/MinkowskiedObject.cs
index 3816ed6..61d13cb 100644
--- a/OSCADSharp/OSCADSharp/MinkowskiedObject.cs
+++ b/OSCADSharp/OSCADSharp/MinkowskiedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/MirroredObject.cs b/OSCADSharp/OSCADSharp/MirroredObject.cs
index 1f34a7c..a85117a 100644
--- a/OSCADSharp/OSCADSharp/MirroredObject.cs
+++ b/OSCADSharp/OSCADSharp/MirroredObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/MultiStatementObject.cs b/OSCADSharp/OSCADSharp/MultiStatementObject.cs
index b540ec9..68ca83c 100644
--- a/OSCADSharp/OSCADSharp/MultiStatementObject.cs
+++ b/OSCADSharp/OSCADSharp/MultiStatementObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/OSCADObject.cs b/OSCADSharp/OSCADSharp/OSCADObject.cs
index b94adb8..4de6931 100644
--- a/OSCADSharp/OSCADSharp/OSCADObject.cs
+++ b/OSCADSharp/OSCADSharp/OSCADObject.cs
@@ -1,4 +1,5 @@
 using OSCADSharp.IO;
+using OSCADSharp.Spatial;
 using OSCADSharp.Utility;
 using System;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index c3c3cee..426c29b 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -61,8 +61,8 @@
     <Compile Include="IO\OutputSettings.cs" />
     <Compile Include="Utility\Inches.cs" />
     <Compile Include="BindableVector.cs" />
-    <Compile Include="Bounds.cs" />
-    <Compile Include="Matrix.cs" />
+    <Compile Include="Spatial\Bounds.cs" />
+    <Compile Include="Spatial\Matrix.cs" />
     <Compile Include="HulledObject.cs" />
     <Compile Include="SingleBlockFormatter.cs" />
     <Compile Include="MultiStatementObject.cs" />
@@ -82,7 +82,7 @@
     <Compile Include="RotatedObject.cs" />
     <Compile Include="ScaledObject.cs" />
     <Compile Include="TranslatedObject.cs" />
-    <Compile Include="Vector3.cs" />
+    <Compile Include="Spatial\Vector3.cs" />
     <Compile Include="Variables.cs" />
   </ItemGroup>
   <ItemGroup />
diff --git a/OSCADSharp/OSCADSharp/ResizedObject.cs b/OSCADSharp/OSCADSharp/ResizedObject.cs
index 501fcc5..7f95b4c 100644
--- a/OSCADSharp/OSCADSharp/ResizedObject.cs
+++ b/OSCADSharp/OSCADSharp/ResizedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 
 namespace OSCADSharp
diff --git a/OSCADSharp/OSCADSharp/RotatedObject.cs b/OSCADSharp/OSCADSharp/RotatedObject.cs
index 22855fd..5927e36 100644
--- a/OSCADSharp/OSCADSharp/RotatedObject.cs
+++ b/OSCADSharp/OSCADSharp/RotatedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/ScaledObject.cs b/OSCADSharp/OSCADSharp/ScaledObject.cs
index a18312e..6efe8d0 100644
--- a/OSCADSharp/OSCADSharp/ScaledObject.cs
+++ b/OSCADSharp/OSCADSharp/ScaledObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 
 namespace OSCADSharp
diff --git a/OSCADSharp/OSCADSharp/Bounds.cs b/OSCADSharp/OSCADSharp/Spatial/Bounds.cs
similarity index 97%
rename from OSCADSharp/OSCADSharp/Bounds.cs
rename to OSCADSharp/OSCADSharp/Spatial/Bounds.cs
index 18c4b0a..af32106 100644
--- a/OSCADSharp/OSCADSharp/Bounds.cs
+++ b/OSCADSharp/OSCADSharp/Spatial/Bounds.cs
@@ -1,10 +1,11 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Spatial
 {
     /// <summary>
     /// A set of boundaries
diff --git a/OSCADSharp/OSCADSharp/Matrix.cs b/OSCADSharp/OSCADSharp/Spatial/Matrix.cs
similarity index 98%
rename from OSCADSharp/OSCADSharp/Matrix.cs
rename to OSCADSharp/OSCADSharp/Spatial/Matrix.cs
index d152869..a05c558 100644
--- a/OSCADSharp/OSCADSharp/Matrix.cs
+++ b/OSCADSharp/OSCADSharp/Spatial/Matrix.cs
@@ -1,10 +1,11 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Spatial
 {
     /// <summary>
     /// A Matrix for performing operations on doubles that
diff --git a/OSCADSharp/OSCADSharp/Vector3.cs b/OSCADSharp/OSCADSharp/Spatial/Vector3.cs
similarity index 99%
rename from OSCADSharp/OSCADSharp/Vector3.cs
rename to OSCADSharp/OSCADSharp/Spatial/Vector3.cs
index b0f5dca..f5fbba8 100644
--- a/OSCADSharp/OSCADSharp/Vector3.cs
+++ b/OSCADSharp/OSCADSharp/Spatial/Vector3.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Spatial
 {
     /// <summary>
     /// A Three-Dimensional vector
diff --git a/OSCADSharp/OSCADSharp/Sphere.cs b/OSCADSharp/OSCADSharp/Sphere.cs
index 9eb5745..1ea8300 100644
--- a/OSCADSharp/OSCADSharp/Sphere.cs
+++ b/OSCADSharp/OSCADSharp/Sphere.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Concurrent;
 using System.Reflection;
+using OSCADSharp.Spatial;
 
 namespace OSCADSharp
 {
diff --git a/OSCADSharp/OSCADSharp/Text3D.cs b/OSCADSharp/OSCADSharp/Text3D.cs
index b36347c..9e4ce72 100644
--- a/OSCADSharp/OSCADSharp/Text3D.cs
+++ b/OSCADSharp/OSCADSharp/Text3D.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/TranslatedObject.cs b/OSCADSharp/OSCADSharp/TranslatedObject.cs
index bb7229f..7da36dd 100644
--- a/OSCADSharp/OSCADSharp/TranslatedObject.cs
+++ b/OSCADSharp/OSCADSharp/TranslatedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 
 namespace OSCADSharp
diff --git a/OSCADSharp/OSCADSharp/Variable.cs b/OSCADSharp/OSCADSharp/Variable.cs
index ed3f92c..adc2b68 100644
--- a/OSCADSharp/OSCADSharp/Variable.cs
+++ b/OSCADSharp/OSCADSharp/Variable.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/VariableCalculator.cs b/OSCADSharp/OSCADSharp/VariableCalculator.cs
index 445dfea..3e8cafe 100644
--- a/OSCADSharp/OSCADSharp/VariableCalculator.cs
+++ b/OSCADSharp/OSCADSharp/VariableCalculator.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Spatial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;