Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile.xml
===================================================================
diff -u -r992 -r994
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile.xml	(.../MacroStabilityTutorialDesignInputFile.xml)	(revision 992)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile.xml	(.../MacroStabilityTutorialDesignInputFile.xml)	(revision 994)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" ProjectPath="D:\Test" CalculationMap="Calc">
+<?xml version="1.0" encoding="utf-8"?>
+<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" ProjectPath="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design" CalculationMap="DAM Tutorial Design.Calc">
   <Locations>
     <Location SurfaceLineName="DWP_1" SegmentName="DWP_1" Name="DWP_1" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="-8.42">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" NewShoulderTopSlope="0.05" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r934 -r994
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 934)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 994)
@@ -48,7 +48,8 @@
             ValidateInput(input);
             var damProjectData = new DamProjectData();
 
-            damProjectData.ProjectWorkingPath = input.ProjectWorkingPath;
+            damProjectData.ProjectPath = input.ProjectPath;
+            damProjectData.CalculationMap = input.CalculationMap;
 
             damProjectData.WaterBoard = new WaterBoard();
             damProjectData.WaterBoard.Dikes = new List<Dike>();
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r984 -r994
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 984)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 994)
@@ -87,7 +87,7 @@
         private DamProjectData CreateExampleDamProjectData()
         {
             var damProjectData = new DamProjectData();
-            damProjectData.ProjectWorkingPath = @"D:\TestDamFolder\Sub";
+            damProjectData.ProjectPath = @"D:\TestDamFolder\Sub";
             FillAnalysisSpecification(damProjectData);
             FillStabilityParameters(damProjectData);
             damProjectData.WaterBoard = new WaterBoard();
Index: DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs
===================================================================
diff -u -r989 -r994
--- DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs	(.../DamProject.cs)	(revision 989)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamProject.cs	(.../DamProject.cs)	(revision 994)
@@ -79,7 +79,8 @@
             }
         }
 
-        public static string ProjectMap { get; set; } 
+        public static string ProjectMap { get; set; }
+        public static string CalculationMap { get; set; }
 
         public string ProjectFileName
         {
@@ -89,7 +90,8 @@
                 DataEventPublisher.BeforeChange(this, "ProjectFileName");
                 this.projectFileName = value;
                 ProjectMap = Path.GetDirectoryName(Path.GetFullPath(value));
-                ProjectMapWorkingPath = Path.GetFullPath(Path.ChangeExtension(value, "Calc"));
+                CalculationMap = Path.GetFileName(Path.ChangeExtension(value, "Calc"));
+                ProjectMapWorkingPath = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(value)), CalculationMap);
                 //damProjectFolder = Path.GetDirectoryName(value);
                 DataEventPublisher.AfterChange(this, "ProjectFileName");
             }
Index: DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs
===================================================================
diff -u -r974 -r994
--- DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 974)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 994)
@@ -55,7 +55,8 @@
         private List<DataSourceInfo> dataSources = new List<DataSourceInfo>();
         private string dataSourceEsriProjection = null;
         private SensorData sensorData;
-        private string projectWorkingPath;
+        private string projectPath;
+        private string calculationMap;
 
         /// <summary>
         /// Constructor
@@ -67,21 +68,47 @@
             this.damProjectCalculationSpecification = new DamProjectCalculationSpecification();            
         }
 
-        public string ProjectWorkingPath
+        /// <summary>
+        /// Gets or sets the project working path.
+        /// </summary>
+        /// <value>
+        /// The project working path.
+        /// </value>
+        public string ProjectPath
         {
             get
             {
-                if (!string.IsNullOrEmpty(projectWorkingPath))
-                    return projectWorkingPath;
-                return DamProject.ProjectWorkingPath;
+                if (!string.IsNullOrEmpty(projectPath))
+                    return projectPath;
+                return DamProject.ProjectMap;
             }
             set
             {
-                projectWorkingPath = value;
+                projectPath = value;
             }
         }
 
         /// <summary>
+        /// Gets or sets the calculation map.
+        /// </summary>
+        /// <value>
+        /// The calculation map.
+        /// </value>
+        public string CalculationMap
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(calculationMap))
+                    return calculationMap;
+                return DamProject.CalculationMap;
+            }
+            set
+            {
+                calculationMap = value;
+            }
+        }
+
+        /// <summary>
         /// Toplevel object to hold waterboard data
         /// </summary>
         public virtual WaterBoard WaterBoard
Index: DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r966 -r994
--- DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 966)
+++ DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 994)
@@ -389,7 +389,9 @@
     <None Include="..\..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\AssemblyInfo.cs.svn" />
     <EmbeddedResource Include="DtoAssembler\Xsd\FileIdentificationDefinition.xsd">
       <SubType>Designer</SubType>
Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r984 -r994
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 984)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 994)
@@ -48,7 +48,9 @@
             Input input = new Input();
             Dike dike = damProjectData.WaterBoard.Dikes[0];
 
-            input.ProjectWorkingPath = damProjectData.ProjectWorkingPath;
+            input.ProjectPath = damProjectData.ProjectPath;
+            input.CalculationMap = damProjectData.CalculationMap;
+
             TransferAnalysisSpecification(damProjectData, input);
             TransferStabilityParameters(damProjectData, input);
 
@@ -374,7 +376,7 @@
                 inputLocation.DikeEmbankmentMaterial = location.DikeEmbankmentMaterial;
                 inputLocation.StabilityOptions = new LocationStabilityOptions
                 {
-                    MapForSoilgeometries2D = Path.Combine(DamProject.ProjectMap, location.MapForSoilGeometries2D),
+                    MapForSoilgeometries2D = location.MapForSoilGeometries2D,
                     SoilDatabaseName = location.SoildatabaseName,
                     ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityZoneType),
                     ForbiddenZoneFactorSpecified = true,