Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1818)
@@ -25,13 +25,14 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class MacroStabilityInwardsTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 1818)
@@ -22,11 +22,12 @@
 using System.IO;
 using System.Text;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     /// <summary>
     /// These tests were based on DamLiveIntegrationTest.Run_UsingTestFiles_HasExpectedResultsInOutputFile()
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs	(.../PipingSellmeijerRevisedTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs	(.../PipingSellmeijerRevisedTests.cs)	(revision 1818)
@@ -19,18 +19,14 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class PipingSellmeijerRevisedTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 1818)
@@ -22,11 +22,12 @@
 using System.IO;
 using System.Text;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     /// <summary>
     /// These tests were based on DamLiveIntegrationTest.Run_UsingTestFiles_HasExpectedResultsInOutputFile()
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 1818)
@@ -23,10 +23,11 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class PipingSellmeijerVnkTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 1818)
@@ -26,12 +26,13 @@
 using System.Linq;
 using System.Text;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class MultiCoreMacroStabilityTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/RegionalAssessmentCalculatorTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/RegionalAssessmentCalculatorTests.cs	(.../RegionalAssessmentCalculatorTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/RegionalAssessmentCalculatorTests.cs	(.../RegionalAssessmentCalculatorTests.cs)	(revision 1818)
@@ -25,7 +25,7 @@
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Calculators.Tests.RegionalAssessment
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class RegionalAssessmentCalculatorTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs	(.../MultiCorePipingCalculationTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs	(.../MultiCorePipingCalculationTests.cs)	(revision 1818)
@@ -26,12 +26,13 @@
 using System.Linq;
 using System.Text;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     class MultiCorePipingCalculationTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs	(.../MacroStabilityOutwardsTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs	(.../MacroStabilityOutwardsTests.cs)	(revision 1818)
@@ -22,12 +22,13 @@
 using System.IO;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class MacroStabilityOutwardsTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 1818)
@@ -23,10 +23,11 @@
 using System.Threading;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class PipingBlighTests
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs
===================================================================
diff -u -r1741 -r1818
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 1741)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs	(.../PipingSellmeijer4ForcesTests.cs)	(revision 1818)
@@ -22,10 +22,11 @@
 using System.IO;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using NUnit.Framework;
 
-namespace Deltares.DamEngine.Interface.Tests
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
     public class PipingSellmeijer4ForcesTests