diff --git a/OSCADSharp/OSCADSharp/Scripting/Binding.cs b/OSCADSharp/OSCADSharp/Bindings/Binding.cs
similarity index 77%
rename from OSCADSharp/OSCADSharp/Scripting/Binding.cs
rename to OSCADSharp/OSCADSharp/Bindings/Binding.cs
index c1afe73..64505a3 100644
--- a/OSCADSharp/OSCADSharp/Scripting/Binding.cs
+++ b/OSCADSharp/OSCADSharp/Bindings/Binding.cs
@@ -1,10 +1,11 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp.Bindings
 {
     internal class Binding
     {
diff --git a/OSCADSharp/OSCADSharp/Scripting/Bindings.cs b/OSCADSharp/OSCADSharp/Bindings/Bindings.cs
similarity index 97%
rename from OSCADSharp/OSCADSharp/Scripting/Bindings.cs
rename to OSCADSharp/OSCADSharp/Bindings/Bindings.cs
index 0397485..1fbd505 100644
--- a/OSCADSharp/OSCADSharp/Scripting/Bindings.cs
+++ b/OSCADSharp/OSCADSharp/Bindings/Bindings.cs
@@ -1,11 +1,12 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp.Bindings
 {
     internal class Bindings
     {
diff --git a/OSCADSharp/OSCADSharp/Scripting/IBindable.cs b/OSCADSharp/OSCADSharp/Bindings/IBindable.cs
similarity index 86%
rename from OSCADSharp/OSCADSharp/Scripting/IBindable.cs
rename to OSCADSharp/OSCADSharp/Bindings/IBindable.cs
index 6389eb4..4e89fac 100644
--- a/OSCADSharp/OSCADSharp/Scripting/IBindable.cs
+++ b/OSCADSharp/OSCADSharp/Bindings/IBindable.cs
@@ -1,10 +1,11 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp.Bindings
 {
     /// <summary>
     /// An object whose properties can be bound to variables
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index 7c9375c..3288f64 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -49,9 +49,9 @@
     <Compile Include="Files\IFileWriter.cs" />
     <Compile Include="Settings\Ids.cs" />
     <Compile Include="Settings\OpenSCADPathFinder.cs" />
-    <Compile Include="Scripting\Binding.cs" />
-    <Compile Include="Scripting\Bindings.cs" />
-    <Compile Include="Scripting\IBindable.cs" />
+    <Compile Include="Bindings\Binding.cs" />
+    <Compile Include="Bindings\Bindings.cs" />
+    <Compile Include="Bindings\IBindable.cs" />
     <Compile Include="Scripting\SingleStatementObject.cs" />
     <Compile Include="Scripting\StatementBuilder.cs" />
     <Compile Include="Scripting\Variable.cs" />
diff --git a/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs b/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs
index 1a4410d..47ff6d2 100644
--- a/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs
+++ b/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs
@@ -13,13 +13,13 @@ namespace OSCADSharp.Scripting
     internal class StatementBuilder
     {
         private StringBuilder SB { get; set; } = new StringBuilder();
-        private Bindings bindings = null;
+        private Bindings.Bindings bindings = null;
 
         internal StatementBuilder()
         {
         }
 
-        internal StatementBuilder(Bindings bindings)
+        internal StatementBuilder(Bindings.Bindings bindings)
         {
             this.bindings = bindings;
         }
diff --git a/OSCADSharp/OSCADSharp/Solids/Sphere.cs b/OSCADSharp/OSCADSharp/Solids/Sphere.cs
index c11c05f..8842a1c 100644
--- a/OSCADSharp/OSCADSharp/Solids/Sphere.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Sphere.cs
@@ -7,6 +7,7 @@ using OSCADSharp.Spatial;
 using OSCADSharp.Scripting;
 using System.Collections.Concurrent;
 using System.Reflection;
+using OSCADSharp.Bindings;
 
 namespace OSCADSharp.Solids
 {
@@ -130,7 +131,7 @@ namespace OSCADSharp.Solids
                               new Vector3(this.Radius, this.Radius, this.Radius));
         }
 
-        private Bindings bindings = new Bindings(new Dictionary<string, string>()
+        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>()
         {
             { "radius", "r" },
             { "minimumangle", "$fa" },