diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs b/OSCADSharp/OSCADSharp/BindableBoolean.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs
rename to OSCADSharp/OSCADSharp/BindableBoolean.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs b/OSCADSharp/OSCADSharp/BindableVector.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs
rename to OSCADSharp/OSCADSharp/BindableVector.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs b/OSCADSharp/OSCADSharp/Binding.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs
rename to OSCADSharp/OSCADSharp/Binding.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs b/OSCADSharp/OSCADSharp/Bindings.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs
rename to OSCADSharp/OSCADSharp/Bindings.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Spatial/Bounds.cs b/OSCADSharp/OSCADSharp/Bounds.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Spatial/Bounds.cs
rename to OSCADSharp/OSCADSharp/Bounds.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs b/OSCADSharp/OSCADSharp/ColoredObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs
rename to OSCADSharp/OSCADSharp/ColoredObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs b/OSCADSharp/OSCADSharp/CompoundVariable.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs
rename to OSCADSharp/OSCADSharp/CompoundVariable.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Cube.cs b/OSCADSharp/OSCADSharp/Cube.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Solids/Cube.cs
rename to OSCADSharp/OSCADSharp/Cube.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs b/OSCADSharp/OSCADSharp/CubeBindings.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs
rename to OSCADSharp/OSCADSharp/CubeBindings.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs b/OSCADSharp/OSCADSharp/CubeScriptBuilder.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs
rename to OSCADSharp/OSCADSharp/CubeScriptBuilder.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs b/OSCADSharp/OSCADSharp/Cylinder.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs
rename to OSCADSharp/OSCADSharp/Cylinder.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs b/OSCADSharp/OSCADSharp/DefaultFileInvoker.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs
rename to OSCADSharp/OSCADSharp/DefaultFileInvoker.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs b/OSCADSharp/OSCADSharp/DefaultFileWriter.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs
rename to OSCADSharp/OSCADSharp/DefaultFileWriter.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs b/OSCADSharp/OSCADSharp/Dependencies.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs
rename to OSCADSharp/OSCADSharp/Dependencies.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs b/OSCADSharp/OSCADSharp/Difference.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs
rename to OSCADSharp/OSCADSharp/Difference.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs b/OSCADSharp/OSCADSharp/HulledObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs
rename to OSCADSharp/OSCADSharp/HulledObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs b/OSCADSharp/OSCADSharp/IBindable.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs
rename to OSCADSharp/OSCADSharp/IBindable.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs b/OSCADSharp/OSCADSharp/IBindings.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs
rename to OSCADSharp/OSCADSharp/IBindings.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/ICloneable.cs b/OSCADSharp/OSCADSharp/ICloneable.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/ICloneable.cs
rename to OSCADSharp/OSCADSharp/ICloneable.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Files/IFileInvoker.cs b/OSCADSharp/OSCADSharp/IFileInvoker.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Files/IFileInvoker.cs
rename to OSCADSharp/OSCADSharp/IFileInvoker.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Files/IFileWriter.cs b/OSCADSharp/OSCADSharp/IFileWriter.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Files/IFileWriter.cs
rename to OSCADSharp/OSCADSharp/IFileWriter.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Settings/Ids.cs b/OSCADSharp/OSCADSharp/Ids.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Settings/Ids.cs
rename to OSCADSharp/OSCADSharp/Ids.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Inches.cs b/OSCADSharp/OSCADSharp/Inches.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Inches.cs
rename to OSCADSharp/OSCADSharp/Inches.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs b/OSCADSharp/OSCADSharp/Intersection.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs
rename to OSCADSharp/OSCADSharp/Intersection.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs b/OSCADSharp/OSCADSharp/Matrix.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs
rename to OSCADSharp/OSCADSharp/Matrix.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs b/OSCADSharp/OSCADSharp/MinkowskiedObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs
rename to OSCADSharp/OSCADSharp/MinkowskiedObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs b/OSCADSharp/OSCADSharp/MirroredObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs
rename to OSCADSharp/OSCADSharp/MirroredObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs b/OSCADSharp/OSCADSharp/MultiStatementObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs
rename to OSCADSharp/OSCADSharp/MultiStatementObject.cs
diff --git a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs b/OSCADSharp/OSCADSharp/OSCADObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/OSCADObject.cs
rename to OSCADSharp/OSCADSharp/OSCADObject.cs
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index 06f53b8..bf73a81 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -42,58 +42,59 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Internal\Bindings\BindableBoolean.cs" />
-    <Compile Include="Internal\Bindings\IBindings.cs" />
-    <Compile Include="Internal\Bindings\Solids\CubeBindings.cs" />
-    <Compile Include="Internal\Bindings\Solids\SphereBindings.cs" />
-    <Compile Include="Internal\ICloneable.cs" />
-    <Compile Include="Internal\Scripting\Solids\CubeScriptBuilder.cs" />
-    <Compile Include="Internal\Scripting\Solids\SphereScriptBuilder.cs" />
-    <Compile Include="Internal\Scripting\VariableCalculator.cs" />
-    <Compile Include="Internal\Scripting\CompoundVariable.cs" />
-    <Compile Include="Public\Settings\Dependencies.cs" />
-    <Compile Include="Internal\Files\DefaultFileInvoker.cs" />
-    <Compile Include="Internal\Files\DefaultFileWriter.cs" />
-    <Compile Include="Public\Files\IFileInvoker.cs" />
-    <Compile Include="Public\Files\IFileWriter.cs" />
-    <Compile Include="Internal\Settings\Ids.cs" />
-    <Compile Include="Internal\Settings\OpenSCADPathFinder.cs" />
-    <Compile Include="Internal\Bindings\Binding.cs" />
-    <Compile Include="Internal\Bindings\Bindings.cs" />
-    <Compile Include="Internal\Bindings\IBindable.cs" />
-    <Compile Include="Internal\Scripting\SingleStatementObject.cs" />
-    <Compile Include="Internal\Scripting\StatementBuilder.cs" />
-    <Compile Include="Public\Scripting\Variable.cs" />
-    <Compile Include="Public\Settings\Settings.cs" />
-    <Compile Include="Public\Inches.cs" />
-    <Compile Include="Internal\Bindings\BindableVector.cs" />
-    <Compile Include="Public\Spatial\Bounds.cs" />
-    <Compile Include="Internal\Spatial\Matrix.cs" />
-    <Compile Include="Internal\Transforms\HulledObject.cs" />
-    <Compile Include="Internal\Scripting\SingleBlockFormatter.cs" />
-    <Compile Include="Internal\Scripting\MultiStatementObject.cs" />
-    <Compile Include="Internal\Booleans\Difference.cs" />
-    <Compile Include="Internal\Booleans\Intersection.cs" />
-    <Compile Include="Internal\Booleans\Union.cs" />
-    <Compile Include="Public\OSCADObject.cs" />
+    <Compile Include="BindableBoolean.cs" />
+    <Compile Include="IBindings.cs" />
+    <Compile Include="CubeBindings.cs" />
+    <Compile Include="SphereBindings.cs" />
+    <Compile Include="ICloneable.cs" />
+    <Compile Include="CubeScriptBuilder.cs" />
+    <Compile Include="SphereScriptBuilder.cs" />
+    <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="Ids.cs" />
+    <Compile Include="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="Inches.cs" />
+    <Compile Include="BindableVector.cs" />
+    <Compile Include="Bounds.cs" />
+    <Compile Include="Matrix.cs" />
+    <Compile Include="HulledObject.cs" />
+    <Compile Include="SingleBlockFormatter.cs" />
+    <Compile Include="MultiStatementObject.cs" />
+    <Compile Include="Difference.cs" />
+    <Compile Include="Intersection.cs" />
+    <Compile Include="Union.cs" />
+    <Compile Include="OSCADObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Public\Solids\Cube.cs" />
-    <Compile Include="Public\Solids\Cylinder.cs" />
-    <Compile Include="Public\Solids\Sphere.cs" />
-    <Compile Include="Public\Solids\Text3D.cs" />
-    <Compile Include="Internal\Transforms\ColoredObject.cs" />
-    <Compile Include="Internal\Transforms\MinkowskiedObject.cs" />
-    <Compile Include="Internal\Transforms\MirroredObject.cs" />
-    <Compile Include="Internal\Transforms\ResizedObject.cs" />
-    <Compile Include="Internal\Transforms\RotatedObject.cs" />
-    <Compile Include="Internal\Transforms\ScaledObject.cs" />
-    <Compile Include="Internal\Transforms\TranslatedObject.cs" />
-    <Compile Include="Public\Spatial\Vector3.cs" />
-    <Compile Include="Public\Scripting\Variables.cs" />
+    <Compile Include="Cube.cs" />
+    <Compile Include="Cylinder.cs" />
+    <Compile Include="Sphere.cs" />
+    <Compile Include="Text3D.cs" />
+    <Compile Include="ColoredObject.cs" />
+    <Compile Include="MinkowskiedObject.cs" />
+    <Compile Include="MirroredObject.cs" />
+    <Compile Include="ResizedObject.cs" />
+    <Compile Include="RotatedObject.cs" />
+    <Compile Include="ScaledObject.cs" />
+    <Compile Include="TranslatedObject.cs" />
+    <Compile Include="Vector3.cs" />
+    <Compile Include="Variables.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="OSCADSharp.nuspec" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OSCADSharp/OSCADSharp/Internal/Settings/OpenSCADPathFinder.cs b/OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Settings/OpenSCADPathFinder.cs
rename to OSCADSharp/OSCADSharp/OpenSCADPathFinder.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs b/OSCADSharp/OSCADSharp/ResizedObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs
rename to OSCADSharp/OSCADSharp/ResizedObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs b/OSCADSharp/OSCADSharp/RotatedObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs
rename to OSCADSharp/OSCADSharp/RotatedObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs b/OSCADSharp/OSCADSharp/ScaledObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs
rename to OSCADSharp/OSCADSharp/ScaledObject.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs b/OSCADSharp/OSCADSharp/Settings.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Settings/Settings.cs
rename to OSCADSharp/OSCADSharp/Settings.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs b/OSCADSharp/OSCADSharp/SingleBlockFormatter.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs
rename to OSCADSharp/OSCADSharp/SingleBlockFormatter.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs b/OSCADSharp/OSCADSharp/SingleStatementObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs
rename to OSCADSharp/OSCADSharp/SingleStatementObject.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs b/OSCADSharp/OSCADSharp/Sphere.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs
rename to OSCADSharp/OSCADSharp/Sphere.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs b/OSCADSharp/OSCADSharp/SphereBindings.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs
rename to OSCADSharp/OSCADSharp/SphereBindings.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs b/OSCADSharp/OSCADSharp/SphereScriptBuilder.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs
rename to OSCADSharp/OSCADSharp/SphereScriptBuilder.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs b/OSCADSharp/OSCADSharp/StatementBuilder.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs
rename to OSCADSharp/OSCADSharp/StatementBuilder.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs b/OSCADSharp/OSCADSharp/Text3D.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs
rename to OSCADSharp/OSCADSharp/Text3D.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs b/OSCADSharp/OSCADSharp/TranslatedObject.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs
rename to OSCADSharp/OSCADSharp/TranslatedObject.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs b/OSCADSharp/OSCADSharp/Union.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs
rename to OSCADSharp/OSCADSharp/Union.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs b/OSCADSharp/OSCADSharp/Variable.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs
rename to OSCADSharp/OSCADSharp/Variable.cs
diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs b/OSCADSharp/OSCADSharp/VariableCalculator.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs
rename to OSCADSharp/OSCADSharp/VariableCalculator.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Scripting/Variables.cs b/OSCADSharp/OSCADSharp/Variables.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Scripting/Variables.cs
rename to OSCADSharp/OSCADSharp/Variables.cs
diff --git a/OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs b/OSCADSharp/OSCADSharp/Vector3.cs
similarity index 100%
rename from OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs
rename to OSCADSharp/OSCADSharp/Vector3.cs