Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoDocumentAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoDocumentAssembler.cs	(.../DtoDocumentAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoDocumentAssembler.cs	(.../DtoDocumentAssembler.cs)	(revision 826)
@@ -1,21 +1,30 @@
-//-----------------------------------------------------------------------
-// <copyright file="DtoDocumentAssembler.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>B. Faassen</author>
-// <email>barry.faassen@deltares.nl</email>
-// <date>25-3-2009</date>
-// <summary>
-//  Conatins a base class for creatin input and output domain objects
-//  from xml documents
-// </summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// Default implementation for the <see cref="IDtoAssembler"/> interface
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs
===================================================================
diff -u -r781 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs	(.../Geometry2DTo1DConverter.cs)	(revision 781)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs	(.../Geometry2DTo1DConverter.cs)	(revision 826)
@@ -24,7 +24,7 @@
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using Deltares.DamEngine.Calculators.Stability;
 using Deltares.DamEngine.Data.Geotechnics;
 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapperTests.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapperTests.cs	(.../DamMacroStabilityKernelWrapperTests.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapperTests.cs	(.../DamMacroStabilityKernelWrapperTests.cs)	(revision 826)
@@ -26,8 +26,9 @@
 using System.Linq;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityInwards;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Standard.Logging;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 826)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityInwards;
 using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityOutwards;
 using Deltares.DamEngine.Calculators.KernelWrappers.DamPipingBligh;
 using Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/Common.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/Common.cs	(.../Common.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/Common.cs	(.../Common.cs)	(revision 826)
@@ -1,8 +1,29 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.IO;
 using System.Reflection;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     public static class Common
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/IDtoAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/IDtoAssembler.cs	(.../IDtoAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/IDtoAssembler.cs	(.../IDtoAssembler.cs)	(revision 826)
@@ -1,16 +1,28 @@
-//-----------------------------------------------------------------------
-// <copyright file="IDtoAssembler.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>B. Faassen</author>
-// <email>barry.faassen@deltares.nl</email>
-// <date>9-2-2009</date>
-// <summary>Defines a contract for the data transfer object assembler</summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System.Collections.Generic;
 using System.Xml.Linq;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// Defines the contract of a data transfer object (dto) assembler
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/AssemblyExtensions.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/AssemblyExtensions.cs	(.../AssemblyExtensions.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/AssemblyExtensions.cs	(.../AssemblyExtensions.cs)	(revision 826)
@@ -23,7 +23,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     public static class AssemblyExtensions
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 826)
@@ -25,14 +25,14 @@
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.General;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using Deltares.DamEngine.Calculators.Properties;
-using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Design;
+using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Logging;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     public static class MStabXmlDoc
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/EmbeddedResourceNotFoundException.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/EmbeddedResourceNotFoundException.cs	(.../EmbeddedResourceNotFoundException.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/EmbeddedResourceNotFoundException.cs	(.../EmbeddedResourceNotFoundException.cs)	(revision 826)
@@ -23,7 +23,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     [Serializable]
     public class EmbeddedResourceNotFoundException : Exception
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/FileIdentification.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/FileIdentification.cs	(.../FileIdentification.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/FileIdentification.cs	(.../FileIdentification.cs)	(revision 826)
@@ -1,20 +1,28 @@
-//-----------------------------------------------------------------------
-// <copyright file="FieldIdentification.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>B. Faassen</author>
-// <email>barry.faassen@deltares.nl</email>
-// <date>9-2-2009</date>
-// <summary>
-//  Contains a domain class that can be used to add file info meta data 
-//  to a data transfer object
-// </summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
 using System;
 using System.Reflection;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// This class contains general properties which can be used in the header of an xml file or in
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoHelperServices.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoHelperServices.cs	(.../DtoHelperServices.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoHelperServices.cs	(.../DtoHelperServices.cs)	(revision 826)
@@ -1,11 +1,32 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// 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.Reflection;
 using System.Xml.Linq;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// Extnesion helper methods
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MacroStabilityException.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MacroStabilityException.cs	(.../MacroStabilityException.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MacroStabilityException.cs	(.../MacroStabilityException.cs)	(revision 826)
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     public class MacroStabilityException : Exception
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/SoilProfileAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/SoilProfileAssembler.cs	(.../SoilProfileAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/SoilProfileAssembler.cs	(.../SoilProfileAssembler.cs)	(revision 826)
@@ -25,7 +25,7 @@
 using System.Xml.Linq;
 using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DAMMstabGeometry2DSectionAssemblerTest.cs
===================================================================
diff -u -r769 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DAMMstabGeometry2DSectionAssemblerTest.cs	(.../DAMMstabGeometry2DSectionAssemblerTest.cs)	(revision 769)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DAMMstabGeometry2DSectionAssemblerTest.cs	(.../DAMMstabGeometry2DSectionAssemblerTest.cs)	(revision 826)
@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.General;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using Deltares.DamEngine.Data.Geotechnics;
 using NUnit.Framework;
 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/FileIdentificationAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/FileIdentificationAssembler.cs	(.../FileIdentificationAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/FileIdentificationAssembler.cs	(.../FileIdentificationAssembler.cs)	(revision 826)
@@ -1,6 +1,27 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System.Xml.Linq;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     public class FileIdentificationAssembler : IDtoAssembler<FileIdentification>
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 826)
@@ -117,7 +117,7 @@
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\Assemblers\SoilLayerAssembler.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\Assemblers\SoilProfileAssembler.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\DamMacroStabilityInput.cs" />
-    <Compile Include="KernelWrappers\DamMacroStability\DamMacroStabilityInwardsKernelWrapper.cs" />
+    <Compile Include="KernelWrappers\DamMacroStabilityInwards\DamMacroStabilityInwardsKernelWrapper.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\DamMacroStabilityOutput.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\DamMacroStabilityOutputItem.cs" />
     <Compile Include="KernelWrappers\DamMacroStabilityCommon\DGSMStabDAMInterface.cs" />
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutput.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutput.cs	(.../DamMacroStabilityOutput.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutput.cs	(.../DamMacroStabilityOutput.cs)	(revision 826)
@@ -21,10 +21,9 @@
 
 using System.Collections.Generic;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
-using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Standard.Calculation;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     /// <summary>
     /// Class holding all DamMacroStabilityOutput.
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(revision 826)
@@ -0,0 +1,360 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Xml.Linq;
+using Deltares.DamEngine.Calculators.KernelWrappers.Common;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon;
+using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
+using Deltares.DamEngine.Calculators.Properties;
+using Deltares.DamEngine.Data.Design;
+using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Data.Standard.Logging;
+using Deltares.DamMacroStability.Calculator;
+
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityInwards
+{
+    public class DamMacroStabilityInwardsKernelWrapper : IKernelWrapper
+    {
+        private const string DamMacroStabilityFolder = @".\KernelWrappers\DamMacroStability";
+        private const string DGeoStabilityExe = "DGeoStability.exe";
+
+
+        /// <summary>
+        /// Gets or sets the failure mechanisme paramaters for mstab.
+        /// </summary>
+        /// <value>
+        /// The failure mechanisme paramaters mstab.
+        /// </value>
+        public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab { get; set; }
+
+        /// <summary>
+        /// Prepares the specified dam kernel input.
+        /// </summary>
+        /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="iterationIndex">The number of the current iteration.</param>
+        /// <param name="kernelDataInput">The kernel data input.</param>
+        /// <param name="kernelDataOutput">The kernel data output</param>
+        /// <returns>
+        /// Result of the prepare
+        /// </returns>
+        public PrepareResult Prepare(DamKernelInput damKernelInput, int iterationIndex, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput)
+        {
+            var damMacroStabilityOutput = new DamMacroStabilityOutput()
+            {
+                StabilityOutputItems = new List<DamMacroStabilityOutputItem>(),
+                CalculationResult = CalculationResult.NoRun
+            };
+            kernelDataOutput = damMacroStabilityOutput;
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
+            {
+                var model = FailureMechanismeParamatersMStab.MStabParameters.Model;
+                if (model == MStabModelType.BishopUpliftVan)
+                {
+                    // if current model is BishopUpliftVan then set to Bishop for proper name/path for inputfile
+                    model = MStabModelType.Bishop;
+                }
+                var damMacroStabilityInput = new DamMacroStabilityInput()
+                {
+                    DGeoStabilityExePath = Path.Combine(DamMacroStabilityFolder, DGeoStabilityExe),
+                    DGeoStabilityInputFileName = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex, model),
+                    FailureMechanismeParamatersMStab = FailureMechanismeParamatersMStab
+                };
+
+                // Check the model to see what is to be calculted and how many calculations are required
+                switch (FailureMechanismeParamatersMStab.MStabParameters.Model)
+                {
+                    case MStabModelType.Bishop:
+                    case MStabModelType.UpliftVan:
+                    {
+                        // prepare the requested calc
+                        break;
+                    }
+                    case MStabModelType.BishopUpliftVan:
+                    {
+                        // see if uplift is required
+                        // if so, both upliftvan and bishop are to be prepared, calculated and worst case is to be determined
+                        damMacroStabilityInput.DGeoStabilityInputFileNameSecondModel = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex, MStabModelType.UpliftVan);
+                        // if not, only Bishop calculation so leave SecondModel empty.
+                        break;
+                    }
+                    default:
+                    {
+                        //model not implemented error
+                        break;
+                    }
+                }
+                
+                kernelDataInput = damMacroStabilityInput;
+                
+                // Write xml file
+                XDocument xmlDocument = CreateMstabDamXmlDocument(damKernelInput, damMacroStabilityInput);
+
+                // Use xml file to create sti file
+                CreateStiFile(xmlDocument);
+
+                return PrepareResult.Successful;
+            }
+            kernelDataInput = null;
+            return PrepareResult.NotRelevant;
+        }
+
+        /// <summary>
+        /// Validates the specified kernel data input.
+        /// </summary>
+        /// <param name="kernelDataInput">The kernel data input.</param>
+        /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="messages">The return messages.</param>
+        /// <returns>
+        /// Number of errors that prevent a calculation
+        /// </returns>
+        public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
+        {
+            var calculator = StabilityCalculator(kernelDataInput);
+            //ToDo zant calculator has no Validate. 
+//            List<string> kernelMessages = calculator.Validate();
+            messages = new List<LogMessage>();
+//            foreach (string stringMessage in kernelMessages)
+//            {
+//                messages.Add(new LogMessage() { Message = stringMessage, MessageType = LogMessageType.Error });
+//            }
+            return messages.Count;
+        }
+
+        /// <summary>
+        /// Executes the kernel.
+        /// </summary>
+        /// <param name="kernelDataInput">The kernel data input.</param>
+        /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="messages">The return messages.</param>
+        public void Execute(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
+        {
+            DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput) kernelDataOutput;
+            messages = new List<LogMessage>();
+            var input = (DamMacroStabilityInput)kernelDataInput;
+            
+            // When there are two calculations to be performed (BishopUpliftVan), make sure the first one is Bishop 
+            if (!string.IsNullOrEmpty(input.DGeoStabilityInputFileNameSecondModel))
+            {
+                input.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.Bishop;
+            }
+            
+            // start (first) calculation
+            var stabilityOutputItem = ExcecuteCalculation(kernelDataInput);
+            if (stabilityOutputItem != null)
+            {
+                damMacroStabilityOutput.StabilityOutputItems.Add(stabilityOutputItem);
+            }
+            
+            // now check if second calculation for BishopUpliftVan is needed, if so perform it.
+            if (!string.IsNullOrEmpty(input.DGeoStabilityInputFileNameSecondModel))
+            {
+                var inputFileName = input.DGeoStabilityInputFileName;
+                // set proper name and model
+                input.DGeoStabilityInputFileName = input.DGeoStabilityInputFileNameSecondModel;
+                input.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.UpliftVan;
+                try
+                {
+                    var stabilityOutputItemSecondModel = ExcecuteCalculation(kernelDataInput);
+                    if (stabilityOutputItemSecondModel != null)
+                    {
+                        damMacroStabilityOutput.StabilityOutputItems.Add(stabilityOutputItemSecondModel);
+                    }
+                }
+                finally
+                {
+                    // reset name and model
+                    input.DGeoStabilityInputFileName = inputFileName;
+                    input.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan;
+                }
+            }
+        }
+
+        private static DamMacroStabilityOutputItem ExcecuteCalculation(IKernelDataInput kernelDataInput)
+        {
+            var calculator = StabilityCalculator(kernelDataInput);
+            calculator.Calculate();
+
+            // get (first) results
+            var results = calculator.GetResults();
+            if (results.Count > 0)
+            {
+                var stabilityOutputItem = new DamMacroStabilityOutputItem();
+                var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone
+                {
+                    SafetyFactor = results[0].Zone1.SafetyFactor,
+                    CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate,
+                    CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate,
+                    EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate,
+                    ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate
+                };
+                stabilityOutputItem.Zone1Results = zone1;
+                if (results[0].Zone2 != null)
+                {
+                    var zone2 = new DamMacroStabilityOutputItem.ResultsSingleZone
+                    {
+                        SafetyFactor = results[0].Zone1.SafetyFactor,
+                        CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate,
+                        CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate,
+                        EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate,
+                        ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate
+                    };
+                    stabilityOutputItem.Zone2Results = zone2;
+                }
+                return stabilityOutputItem;
+            }
+            return null;
+        }
+
+        internal XDocument CreateMstabDamXmlDocument(DamKernelInput damKernelInput, DamMacroStabilityInput kernelDataInput)
+        {
+            const string testFolder = @"..\..\Deltares.DamEngine.Calculators.Tests\Files\MacroStability";
+            //            var stabilityProjectFilename = Path.Combine(testFolder, "test.sti");
+            // var soilDbName = 
+            
+            var stabilityProjectFilename = kernelDataInput.DGeoStabilityInputFileName;
+            var scenario = damKernelInput.DesignScenario;
+            var subSoilScenario = damKernelInput.SubSoilScenario;
+            var riverLevel = scenario.RiverLevel;
+            var surfaceLine = scenario.Location.SurfaceLine;
+            var trafficLoad = scenario.Location.StabilityOptions.TrafficLoad;
+            var requiredSafetyFactor = scenario.RequiredSafetyFactorStabilityInnerSlope;
+            if (requiredSafetyFactor == null)
+            {
+                throw new MacroStabilityException("Required safety factor must be specified");
+            }
+            List<LogMessage> errorMessages;
+            
+            // ToDo zant 
+            scenario.Location.StabilityOptions.MapForSoilGeometries2D = testFolder;
+            scenario.Location.SoildatabaseName = Path.Combine(testFolder, "DAM Tutorial Design0.soilmaterials.mdb");
+            scenario.Location.DikeEmbankmentMaterial = "dijksmateriaal_klei";
+
+            XDocument mstabXml = MStabXmlDoc.CreateMStabXmlDoc(stabilityProjectFilename, scenario, subSoilScenario, 
+                riverLevel, null, surfaceLine, trafficLoad, requiredSafetyFactor.Value,
+                kernelDataInput.FailureMechanismeParamatersMStab, out errorMessages);
+            mstabXml.Save(stabilityProjectFilename + ".xml");
+
+            return mstabXml;
+        }
+
+        internal void CreateStiFile(XDocument xmlDocument)
+        {
+            DGSMStabDAMInterface mstabDamDll = new DGSMStabDAMInterface();
+            var result = mstabDamDll.CreateProjectFile(xmlDocument.ToString());
+            if (result > 0)
+            {
+                string errorMessage = mstabDamDll.ErrorMessage();
+                throw new MacroStabilityException(errorMessage);
+            }
+        }
+
+        internal static StabilityCalculator StabilityCalculator(IKernelDataInput kernelDataInput)
+        {
+            DamMacroStabilityInput damMacroStabilityInput = kernelDataInput as DamMacroStabilityInput;
+            if (damMacroStabilityInput == null)
+            {
+                throw new NoNullAllowedException(Resources.DamMacroStabilityKernelWrapper_StabilityCalculator_NoInputObjectDefinedForMacroStability);
+            }
+            var calculator = new StabilityCalculator
+            {
+                ProjectName = damMacroStabilityInput.DGeoStabilityInputFileName,
+                DGeoStabilityExePath = damMacroStabilityInput.DGeoStabilityExePath
+            };
+            return calculator;
+        }
+
+        /// <summary>
+        /// Fills the design results with the kernel output.
+        /// </summary>
+        /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="resultMessage">The result message.</param>
+        /// <param name="designResults">The design results.</param>
+        /// <exception cref="NoNullAllowedException"></exception>
+        public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, string resultMessage, out List<DesignResult> designResults)
+        {
+            DamMacroStabilityOutput damMacroStabilityOutput = kernelDataOutput as DamMacroStabilityOutput;
+            if (damMacroStabilityOutput == null)
+            {
+                throw new NoNullAllowedException(Resources.DamMacroStabilityKernelWrapper_PostProcess_NoOutputObjectDefinedForSellmeijer4Forces);
+            }
+
+            // TODO: this is just fake data
+            string soilProfile2DName = "soilProfile2DName";
+            var d = new DamFailureMechanismeCalculationSpecification();
+            var s = new DesignScenario
+            {
+                Location = new Location()
+            };
+            var p = new SoilProfile1D();
+            designResults = new List<DesignResult>();
+            var designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption);
+            if (damMacroStabilityOutput.StabilityOutputItems.Count > 0)
+            {
+                var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[0];
+                if (damMacroStabilityOutputItem != null)
+                {
+                    FillDesignResult(damMacroStabilityOutputItem, designResult);
+                    designResults.Add(designResult);
+                }
+            }
+            if (damMacroStabilityOutput.StabilityOutputItems.Count > 1)
+            {
+                // Todo this next line is still fake!
+                designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption);
+                var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[1];
+                if (damMacroStabilityOutputItem != null)
+                {
+                    FillDesignResult(damMacroStabilityOutputItem, designResult);
+                }
+                designResults.Add(designResult);
+                //Todo combine results from bishop/upliftvan and add these too? check in old Dam.
+            }            
+        }
+
+        private static void FillDesignResult(DamMacroStabilityOutputItem damMacroStabilityOutputItem, DesignResult designResult)
+        {
+            var stabilityDesignResults = new StabilityDesignResults
+            {
+                Zone1SafetyFactor = damMacroStabilityOutputItem.Zone1Results.SafetyFactor,
+                LocalZone1EntryPointX = damMacroStabilityOutputItem.Zone1Results.EntryPointXCoordinate,
+                LocalZone1ExitPointX = damMacroStabilityOutputItem.Zone1Results.ExitPointXCoordinate
+            };
+            stabilityDesignResults.SafetyFactor = stabilityDesignResults.Zone1SafetyFactor;
+            if (damMacroStabilityOutputItem.Zone2Results != null)
+            {
+                var zone2 = (DamMacroStabilityOutputItem.ResultsSingleZone) damMacroStabilityOutputItem.Zone2Results;
+                stabilityDesignResults.Zone2SafetyFactor = zone2.SafetyFactor;
+                stabilityDesignResults.LocalZone2EntryPointX = zone2.EntryPointXCoordinate;
+                stabilityDesignResults.LocalZone2ExitPointX = zone2.ExitPointXCoordinate;
+                stabilityDesignResults.SafetyFactor = Math.Min(damMacroStabilityOutputItem.Zone1Results.SafetyFactor, zone2.SafetyFactor);
+            }
+            designResult.StabilityDesignResults = stabilityDesignResults;
+        }
+    }
+}
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs	(.../DamMStabAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs	(.../DamMStabAssembler.cs)	(revision 826)
@@ -1,28 +1,38 @@
-//-----------------------------------------------------------------------
-// <copyright file="DamMStabAssembler.cs" company="Deltares">
-//  Copyright (c) 2010 Deltares. All rights reserved.
-// </copyright>
-// <author>B.S.T.I.M. The</author>
-// <email>tom.the@deltares.nl</email>
-// <date>18-05-2010</date>
-// <summary>xml file creator for DGSMStabDam.dll</summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.Schema;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.PlLines;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.Data.Standard;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-    using System.Xml.Linq;
-    using System.Xml.Schema;
-
     /// <summary>
     /// 
     /// </summary>    
@@ -630,9 +640,9 @@
             // DAMMStabDefinition
             XmlSchemaSet schemas = new XmlSchemaSet();
 
-            Stream xsdStream = Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePath);
+            Stream xsdStream = DamMacroStabilityCommon.Assemblers.Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePath);
             schemas.Add(XmlElementNamespace, XmlReader.Create(xsdStream));
-            xsdStream = Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePathInput);
+            xsdStream = DamMacroStabilityCommon.Assemblers.Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePathInput);
             schemas.Add(XmlElementNamespaceInput, XmlReader.Create(xsdStream));
 
             Assembly assembly;
@@ -650,7 +660,7 @@
                     (from string name in assembly.GetManifestResourceNames()
                      where name.EndsWith(schemaFileName)
                      select name).Single();
-                xsdStream = Common.GetEmbeddedFile(assembly, resourceName);
+                xsdStream = DamMacroStabilityCommon.Assemblers.Common.GetEmbeddedFile(assembly, resourceName);
                 schemas.Add(fileIdentificationAssembler.ElementNamespace, XmlReader.Create(xsdStream));
             }
 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/ObjectExtensions.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/ObjectExtensions.cs	(.../ObjectExtensions.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/ObjectExtensions.cs	(.../ObjectExtensions.cs)	(revision 826)
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     public static class ObjectExtensions
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs	(.../DamMacroStabilityOutputItem.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs	(.../DamMacroStabilityOutputItem.cs)	(revision 826)
@@ -22,7 +22,7 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Standard.Calculation;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     /// <summary>
     /// Class for a single set of DamMacroStabilityOutput parameters
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssemblerException.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssemblerException.cs	(.../DtoAssemblerException.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssemblerException.cs	(.../DtoAssemblerException.cs)	(revision 826)
@@ -1,7 +1,28 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     [Serializable]
     public class DtoAssemblerException : Exception
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMapping.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMapping.cs	(.../DtoPropertyAttributeMapping.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMapping.cs	(.../DtoPropertyAttributeMapping.cs)	(revision 826)
@@ -1,19 +1,27 @@
-//-----------------------------------------------------------------------
-// <copyright file="DtoPropertyAttributeMapping.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>B. Faassen</author>
-// <email>barry.faassen@deltares.nl</email>
-// <date>9-2-2009</date>
-// <summary>
-//  Defines a mapping class which can be used in the DtoAssemler for 
-//  creating mappings between class properties and xml attributes
-// </summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
 using System;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// Importance or the requiremen for a value in the domain object 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyMapException.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyMapException.cs	(.../DtoPropertyMapException.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyMapException.cs	(.../DtoPropertyMapException.cs)	(revision 826)
@@ -1,7 +1,28 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     [Serializable]
     public class DtoPropertyMapException : Exception
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs
===================================================================
diff -u -r769 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs	(.../Geometry2DDataCreator.cs)	(revision 769)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs	(.../Geometry2DDataCreator.cs)	(revision 826)
@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using Deltares.DamEngine.Calculators.Stability;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.PlLines;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DamMStabGeometry2DDataAssemblerTest.cs
===================================================================
diff -u -r769 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DamMStabGeometry2DDataAssemblerTest.cs	(.../DamMStabGeometry2DDataAssemblerTest.cs)	(revision 769)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/DamMStabGeometry2DDataAssemblerTest.cs	(.../DamMStabGeometry2DDataAssemblerTest.cs)	(revision 826)
@@ -21,7 +21,7 @@
 
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.General;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamMacroStability
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMap.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 826)
@@ -1,20 +1,30 @@
-//-----------------------------------------------------------------------
-// <copyright file="DtoPropertyAttributeMap.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>B. Faassen</author>
-// <email>barry.faassen@deltares.nl</email>
-// <date>9-2-2009</date>
-// <summary>
-//  Defines a type safe collection of DtoPropertyAttributeMapping items
-// </summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// The property bag defines a dynamic property collection (dictionary)
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs
===================================================================
diff -u -r803 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 803)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStability/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 826)
@@ -24,8 +24,8 @@
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGSMStabDAMInterface.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGSMStabDAMInterface.cs	(.../DGSMStabDAMInterface.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGSMStabDAMInterface.cs	(.../DGSMStabDAMInterface.cs)	(revision 826)
@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     class DGSMStabDAMInterface : DgsStandardDllInterface 
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityUtils.cs
===================================================================
diff -u -r822 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityUtils.cs	(.../DamMacroStabilityUtils.cs)	(revision 822)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityUtils.cs	(.../DamMacroStabilityUtils.cs)	(revision 826)
@@ -1,17 +1,44 @@
-using System;
-using System.Collections.Generic;
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
 using Deltares.DamEngine.Data.General;
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
+    /// <summary>
+    /// Utility methods for DamMacroStability
+    /// </summary>
     public class DamMacroStabilityUtils
     {
+        /// <summary>
+        /// Gets the name of the stability input file.
+        /// </summary>
+        /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="iterationIndex">Index of the iteration.</param>
+        /// <param name="model">The model.</param>
+        /// <returns></returns>
         public static string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex,
             MStabModelType model)
         {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r822 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 822)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 826)
@@ -23,10 +23,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability;
 using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
 using Deltares.DamEngine.Calculators.Properties;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DDataAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DDataAssembler.cs	(.../DAMMStabGeometry2DDataAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DDataAssembler.cs	(.../DAMMStabGeometry2DDataAssembler.cs)	(revision 826)
@@ -19,14 +19,12 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.General;
-using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/MissingRequiredFieldValueException.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/MissingRequiredFieldValueException.cs	(.../MissingRequiredFieldValueException.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/MissingRequiredFieldValueException.cs	(.../MissingRequiredFieldValueException.cs)	(revision 826)
@@ -1,7 +1,28 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 { 
     [Serializable]
     public class MissingRequiredValueException : Exception
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DSectionAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DSectionAssembler.cs	(.../DAMMStabGeometry2DSectionAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DSectionAssembler.cs	(.../DAMMStabGeometry2DSectionAssembler.cs)	(revision 826)
@@ -26,7 +26,7 @@
 using Deltares.DamEngine.Calculators.General;
 using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     /// <summary>
     /// 
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssemblerConversionException.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssemblerConversionException.cs	(.../DtoAssemblerConversionException.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssemblerConversionException.cs	(.../DtoAssemblerConversionException.cs)	(revision 826)
@@ -1,7 +1,28 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Runtime.Serialization;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     [Serializable]
     public class DtoAssemblerConversionException : Exception
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssembler.cs	(.../DtoAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DtoAssembler.cs	(.../DtoAssembler.cs)	(revision 826)
@@ -1,22 +1,32 @@
-//-----------------------------------------------------------------------
-// <copyright file="DtoAssembler.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>B. Faassen</author>
-// <email>barry.faassen@deltares.nl</email>
-// <date>9-2-2009</date>
-// <summary>
-//  Conatins a base class for data transfer object assembler
-// </summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// 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.Reflection;
 using System.Xml.Linq;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
 
     #region DtoAssembler<TDomainObject, TDataTransferObject> definition
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/SoilLayerAssembler.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/SoilLayerAssembler.cs	(.../SoilLayerAssembler.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/SoilLayerAssembler.cs	(.../SoilLayerAssembler.cs)	(revision 826)
@@ -23,7 +23,7 @@
 using System.Xml.Linq;
 using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon.Assemblers
 {
     public class SoilLayerAssembler : DtoAssembler<SoilLayer1D>
     {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGSStandardDLLInterface.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGSStandardDLLInterface.cs	(.../DGSStandardDLLInterface.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DGSStandardDLLInterface.cs	(.../DGSStandardDLLInterface.cs)	(revision 826)
@@ -21,7 +21,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 
 {
     /// <summary>
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs
===================================================================
diff -u -r824 -r826
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs	(.../DamMacroStabilityInput.cs)	(revision 824)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs	(.../DamMacroStabilityInput.cs)	(revision 826)
@@ -22,7 +22,7 @@
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
 using Deltares.DamEngine.Data.General;
 
-namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     /// <summary>
     /// Class implementing the kernel input data interface for Macrostabilty.
Fisheye: Tag 826 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityInwardsKernelWrapper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?