diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
index 4557638..43688e2 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
@@ -1,5 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using OSCADSharp.IO;
+using OSCADSharp.Utility;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -149,7 +151,7 @@ namespace OSCADSharp.UnitTests
 
             cube.ToFile("myFile");
 
-            Assert.AreEqual(Settings.OSCADSharpHeader, output[0]);
+            Assert.AreEqual(OutputSettings.OSCADSharpHeader, output[0]);
        }
 
         [TestMethod]
diff --git a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
index ba84ad6..9713cc8 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
@@ -1,5 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using OSCADSharp.IO;
+using OSCADSharp.Utility;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,7 +34,7 @@ namespace OSCADSharp.UnitTests
         [ExpectedException(typeof(InvalidOperationException))]
         public void Settings_NullOpenSCADPathThrowsError()
         {
-            Settings.OpenSCADPath = null;
+            OutputSettings.OpenSCADPath = null;
 
             var cube = new Cube();
 
diff --git a/OSCADSharp/OSCADSharp/Dependencies.cs b/OSCADSharp/OSCADSharp/Dependencies.cs
index 4e34752..a378dfb 100644
--- a/OSCADSharp/OSCADSharp/Dependencies.cs
+++ b/OSCADSharp/OSCADSharp/Dependencies.cs
@@ -1,4 +1,5 @@
-using System;
+using OSCADSharp.IO;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/OSCADSharp/OSCADSharp/DefaultFileInvoker.cs b/OSCADSharp/OSCADSharp/IO/DefaultFileInvoker.cs
similarity index 79%
rename from OSCADSharp/OSCADSharp/DefaultFileInvoker.cs
rename to OSCADSharp/OSCADSharp/IO/DefaultFileInvoker.cs
index a6eee75..b87db1d 100644
--- a/OSCADSharp/OSCADSharp/DefaultFileInvoker.cs
+++ b/OSCADSharp/OSCADSharp/IO/DefaultFileInvoker.cs
@@ -1,11 +1,12 @@
-using System;
+using OSCADSharp.Utility;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.IO
 {
     internal class DefaultFileInvoker : IFileInvoker
     {
@@ -19,7 +20,7 @@ namespace OSCADSharp
         {
             try
             {
-                Process.Start(Settings.OpenSCADPath, String.Format("-o {0} {1}", outputFile, this.filePath));
+                Process.Start(OutputSettings.OpenSCADPath, String.Format("-o {0} {1}", outputFile, this.filePath));
             }
             catch (InvalidOperationException)
             {
@@ -31,7 +32,7 @@ namespace OSCADSharp
         {
             try
             {
-                Process.Start(Settings.OpenSCADPath, String.Format("{0}", this.filePath));
+                Process.Start(OutputSettings.OpenSCADPath, String.Format("{0}", this.filePath));
             }
             catch (InvalidOperationException)
             {
diff --git a/OSCADSharp/OSCADSharp/DefaultFileWriter.cs b/OSCADSharp/OSCADSharp/IO/DefaultFileWriter.cs
similarity index 93%
rename from OSCADSharp/OSCADSharp/DefaultFileWriter.cs
rename to OSCADSharp/OSCADSharp/IO/DefaultFileWriter.cs
index c3281e7..96d74c3 100644
--- a/OSCADSharp/OSCADSharp/DefaultFileWriter.cs
+++ b/OSCADSharp/OSCADSharp/IO/DefaultFileWriter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.IO
 {
     internal class DefaultFileWriter : IFileWriter
     {
diff --git a/OSCADSharp/OSCADSharp/IFileInvoker.cs b/OSCADSharp/OSCADSharp/IO/IFileInvoker.cs
similarity index 96%
rename from OSCADSharp/OSCADSharp/IFileInvoker.cs
rename to OSCADSharp/OSCADSharp/IO/IFileInvoker.cs
index d40afaf..4624077 100644
--- a/OSCADSharp/OSCADSharp/IFileInvoker.cs
+++ b/OSCADSharp/OSCADSharp/IO/IFileInvoker.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.IO
 {
     /// <summary>
     /// Invokes OpenSCAD actions on output files
diff --git a/OSCADSharp/OSCADSharp/IFileWriter.cs b/OSCADSharp/OSCADSharp/IO/IFileWriter.cs
similarity index 95%
rename from OSCADSharp/OSCADSharp/IFileWriter.cs
rename to OSCADSharp/OSCADSharp/IO/IFileWriter.cs
index eb6000d..ebd5a0a 100644
--- a/OSCADSharp/OSCADSharp/IFileWriter.cs
+++ b/OSCADSharp/OSCADSharp/IO/IFileWriter.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.IO
 {
     /// <summary>
     /// A class that takes text and writes to file
diff --git a/OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs b/OSCADSharp/OSCADSharp/IO/OpenSCADPathFinder.cs
similarity index 97%
rename from OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs
rename to OSCADSharp/OSCADSharp/IO/OpenSCADPathFinder.cs
index a3fc0f4..a1e0196 100644
--- a/OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs
+++ b/OSCADSharp/OSCADSharp/IO/OpenSCADPathFinder.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.IO
 {
     /// <summary>
     /// Known where the default installation locations for OpenSCAD
diff --git a/OSCADSharp/OSCADSharp/Settings.cs b/OSCADSharp/OSCADSharp/IO/OutputSettings.cs
similarity index 88%
rename from OSCADSharp/OSCADSharp/Settings.cs
rename to OSCADSharp/OSCADSharp/IO/OutputSettings.cs
index ec3cab7..2027e6d 100644
--- a/OSCADSharp/OSCADSharp/Settings.cs
+++ b/OSCADSharp/OSCADSharp/IO/OutputSettings.cs
@@ -1,16 +1,17 @@
-using System;
+using OSCADSharp.Utility;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp
+namespace OSCADSharp.IO
 {
     /// <summary>
     /// Settings for OpenSCAD scripts
     /// </summary>
-    public static class Settings
+    public static class OutputSettings
     {
         /// <summary>
         /// Code-gen header
diff --git a/OSCADSharp/OSCADSharp/OSCADObject.cs b/OSCADSharp/OSCADSharp/OSCADObject.cs
index 3a06eda..71dc457 100644
--- a/OSCADSharp/OSCADSharp/OSCADObject.cs
+++ b/OSCADSharp/OSCADSharp/OSCADObject.cs
@@ -1,4 +1,5 @@
-using OSCADSharp.Utility;
+using OSCADSharp.IO;
+using OSCADSharp.Utility;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -839,7 +840,7 @@ namespace OSCADSharp
             
             Dependencies.FileWriter.WriteAllLines(path, new string[] 
             {
-                Settings.OSCADSharpHeader,
+                OutputSettings.OSCADSharpHeader,
                 Variables.Global.ToString(),
                 this.ToString()
             });
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index b02b52c..09675a2 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -52,19 +52,19 @@
     <Compile Include="VariableCalculator.cs" />
     <Compile Include="CompoundVariable.cs" />
     <Compile Include="Dependencies.cs" />
-    <Compile Include="DefaultFileInvoker.cs" />
-    <Compile Include="DefaultFileWriter.cs" />
-    <Compile Include="IFileInvoker.cs" />
-    <Compile Include="IFileWriter.cs" />
+    <Compile Include="IO\DefaultFileInvoker.cs" />
+    <Compile Include="IO\DefaultFileWriter.cs" />
+    <Compile Include="IO\IFileInvoker.cs" />
+    <Compile Include="IO\IFileWriter.cs" />
     <Compile Include="Utility\Ids.cs" />
-    <Compile Include="OpenSCADPathFinder.cs" />
+    <Compile Include="IO\OpenSCADPathFinder.cs" />
     <Compile Include="Binding.cs" />
     <Compile Include="Bindings.cs" />
     <Compile Include="IBindable.cs" />
     <Compile Include="SingleStatementObject.cs" />
     <Compile Include="StatementBuilder.cs" />
     <Compile Include="Variable.cs" />
-    <Compile Include="Settings.cs" />
+    <Compile Include="IO\OutputSettings.cs" />
     <Compile Include="Utility\Inches.cs" />
     <Compile Include="BindableVector.cs" />
     <Compile Include="Bounds.cs" />