diff --git a/OpenNest.Core/CNC/Program.cs b/OpenNest.Core/CNC/Program.cs
index 447a2cd..0f31650 100644
--- a/OpenNest.Core/CNC/Program.cs
+++ b/OpenNest.Core/CNC/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using OpenNest.Converters;
 using OpenNest.Geometry;
 using OpenNest.Math;
 
diff --git a/OpenNest.Core/ConvertGeometry.cs b/OpenNest.Core/Converters/ConvertGeometry.cs
similarity index 98%
rename from OpenNest.Core/ConvertGeometry.cs
rename to OpenNest.Core/Converters/ConvertGeometry.cs
index e984a29..13cc52a 100644
--- a/OpenNest.Core/ConvertGeometry.cs
+++ b/OpenNest.Core/Converters/ConvertGeometry.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using OpenNest;
 using OpenNest.CNC;
 using OpenNest.Geometry;
 
-namespace OpenNest
+namespace OpenNest.Converters
 {
     public static class ConvertGeometry
     {
diff --git a/OpenNest.Core/ConvertMode.cs b/OpenNest.Core/Converters/ConvertMode.cs
similarity index 97%
rename from OpenNest.Core/ConvertMode.cs
rename to OpenNest.Core/Converters/ConvertMode.cs
index f0e14f2..80e5fe7 100644
--- a/OpenNest.Core/ConvertMode.cs
+++ b/OpenNest.Core/Converters/ConvertMode.cs
@@ -1,7 +1,7 @@
 using OpenNest.CNC;
 using OpenNest.Geometry;
 
-namespace OpenNest
+namespace OpenNest.Converters
 {
     public static class ConvertMode
     {
diff --git a/OpenNest.Core/ConvertProgram.cs b/OpenNest.Core/Converters/ConvertProgram.cs
similarity index 98%
rename from OpenNest.Core/ConvertProgram.cs
rename to OpenNest.Core/Converters/ConvertProgram.cs
index 2f1312f..97efe77 100644
--- a/OpenNest.Core/ConvertProgram.cs
+++ b/OpenNest.Core/Converters/ConvertProgram.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using OpenNest;
 using OpenNest.CNC;
 using OpenNest.Geometry;
 using OpenNest.Math;
 
-namespace OpenNest
+namespace OpenNest.Converters
 {
     public static class ConvertProgram
     {
diff --git a/OpenNest.Core/Drawing.cs b/OpenNest.Core/Drawing.cs
index 0dd2dff..fdc2ce2 100644
--- a/OpenNest.Core/Drawing.cs
+++ b/OpenNest.Core/Drawing.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using System.Linq;
 using OpenNest.CNC;
+using OpenNest.Converters;
 using OpenNest.Geometry;
 
 namespace OpenNest
diff --git a/OpenNest.Core/OpenNest.Core.csproj b/OpenNest.Core/OpenNest.Core.csproj
index cb6ae36..b3c7884 100644
--- a/OpenNest.Core/OpenNest.Core.csproj
+++ b/OpenNest.Core/OpenNest.Core.csproj
@@ -48,7 +48,7 @@
     <Compile Include="Drawing.cs" />
     <Compile Include="Collections\DrawingCollection.cs" />
     <Compile Include="Math\EvenOdd.cs" />
-    <Compile Include="ConvertGeometry.cs" />
+    <Compile Include="Converters\ConvertGeometry.cs" />
     <Compile Include="CNC\ArcMove.cs" />
     <Compile Include="CNC\Comment.cs" />
     <Compile Include="CNC\ICode.cs" />
@@ -85,13 +85,13 @@
     <Compile Include="Sequence.cs" />
     <Compile Include="SpecialLayers.cs" />
     <Compile Include="Material.cs" />
-    <Compile Include="ConvertMode.cs" />
+    <Compile Include="Converters\ConvertMode.cs" />
     <Compile Include="Nest.cs" />
     <Compile Include="Part.cs" />
     <Compile Include="Collections\ObservableList.cs" />
     <Compile Include="Plate.cs" />
     <Compile Include="CNC\Program.cs" />
-    <Compile Include="ConvertProgram.cs" />
+    <Compile Include="Converters\ConvertProgram.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DwgQty.cs" />
     <Compile Include="Geometry\Spacing.cs" />
diff --git a/OpenNest.Core/Part.cs b/OpenNest.Core/Part.cs
index 6fcf7dd..ac1e523 100644
--- a/OpenNest.Core/Part.cs
+++ b/OpenNest.Core/Part.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using OpenNest.CNC;
+using OpenNest.Converters;
 using OpenNest.Geometry;
 
 namespace OpenNest
diff --git a/OpenNest.Core/Timing.cs b/OpenNest.Core/Timing.cs
index 9ab5565..11b85c8 100644
--- a/OpenNest.Core/Timing.cs
+++ b/OpenNest.Core/Timing.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using OpenNest.CNC;
+using OpenNest.Converters;
 using OpenNest.Geometry;
 
 namespace OpenNest
diff --git a/OpenNest/Actions/ActionSetSequence.cs b/OpenNest/Actions/ActionSetSequence.cs
index 7dfb746..e76e4e2 100644
--- a/OpenNest/Actions/ActionSetSequence.cs
+++ b/OpenNest/Actions/ActionSetSequence.cs
@@ -4,6 +4,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using OpenNest.Controls;
+using OpenNest.Converters;
 using OpenNest.Forms;
 using OpenNest.Geometry;
 
diff --git a/OpenNest/Forms/CadConverterForm.cs b/OpenNest/Forms/CadConverterForm.cs
index b731d11..53797bb 100644
--- a/OpenNest/Forms/CadConverterForm.cs
+++ b/OpenNest/Forms/CadConverterForm.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using OpenNest.CNC;
+using OpenNest.Converters;
 using OpenNest.Geometry;
 using OpenNest.IO;
 using OpenNest.Properties;