Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -r833a4059dc394d33732c5432086d4a8be112932f -r8cf507b4db04c91cd5bc5ed243616f093a3016da
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj)	(revision 833a4059dc394d33732c5432086d4a8be112932f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj)	(revision 8cf507b4db04c91cd5bc5ed243616f093a3016da)
@@ -56,23 +56,23 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="MacroStabilityInwardsCalculatorFactoryConfig.cs" />
-    <Compile Include="UpliftVanCalculatorResultTestFactory.cs" />
-    <Compile Include="Result\UpliftVanGridResultTestFactory.cs" />
-    <Compile Include="Result\UpliftVanSlidingCircleResultTestFactory.cs" />
-    <Compile Include="Result\UpliftVanCalculatorResultHelper.cs" />
-    <Compile Include="Result\UpliftVanSlidingCurveResultTestFactory.cs" />
-    <Compile Include="SlidingDualCircleTestFactory.cs" />
-    <Compile Include="SlipPlaneUpliftVanTestFactory.cs" />
-    <Compile Include="Kernel\MacroStabilityInwardsKernelFactoryConfig.cs" />
+    <Compile Include="Calculators\MacroStabilityInwardsCalculatorFactoryConfig.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorResultTestFactory.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanGridResultTestFactory.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCircleResultTestFactory.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorResultHelper.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCurveResultTestFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\Output\SlidingDualCircleTestFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\Output\SlipPlaneUpliftVanTestFactory.cs" />
+    <Compile Include="Kernels\MacroStabilityInwardsKernelFactoryConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Kernel\TestMacroStabilityInwardsKernelFactory.cs" />
-    <Compile Include="Kernel\UpliftVanKernelStub.cs" />
-    <Compile Include="UpliftVanCalculatorStub.cs" />
-    <Compile Include="TestMacroStabilityInwardsCalculatorFactory.cs" />
-    <Compile Include="WTIStabilityGeometryCurveComparer.cs" />
-    <Compile Include="WTIStabilityGeometryLoopComparer.cs" />
-    <Compile Include="WTIStabilityPoint2DComparer.cs" />
+    <Compile Include="Kernels\TestMacroStabilityInwardsKernelFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\UpliftVanKernelStub.cs" />
+    <Compile Include="Calculators\UpliftVan\UpliftVanCalculatorStub.cs" />
+    <Compile Include="Calculators\TestMacroStabilityInwardsCalculatorFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\Input\WTIStabilityGeometryCurveComparer.cs" />
+    <Compile Include="Kernels\UpliftVan\Input\WTIStabilityGeometryLoopComparer.cs" />
+    <Compile Include="Kernels\UpliftVan\Input\WTIStabilityPoint2DComparer.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">