Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs
===================================================================
diff -u -rf2838b78c54529e9b15208b44de854f7760e350f -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision f2838b78c54529e9b15208b44de854f7760e350f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -24,32 +24,32 @@
 using System.ComponentModel;
 using System.Linq;
 using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Converters
 {
     /// <summary>
-    /// Converter to convert <see cref="MacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
+    /// Converter to convert <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
     /// into <see cref="SoilProfile"/>.
     /// </summary>
     internal static class SoilProfileConverter
     {
         /// <summary>
-        /// Converts <see cref="MacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
+        /// Converts <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
         /// into <see cref="SoilProfile"/>.
         /// </summary>
         /// <param name="soilProfile">The soil profile to convert.</param>
         /// <returns>The converted <see cref="SoilProfile"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilProfile"/>
         /// is <c>null</c>.</exception>
         /// <exception cref="InvalidEnumArgumentException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is a valid value but unsupported.</exception>
-        public static SoilProfile Convert(MacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfile)
+        public static SoilProfile Convert(IMacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfile)
         {
             if (soilProfile == null)
             {
@@ -63,22 +63,22 @@
         }
 
         /// <summary>
-        /// Converts <see cref="MacroStabilityInwardsSoilLayerData"/>
+        /// Converts <see cref="IMacroStabilityInwardsSoilLayerData"/>
         /// into <see cref="SoilLayer"/>.
         /// </summary>
         /// <param name="layers">The layers to convert.</param>
         /// <returns>The converted <see cref="SoilLayer"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is a valid value but unsupported.</exception>
-        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<MacroStabilityInwardsSoilLayerUnderSurfaceLine> layers)
+        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<IMacroStabilityInwardsSoilLayerUnderSurfaceLine> layers)
         {
             return layers.Select(l =>
             {
-                MacroStabilityInwardsSoilLayerData data = l.Data;
+                IMacroStabilityInwardsSoilLayerData data = l.Data;
                 return new SoilLayer(l.OuterRing, l.Holes, new SoilLayer.ConstructionProperties
                 {
                     MaterialName = data.MaterialName,
@@ -99,7 +99,7 @@
         }
 
         private static IEnumerable<PreconsolidationStress> ConvertPreconsolidationStresses(
-            IEnumerable<MacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
+            IEnumerable<IMacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
         {
             return preconsolidationStresses.Select(ps => new PreconsolidationStress(
                                                        ps.Location,