diff --git a/OpenNest.Engine.Tests/CuttingResultTests.cs b/OpenNest.Tests/CuttingResultTests.cs
similarity index 94%
rename from OpenNest.Engine.Tests/CuttingResultTests.cs
rename to OpenNest.Tests/CuttingResultTests.cs
index ab600dd..58cbefc 100644
--- a/OpenNest.Engine.Tests/CuttingResultTests.cs
+++ b/OpenNest.Tests/CuttingResultTests.cs
@@ -3,7 +3,7 @@ using OpenNest.CNC.CuttingStrategy;
 using OpenNest.Geometry;
 using Xunit;
 
-namespace OpenNest.Engine.Tests;
+namespace OpenNest.Tests;
 
 public class CuttingResultTests
 {
diff --git a/OpenNest.Engine.Tests/OpenNest.Engine.Tests.csproj b/OpenNest.Tests/OpenNest.Tests.csproj
similarity index 92%
rename from OpenNest.Engine.Tests/OpenNest.Engine.Tests.csproj
rename to OpenNest.Tests/OpenNest.Tests.csproj
index 2bf5057..ec1b229 100644
--- a/OpenNest.Engine.Tests/OpenNest.Engine.Tests.csproj
+++ b/OpenNest.Tests/OpenNest.Tests.csproj
@@ -23,6 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="..\OpenNest.Core\OpenNest.Core.csproj" />
     <ProjectReference Include="..\OpenNest.Engine\OpenNest.Engine.csproj" />
+    <ProjectReference Include="..\OpenNest.IO\OpenNest.IO.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenNest.Engine.Tests/PartFlagTests.cs b/OpenNest.Tests/PartFlagTests.cs
similarity index 95%
rename from OpenNest.Engine.Tests/PartFlagTests.cs
rename to OpenNest.Tests/PartFlagTests.cs
index 89b65e4..f140dd2 100644
--- a/OpenNest.Engine.Tests/PartFlagTests.cs
+++ b/OpenNest.Tests/PartFlagTests.cs
@@ -2,7 +2,7 @@ using OpenNest.CNC;
 using OpenNest.Geometry;
 using Xunit;
 
-namespace OpenNest.Engine.Tests;
+namespace OpenNest.Tests;
 
 public class PartFlagTests
 {
diff --git a/OpenNest.Engine.Tests/TestHelpers.cs b/OpenNest.Tests/TestHelpers.cs
similarity index 96%
rename from OpenNest.Engine.Tests/TestHelpers.cs
rename to OpenNest.Tests/TestHelpers.cs
index 56fc882..8d68f0b 100644
--- a/OpenNest.Engine.Tests/TestHelpers.cs
+++ b/OpenNest.Tests/TestHelpers.cs
@@ -1,7 +1,7 @@
 using OpenNest.CNC;
 using OpenNest.Geometry;
 
-namespace OpenNest.Engine.Tests;
+namespace OpenNest.Tests;
 
 internal static class TestHelpers
 {
diff --git a/OpenNest.sln b/OpenNest.sln
index 2f2414f..d0a8d89 100644
--- a/OpenNest.sln
+++ b/OpenNest.sln
@@ -19,7 +19,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Console", "OpenNes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Training", "OpenNest.Training\OpenNest.Training.csproj", "{249BF728-25DD-4863-8266-207ACD26E964}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Engine.Tests", "OpenNest.Engine.Tests\OpenNest.Engine.Tests.csproj", "{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenNest.Tests", "OpenNest.Tests\OpenNest.Tests.csproj", "{03539EB7-9DB2-4634-A6FD-F094B9603596}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -127,18 +127,18 @@ Global
 		{249BF728-25DD-4863-8266-207ACD26E964}.Release|x64.Build.0 = Release|Any CPU
 		{249BF728-25DD-4863-8266-207ACD26E964}.Release|x86.ActiveCfg = Release|Any CPU
 		{249BF728-25DD-4863-8266-207ACD26E964}.Release|x86.Build.0 = Release|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Debug|x64.Build.0 = Debug|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Release|x64.ActiveCfg = Release|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Release|x64.Build.0 = Release|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2BAB0D4-C389-4571-8A5B-0DEF8C933551}.Release|x86.Build.0 = Release|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Debug|x64.Build.0 = Debug|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Debug|x86.Build.0 = Debug|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Release|x64.ActiveCfg = Release|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Release|x64.Build.0 = Release|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Release|x86.ActiveCfg = Release|Any CPU
+		{03539EB7-9DB2-4634-A6FD-F094B9603596}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE