diff --git a/OSCADSharp/OSCADSharp/Booleans/Difference.cs b/OSCADSharp/OSCADSharp/Booleans/Difference.cs
index 363fec8..8b36550 100644
--- a/OSCADSharp/OSCADSharp/Booleans/Difference.cs
+++ b/OSCADSharp/OSCADSharp/Booleans/Difference.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Booleans/Intersection.cs b/OSCADSharp/OSCADSharp/Booleans/Intersection.cs
index c0c3d44..405e711 100644
--- a/OSCADSharp/OSCADSharp/Booleans/Intersection.cs
+++ b/OSCADSharp/OSCADSharp/Booleans/Intersection.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Booleans/Union.cs b/OSCADSharp/OSCADSharp/Booleans/Union.cs
index 23b42d9..d045b77 100644
--- a/OSCADSharp/OSCADSharp/Booleans/Union.cs
+++ b/OSCADSharp/OSCADSharp/Booleans/Union.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index a336192..ac69dc3 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -40,8 +40,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BlockFormatter.cs" />
-    <Compile Include="BlockStatementObject.cs" />
+    <Compile Include="Scripting\BlockFormatter.cs" />
+    <Compile Include="Scripting\BlockStatementObject.cs" />
     <Compile Include="Booleans\Difference.cs" />
     <Compile Include="Booleans\Intersection.cs" />
     <Compile Include="Booleans\Union.cs" />
diff --git a/OSCADSharp/OSCADSharp/BlockFormatter.cs b/OSCADSharp/OSCADSharp/Scripting/BlockFormatter.cs
similarity index 97%
rename from OSCADSharp/OSCADSharp/BlockFormatter.cs
rename to OSCADSharp/OSCADSharp/Scripting/BlockFormatter.cs
index b233c23..1f62e37 100644
--- a/OSCADSharp/OSCADSharp/BlockFormatter.cs
+++ b/OSCADSharp/OSCADSharp/Scripting/BlockFormatter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Scripting
 {
     /// <summary>
     /// A class that creates blocks of curly-braced script with the
diff --git a/OSCADSharp/OSCADSharp/BlockStatementObject.cs b/OSCADSharp/OSCADSharp/Scripting/BlockStatementObject.cs
similarity index 97%
rename from OSCADSharp/OSCADSharp/BlockStatementObject.cs
rename to OSCADSharp/OSCADSharp/Scripting/BlockStatementObject.cs
index 273a2ab..30a0c10 100644
--- a/OSCADSharp/OSCADSharp/BlockStatementObject.cs
+++ b/OSCADSharp/OSCADSharp/Scripting/BlockStatementObject.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.Scripting
 {
 
     /// <summary>
diff --git a/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs b/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
index 512f452..ca0fb3a 100644
--- a/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs b/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
index 0a04c07..d6969db 100644
--- a/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs b/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
index 1999048..aa08a8c 100644
--- a/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs b/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
index ff8351e..ccc5aad 100644
--- a/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs b/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
index f300a9d..e55eae4 100644
--- a/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs b/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
index cc4e342..1004ef1 100644
--- a/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.Scripting;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;