Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineAdapter.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineAdapter.cs	(.../SurfaceLineAdapter.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineAdapter.cs	(.../SurfaceLineAdapter.cs)	(revision 331)
@@ -22,13 +22,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Deltares.DamEngine.Calculators.General;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Language;
 
-namespace Deltares.DamEngine.Calculators.General
+namespace Deltares.DamEngine.Calculators.Dikes_Design
 {
     public struct DitchDefinition
     {
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamCalculation.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamCalculation.cs	(.../DamCalculation.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamCalculation.cs	(.../DamCalculation.cs)	(revision 331)
@@ -271,7 +271,7 @@
 
         public void CalculateDamProject(DamProjectData damProject, string defaultProjectWorkingPath)
         {
-//            damProjectData = damProject;
+//            damProjectData = damProject; ##Bka
 //
 //            // Set default working directory
 //            if (ProjectWorkingDirectory.Equals(""))
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 331)
@@ -50,14 +50,14 @@
     <Compile Include="General\DamProjectCalculator.cs" />
     <Compile Include="General\DamProjectCalculatorCsvExportDataBuilder.cs" />
     <Compile Include="General\DamRunner.cs" />
-    <Compile Include="Dikes Assessment\RWScenariosCalculation.cs" />
+    <Compile Include="Dikes Assessment Regional\RWScenariosCalculation.cs" />
     <Compile Include="General\IContext.cs" />
     <Compile Include="General\Parallel.cs" />
     <Compile Include="General\ParameterMissingException.cs" />
     <Compile Include="General\RequiredEntityNotExistException.cs" />
-    <Compile Include="General\SurfaceLineAdapter.cs" />
-    <Compile Include="General\SurfaceLineAdapterException.cs" />
-    <Compile Include="General\SurfaceLineHeightAdapter.cs" />
+    <Compile Include="Dikes Design\SurfaceLineAdapter.cs" />
+    <Compile Include="Dikes Design\SurfaceLineAdapterException.cs" />
+    <Compile Include="Dikes Design\SurfaceLineHeightAdapter.cs" />
     <Compile Include="General\ThrowHelper.cs" />
     <Compile Include="Interfaces\DGSDAMSlopeWInterface.cs" />
     <Compile Include="Interfaces\DGSMStabDAMInterface.cs" />
@@ -83,7 +83,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Dikes Design\" />
+    <Folder Include="Dikes Assessment\" />
     <Folder Include="Dikes NWO\" />
     <Folder Include="Dikes Operational\" />
   </ItemGroup>
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineHeightAdapter.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineHeightAdapter.cs	(.../SurfaceLineHeightAdapter.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineHeightAdapter.cs	(.../SurfaceLineHeightAdapter.cs)	(revision 331)
@@ -24,7 +24,7 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.General
+namespace Deltares.DamEngine.Calculators.Dikes_Design
 {
     public class SurfaceLineHeightAdapterException : Exception
     {
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamRunner.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 331)
@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using Deltares.DamEngine.Calculators.Dikes_Assessment;
+using Deltares.DamEngine.Calculators.Dikes_Assessment_Regional;
 using Deltares.DamEngine.Calculators.Stability;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs	(.../DAMFailureMechanismeCalculator.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs	(.../DAMFailureMechanismeCalculator.cs)	(revision 331)
@@ -28,6 +28,7 @@
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using System.Xml.Serialization;
+using Deltares.DamEngine.Calculators.Dikes_Design;
 using Deltares.DamEngine.Calculators.General;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 331)
@@ -22,11 +22,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Xml.Serialization;
 using Deltares.DamEngine.Calculators.SchematizationFactor;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
@@ -36,9 +33,8 @@
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Logging;
-using RWScenarioSelector = Deltares.DamEngine.Calculators.Dikes_Assessment_Regional.RWScenarioSelector;
 
-namespace Deltares.DamEngine.Calculators.Dikes_Assessment
+namespace Deltares.DamEngine.Calculators.Dikes_Assessment_Regional
 {
     /// <summary>
     /// Exception for RWScenariosCalculation class
Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineAdapterException.cs
===================================================================
diff -u -r330 -r331
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineAdapterException.cs	(.../SurfaceLineAdapterException.cs)	(revision 330)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/Dikes Design/SurfaceLineAdapterException.cs	(.../SurfaceLineAdapterException.cs)	(revision 331)
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.General
+namespace Deltares.DamEngine.Calculators.Dikes_Design
 {
     [Serializable]
     public class SurfaceLineAdapterException : Exception