Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -48,7 +48,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Activities\NewHydraRingActivity.cs" />
+    <Compile Include="Activities\HydraRingActivityBase.cs" />
     <Compile Include="Activities\HydraRingActivity.cs" />
     <Compile Include="Calculator\Factory\HydraRingCalculatorFactory.cs" />
     <Compile Include="Calculator\Factory\IHydraRingCalculatorFactory.cs" />
@@ -61,7 +61,7 @@
     <Compile Include="Calculator\WaveHeightCalculator.cs" />
     <Compile Include="Calculator\DesignWaterLevelCalculator.cs" />
     <Compile Include="Calculator\DikeHeightCalculator.cs" />
-    <Compile Include="Calculator\HydraRingCalculator.cs" />
+    <Compile Include="Calculator\HydraRingCalculatorBase.cs" />
     <Compile Include="Calculator\OvertoppingCalculator.cs" />
     <Compile Include="Data\HydraRingBreakWater.cs" />
     <Compile Include="Data\HydraRingSection.cs" />
@@ -99,14 +99,13 @@
     <Compile Include="IO\HydraulicModelsSettingsColumns.cs" />
     <Compile Include="IO\HydraulicModelsSettingsCsvReader.cs" />
     <Compile Include="IO\NumericsSettingsColumns.cs" />
-    <Compile Include="Parsers\OvertoppingCalculationWaveHeightExceptionParser.cs" />
-    <Compile Include="Parsers\WaveConditionsCalculationExceptionParser.cs" />
-    <Compile Include="Parsers\ExceedanceProbabilityCalculationExceptionParser.cs" />
+    <Compile Include="Parsers\OvertoppingCalculationWaveHeightParser.cs" />
+    <Compile Include="Parsers\WaveConditionsCalculationParser.cs" />
+    <Compile Include="Parsers\ExceedanceProbabilityCalculationParser.cs" />
     <Compile Include="Parsers\HydraRingFileParserException.cs" />
     <Compile Include="Parsers\IHydraRingFileParser.cs" />
     <Compile Include="Parsers\HydraRingOutputFileParser.cs" />
-    <Compile Include="Parsers\ReliabilityIndexCalculationExceptionParser.cs" />
-    <Compile Include="Parsers\WaveConditionsCalculationParser.cs" />
+    <Compile Include="Parsers\ReliabilityIndexCalculationParser.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -134,7 +133,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Data\HydraRingTimeIntegrationSchemeType.cs" />
     <Compile Include="Data\HydraRingUncertaintiesType.cs" />
-    <Compile Include="Parsers\ReliabilityIndexCalculationParser.cs" />
     <Compile Include="Services\HydraRingFileName.cs" />
     <Compile Include="Services\HydraRingInitializationService.cs" />
     <Compile Include="Services\HydraRingProcessFactory.cs" />