Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r860a38c705705658e91b43c1e813b63205bbbfa8 -rde737ee4b24659d188bb137d385572159bc099ff
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 860a38c705705658e91b43c1e813b63205bbbfa8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision de737ee4b24659d188bb137d385572159bc099ff)
@@ -42,28 +42,28 @@
     <Compile Include="Data\HydraRingDikeSection.cs" />
     <Compile Include="Data\HydraRingProfilePoint.cs" />
     <Compile Include="Service\HydraRingCalculationService.cs" />
-    <Compile Include="Service\Hydraulics\AssessmentLevelCalculationInput.cs" />
-    <Compile Include="Base\HydraRingCalculationInput.cs" />
+    <Compile Include="Data\Input\Hydraulics\AssessmentLevelCalculationInput.cs" />
+    <Compile Include="Data\Input\HydraRingCalculationInput.cs" />
     <Compile Include="IO\HydraRingSettingsCsvReader.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Settings\VariableDefaults.cs" />
-    <Compile Include="Settings\VariableDefaultsProvider.cs" />
+    <Compile Include="Data\Defaults\VariableDefaults.cs" />
+    <Compile Include="Providers\VariableDefaultsProvider.cs" />
     <Compile Include="Data\HydraRingDistributionType.cs" />
     <Compile Include="Data\HydraRingDeviationType.cs" />
     <Compile Include="Data\HydraRingVariable.cs" />
-    <Compile Include="Settings\FailureMechanismDefaults.cs" />
-    <Compile Include="Settings\FailureMechanismDefaultsProvider.cs" />
-    <Compile Include="Settings\FailureMechanismSettings.cs" />
-    <Compile Include="Settings\FailureMechanismSettingsProvider.cs" />
-    <Compile Include="Settings\SubMechanismSettingsProvider.cs" />
+    <Compile Include="Data\Defaults\FailureMechanismDefaults.cs" />
+    <Compile Include="Providers\FailureMechanismDefaultsProvider.cs" />
+    <Compile Include="Data\Settings\FailureMechanismSettings.cs" />
+    <Compile Include="Providers\FailureMechanismSettingsProvider.cs" />
+    <Compile Include="Providers\SubMechanismSettingsProvider.cs" />
     <Compile Include="Data\HydraRingFailureMechanismType.cs" />
-    <Compile Include="Base\HydraRingConfiguration.cs" />
-    <Compile Include="Settings\SubMechanismSettings.cs" />
-    <Compile Include="Base\TargetProbabilityCalculationInput.cs" />
+    <Compile Include="Service\HydraRingConfigurationService.cs" />
+    <Compile Include="Data\Settings\SubMechanismSettings.cs" />
+    <Compile Include="Data\Input\TargetProbabilityCalculationInput.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Data\HydraRingTimeIntegrationSchemeType.cs" />
     <Compile Include="Data\HydraRingUncertaintiesType.cs" />
@@ -312,6 +312,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.