diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
index 7e25215..cde920d 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
@@ -1,7 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
index 90242b8..75b5dc9 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
@@ -1,7 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
 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 ad676e4..3e5d67a 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
@@ -2,7 +2,6 @@
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
index 97bf045..9a1a2bf 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
index a124228..c0e213d 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
@@ -1,6 +1,5 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 
 namespace OSCADSharp.UnitTests
 {
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
index a767056..bfa1ab2 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
index 64a080b..8e68042 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 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 ed7b113..5aa9053 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 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 9c8f656..fb2c572 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 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 e56b314..5ff2565 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 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 3129615..dcd435b 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 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 be8b334..fc24c3b 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs
index 0a3451f..9c25dc1 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs
@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Scripting;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class BindableBoolean : IBindable
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs
index 3ff6274..b0fbf8e 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs
@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Scripting;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class BindableVector : Vector3, IBindable
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs
index 64505a3..5ff243b 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs
@@ -1,11 +1,10 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class Binding
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs
index e726fc4..107af8c 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs
@@ -1,12 +1,11 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class Bindings
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs
index 4379f56..b7b4037 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs
@@ -1,5 +1,4 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs
index 66e2b34..b3598bd 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal interface IBindings
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs
index e95f677..dfe0bf9 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs
@@ -1,11 +1,10 @@
-using OSCADSharp.Bindings;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings.Solids
+namespace OSCADSharp
 {
     internal class CubeBindings : ICloneable<CubeBindings>, IBindings
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs
index c71fc25..fd0de53 100644
--- a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings.Solids
+namespace OSCADSharp
 {
     internal class SphereBindings : ICloneable<SphereBindings>, IBindings
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs b/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs
index 7a7feb9..a913c6d 100644
--- a/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs
@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Booleans
+namespace OSCADSharp
 {
     /// <summary>
     /// Subtracts the 2nd (and all further) child nodes from the first one (logical and not).    
diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs b/OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs
index 596a57e..3104686 100644
--- a/OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs
@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Booleans
+namespace OSCADSharp
 {
     /// <summary>
     /// Creates the intersection of all child nodes
diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs b/OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs
index 432e1ef..9f5682e 100644
--- a/OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs
@@ -1,11 +1,10 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Booleans
+namespace OSCADSharp
 {
     /// <summary>
     /// A union of child nodes. This is the sum of all children (logical or).    
diff --git a/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs b/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs
index 89b74f9..b909cad 100644
--- a/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Files
+namespace OSCADSharp
 {
     internal class DefaultFileInvoker : IFileInvoker
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs b/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs
index 82fdfb1..c3281e7 100644
--- a/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Files
+namespace OSCADSharp
 {
     internal class DefaultFileWriter : IFileWriter
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs
index fa1b9ea..90e5051 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     internal class CompoundVariable : Variable
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs
index 7f88f23..745a71b 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs
@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
 
     /// <summary>
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs
index 3b7b512..f9590bd 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     /// <summary>
     /// A class that creates blocks of curly-braced script with the
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs
index ad30701..0e41bae 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs
@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     /// <summary>
     /// A statement with just one nested child node
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs
index eb6f1b2..115bb61 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs
@@ -1,12 +1,10 @@
-using OSCADSharp.Bindings;
-using OSCADSharp.Bindings.Solids;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting.Solids
+namespace OSCADSharp
 {
     internal class CubeScriptBuilder
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs
index b4b8354..9d47206 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs
@@ -1,11 +1,10 @@
-using OSCADSharp.Bindings;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting.Solids
+namespace OSCADSharp
 {
     internal class SphereScriptBuilder
     {
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs
index c5d980a..da20ff7 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs
@@ -1,11 +1,10 @@
-using OSCADSharp.Bindings;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     /// <summary>
     /// Extends the capabilities of StringBuilder with domain-specific behavior
@@ -14,10 +13,10 @@ namespace OSCADSharp.Scripting
     internal class StatementBuilder
     {
         private StringBuilder SB { get; set; } = new StringBuilder();
-        private Bindings.Bindings bindings = null;
+        private Bindings bindings = null;
         private IBindings ibindings = null;
 
-        internal StatementBuilder(Bindings.Bindings bindings)
+        internal StatementBuilder(Bindings bindings)
         {
             this.bindings = bindings;
         }
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs
index 31ebd10..445dfea 100644
--- a/OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs
@@ -1,5 +1,4 @@
-using OSCADSharp.Bindings;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
diff --git a/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs b/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs
index 97c449f..61d558e 100644
--- a/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Spatial
+namespace OSCADSharp
 {
     /// <summary>
     /// A Matrix for performing operations on doubles that
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs
index 82e0807..73888cb 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs
@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that has color and/or opacity applied to it
@@ -73,7 +71,7 @@ namespace OSCADSharp.Transforms
             return this.obj.Bounds();
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             {"color", "color" },
             {"opacity", "opacity" }
         });
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs
index d7dd4a6..a3f69c6 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs
@@ -1,11 +1,10 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// Creates an object that's the convex hull of child objects
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs
index bdc7b3d..c5a2896 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs
@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// Creates an object that's the minkowski sum of child objects
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs
index 21954c2..1f34a7c 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs
@@ -1,13 +1,10 @@
-using OSCADSharp.Bindings;
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that's mirrored on a plane
@@ -106,7 +103,7 @@ namespace OSCADSharp.Transforms
             return new Bounds(newBottomLeft, newTopRight);
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             {"normal", "normal"}
         });
         public override void Bind(string property, Variable variable)
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs
index 1d68128..501fcc5 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs
@@ -1,13 +1,7 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that's been resized to a specified set of X/Y/Z dimensions
@@ -87,7 +81,7 @@ namespace OSCADSharp.Transforms
         }
 
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "size", "size" }
         });
         public override void Bind(string property, Variable variable)
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs
index 5586d82..22855fd 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs
@@ -1,13 +1,10 @@
-using OSCADSharp.Bindings;
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object with rotation applied
@@ -73,7 +70,7 @@ namespace OSCADSharp.Transforms
                               Matrix.GetRotatedPoint(oldBounds.TopRight, this.Angle.X, this.Angle.Y, this.Angle.Z));
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "angle", "angle" }
         });
         public override void Bind(string property, Variable variable)
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs
index 27e283a..a18312e 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs
@@ -1,13 +1,7 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that's been rescaled
@@ -72,7 +66,7 @@ namespace OSCADSharp.Transforms
             return new Bounds(oldBounds.BottomLeft * this.ScaleFactor, oldBounds.TopRight * this.ScaleFactor);
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "scalefactor", "scalefactor" }
         });
         public override void Bind(string property, Variable variable)
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs b/OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs
index 25b919e..bb7229f 100644
--- a/OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs
+++ b/OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs
@@ -1,13 +1,7 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object or objects that have been moved along the specified vector
@@ -78,7 +72,7 @@ namespace OSCADSharp.Transforms
             return new Bounds(oldBounds.BottomLeft + this.Vector, oldBounds.TopRight + this.Vector);
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "vector", "vector" }
         });
         public override void Bind(string property, Variable variable)
