Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs
===================================================================
diff -u -r3522 -r3840
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs	(.../FillEngineFromMacroStabilityWrapperInput.cs)	(revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs	(.../FillEngineFromMacroStabilityWrapperInput.cs)	(revision 3840)
@@ -30,9 +30,9 @@
 using HeadLine = Deltares.DamEngine.Data.Geometry.HeadLine;
 using Soil = Deltares.DamEngine.Data.Geotechnics.Soil;
 using SurfaceLine2 = Deltares.DamEngine.Data.Geotechnics.SurfaceLine2;
-using KernelWaternet = Deltares.MacroStability.CSharpWrapper.Waternet;
-using KernelHeadLine = Deltares.MacroStability.CSharpWrapper.HeadLine;
-using KernelWaternetLine = Deltares.MacroStability.CSharpWrapper.WaternetLine;
+using KernelWaternet = Deltares.MacroStability.CSharpWrapper.Water.Waternet;
+using KernelHeadLine = Deltares.MacroStability.CSharpWrapper.Water.HeadLine;
+using KernelWaternetLine = Deltares.MacroStability.CSharpWrapper.Water.WaternetLine;
 using WaternetLine = Deltares.DamEngine.Data.Geometry.WaternetLine;
 using KernelUpliftVanCalculationGrid = Deltares.MacroStability.CSharpWrapper.UpliftVanCalculationGrid;
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r3807 -r3840
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3807)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3840)
@@ -29,13 +29,14 @@
 using Deltares.MacroStability.CSharpWrapper;
 using Waternet = Deltares.DamEngine.Data.Geometry.Waternet;
 using Deltares.MacroStability.CSharpWrapper.Input;
+using Deltares.MacroStability.CSharpWrapper.Water;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
 using KernelUpliftVanCalculationGrid = Deltares.MacroStability.CSharpWrapper.UpliftVanCalculationGrid;
-using KernelWaternet = Deltares.MacroStability.CSharpWrapper.Waternet;
+using KernelWaternet = Deltares.MacroStability.CSharpWrapper.Water.Waternet;
 using KernelMacroStabilityInput = Deltares.MacroStability.CSharpWrapper.Input.MacroStabilityInput;
 using KernelPoint2D = Deltares.MacroStability.CSharpWrapper.Point2D;
-using KernelWaternetLine = Deltares.MacroStability.CSharpWrapper.WaternetLine;
-using KernelHeadLine = Deltares.MacroStability.CSharpWrapper.HeadLine;
+using KernelWaternetLine = Deltares.MacroStability.CSharpWrapper.Water.WaternetLine;
+using KernelHeadLine = Deltares.MacroStability.CSharpWrapper.Water.HeadLine;
 
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo