Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs
===================================================================
diff -u -r9540d67453c6a1caf5833d64ab651660dce11595 -rc98e53ce0b3bfc032dc6577ae590830623c98e99
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs	(.../HeightStructureReplaceDataStrategy.cs)	(revision 9540d67453c6a1caf5833d64ab651660dce11595)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs	(.../HeightStructureReplaceDataStrategy.cs)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
@@ -21,13 +21,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.IO.Structures;
-using Ringtoets.Common.Service;
 using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Service;
 
 namespace Ringtoets.HeightStructures.Plugin.FileImporters
 {
@@ -53,10 +51,7 @@
 
         protected override IEnumerable<IObservable> ClearData()
         {
-            return RingtoetsCommonDataSynchronizationService.RemoveAllStructures(
-                FailureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>(),
-                FailureMechanism.HeightStructures,
-                FailureMechanism.SectionResults);
+            return HeightStructuresDataSynchronizationService.RemoveAllStructures(FailureMechanism);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -rc98e53ce0b3bfc032dc6577ae590830623c98e99
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs	(.../HeightStructureUpdateDataStrategy.cs)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs	(.../HeightStructureUpdateDataStrategy.cs)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
@@ -27,9 +27,9 @@
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.Forms;
 using Ringtoets.Common.IO.Structures;
-using Ringtoets.Common.Service;
-using Ringtoets.Common.Util;
 using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Service;
+using Ringtoets.HeightStructures.Util;
 
 namespace Ringtoets.HeightStructures.Plugin.FileImporters
 {
@@ -55,11 +55,7 @@
 
         protected override IEnumerable<IObservable> RemoveObjectAndDependentData(HeightStructure removedObject)
         {
-            return RingtoetsCommonDataSynchronizationService.RemoveStructure(
-                removedObject,
-                FailureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>(),
-                FailureMechanism.HeightStructures,
-                FailureMechanism.SectionResults);
+            return HeightStructuresDataSynchronizationService.RemoveStructure(removedObject, FailureMechanism);
         }
 
         #region Updating Data Functions
@@ -79,9 +75,7 @@
             affectedObjects.AddRange(GetAffectedCalculationsWithHeightStructure(structure)
                                          .Select(c => c.InputParameters));
 
-            affectedObjects.AddRange(StructuresHelper.UpdateCalculationToSectionResultAssignments(
-                                         FailureMechanism.SectionResults,
-                                         FailureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>()));
+            affectedObjects.AddRange(HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(FailureMechanism));
 
             return affectedObjects;
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -rc98e53ce0b3bfc032dc6577ae590830623c98e99
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs	(.../HeightStructureReplaceDataStrategyTest.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs	(.../HeightStructureReplaceDataStrategyTest.cs)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
@@ -27,7 +27,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Exceptions;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.UpdateDataStrategies;
@@ -318,11 +317,11 @@
                 }
             };
 
-            failureMechanism.AddSection(new FailureMechanismSection("SectionResult", new[]
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
                 location
             }));
-            StructuresFailureMechanismSectionResult<HeightStructuresInput> sectionResult = failureMechanism.SectionResults.First();
+            HeightStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults2.First();
             sectionResult.Calculation = calculation;
 
             failureMechanism.HeightStructures.AddRange(new[]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -rc98e53ce0b3bfc032dc6577ae590830623c98e99
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs	(.../HeightStructureUpdateDataStrategyTest.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs	(.../HeightStructureUpdateDataStrategyTest.cs)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
@@ -28,14 +28,13 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.IO.Structures;
-using Ringtoets.Common.Util;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Plugin.FileImporters;
+using Ringtoets.HeightStructures.Util;
 
 namespace Ringtoets.HeightStructures.Plugin.Test.FileImporters
 {
@@ -607,11 +606,9 @@
                 updatedMatchingPoint
             }));
 
-            StructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults,
-                                                                         failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
+            HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism);
+            HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults2.ToArray();
 
-            StructuresFailureMechanismSectionResult<HeightStructuresInput>[] sectionResults = failureMechanism.SectionResults.ToArray();
-
             var strategy = new HeightStructureUpdateDataStrategy(failureMechanism);
 
             // Precondition
@@ -637,7 +634,7 @@
                 sectionResults[1]
             }, affectedObjects);
 
-            sectionResults = failureMechanism.SectionResults.ToArray();
+            sectionResults = failureMechanism.SectionResults2.ToArray();
             Assert.AreEqual(2, sectionResults.Length);
             Assert.IsNull(sectionResults[0].Calculation);
             Assert.AreSame(calculation, sectionResults[1].Calculation);
@@ -673,17 +670,15 @@
                 removedStructure
             }, sourceFilePath);
 
-            failureMechanism.AddSection(new FailureMechanismSection("Section", new[]
+            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
             {
                 originalMatchingPoint,
                 new Point2D(10, 10)
             }));
 
-            StructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism.SectionResults,
-                                                                         failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
+            HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism);
+            HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults2.ToArray();
 
-            StructuresFailureMechanismSectionResult<HeightStructuresInput>[] sectionResults = failureMechanism.SectionResults.ToArray();
-
             var strategy = new HeightStructureUpdateDataStrategy(failureMechanism);
 
             // Precondition
@@ -702,7 +697,7 @@
                 sectionResults[0]
             }, affectedObjects);
 
-            sectionResults = failureMechanism.SectionResults.ToArray();
+            sectionResults = failureMechanism.SectionResults2.ToArray();
             Assert.AreEqual(1, sectionResults.Length);
             Assert.IsNull(sectionResults[0].Calculation);
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj
===================================================================
diff -u -re1a93747d105f27392f4bc0655694810c7d29f4d -rc98e53ce0b3bfc032dc6577ae590830623c98e99
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj	(.../Ringtoets.HeightStructures.Plugin.Test.csproj)	(revision e1a93747d105f27392f4bc0655694810c7d29f4d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj	(.../Ringtoets.HeightStructures.Plugin.Test.csproj)	(revision c98e53ce0b3bfc032dc6577ae590830623c98e99)
@@ -137,6 +137,10 @@
       <Project>{9AF85B2B-8D78-43C5-9542-FBB3A14EAB36}</Project>
       <Name>Ringtoets.HeightStructures.Plugin</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.HeightStructures.Util\Ringtoets.HeightStructures.Util.csproj">
+      <Project>{B60FC9A2-22B5-4E4C-986E-40766B843AB5}</Project>
+      <Name>Ringtoets.HeightStructures.Util</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.HeightStructures.Data.TestUtil\Ringtoets.HeightStructures.Data.TestUtil.csproj">
       <Project>{F67E8AE8-1FF0-4680-9817-99E025CD9FF6}</Project>
       <Name>Ringtoets.HeightStructures.Data.TestUtil</Name>