diff --git a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs b/OSCADSharp/OSCADSharp/Public/OSCADObject.cs
index 7b2b1a0..12db2a2 100644
--- a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs
+++ b/OSCADSharp/OSCADSharp/Public/OSCADObject.cs
@@ -1,10 +1,4 @@
-using OSCADSharp.Bindings;
-using OSCADSharp.Booleans;
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using OSCADSharp.Transforms;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs b/OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs
index 159469a..ed3f92c 100644
--- a/OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs
+++ b/OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs
@@ -1,5 +1,4 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs b/OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs
index 7a954eb..4820352 100644
--- a/OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs
+++ b/OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs
@@ -1,5 +1,4 @@
-using OSCADSharp.Files;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs b/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs
index 32f45ba..ec3cab7 100644
--- a/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs
+++ b/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs
@@ -1,6 +1,4 @@
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Cube.cs b/OSCADSharp/OSCADSharp/Public/Solids/Cube.cs
index 9266b83..83e5776 100644
--- a/OSCADSharp/OSCADSharp/Public/Solids/Cube.cs
+++ b/OSCADSharp/OSCADSharp/Public/Solids/Cube.cs
@@ -3,11 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
-using OSCADSharp.Scripting;
-using OSCADSharp.Bindings.Solids;
-using OSCADSharp.Scripting.Solids;
 
 namespace OSCADSharp
 {
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs b/OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs
index 8d52229..d959def 100644
--- a/OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs
+++ b/OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs
@@ -3,9 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Scripting;
-using OSCADSharp.Bindings;
 
 namespace OSCADSharp
 {
@@ -261,7 +258,7 @@ namespace OSCADSharp
             }
         }
                 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>()
+        private Bindings bindings = new Bindings(new Dictionary<string, string>()
         {
             {"radius", "r" },
             {"radius1", "r1" },
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs b/OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs
index 4923dff..21410ce 100644
--- a/OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs
+++ b/OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs
@@ -3,13 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Scripting;
 using System.Collections.Concurrent;
 using System.Reflection;
-using OSCADSharp.Bindings;
-using OSCADSharp.Bindings.Solids;
-using OSCADSharp.Scripting.Solids;
 
 namespace OSCADSharp
 {
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs b/OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs
index 24fbab5..b36347c 100644
--- a/OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs
+++ b/OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs
@@ -1,11 +1,8 @@
-using OSCADSharp.Scripting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
 namespace OSCADSharp
 {
@@ -170,7 +167,7 @@ namespace OSCADSharp
             throw new NotSupportedException("Bounds are not supported for objects using Text3D");
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>()
+        private Bindings bindings = new Bindings(new Dictionary<string, string>()
         {
             { "text", "text" },
             { "size", "size" },
diff --git a/OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs b/OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs
index f510029..b0f5dca 100644
--- a/OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs
+++ b/OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs
@@ -1,5 +1,4 @@
-using OSCADSharp.Spatial;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;