diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index 3756410..7c9375c 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -42,20 +42,20 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Dependencies.cs" />
+    <Compile Include="Settings\Dependencies.cs" />
     <Compile Include="Files\DefaultFileInvoker.cs" />
     <Compile Include="Files\DefaultFileWriter.cs" />
     <Compile Include="Files\IFileInvoker.cs" />
     <Compile Include="Files\IFileWriter.cs" />
-    <Compile Include="Ids.cs" />
-    <Compile Include="OpenSCADPathFinder.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="Scripting\SingleStatementObject.cs" />
     <Compile Include="Scripting\StatementBuilder.cs" />
     <Compile Include="Scripting\Variable.cs" />
-    <Compile Include="Settings.cs" />
+    <Compile Include="Settings\Settings.cs" />
     <Compile Include="Sizes.cs" />
     <Compile Include="Spatial\Bounds.cs" />
     <Compile Include="Spatial\Matrix.cs" />
diff --git a/OSCADSharp/OSCADSharp/Dependencies.cs b/OSCADSharp/OSCADSharp/Settings/Dependencies.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Dependencies.cs
rename to OSCADSharp/OSCADSharp/Settings/Dependencies.cs
diff --git a/OSCADSharp/OSCADSharp/Ids.cs b/OSCADSharp/OSCADSharp/Settings/Ids.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Ids.cs
rename to OSCADSharp/OSCADSharp/Settings/Ids.cs
diff --git a/OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs b/OSCADSharp/OSCADSharp/Settings/OpenSCADPathFinder.cs
similarity index 78%
rename from OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs
rename to OSCADSharp/OSCADSharp/Settings/OpenSCADPathFinder.cs
index 7d5918d..02dcf4b 100644
--- a/OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs
+++ b/OSCADSharp/OSCADSharp/Settings/OpenSCADPathFinder.cs
@@ -7,6 +7,10 @@ using System.Threading.Tasks;
 
 namespace OSCADSharp
 {
+    /// <summary>
+    /// Knowns where the default installation locations for OpenSCAD
+    /// are, and finds the right path for the current environment
+    /// </summary>
     internal class OpenSCADPathFinder
     {
         private string[] possibleFilePaths = new string[]
diff --git a/OSCADSharp/OSCADSharp/Settings.cs b/OSCADSharp/OSCADSharp/Settings/Settings.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Settings.cs
rename to OSCADSharp/OSCADSharp/Settings/Settings.cs