Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -r7e9a99c5e23b3b955a2ad505e01ee967985aa0d3 -rf2821a4b299043f78c93fb0acf5851081f96961b
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 7e9a99c5e23b3b955a2ad505e01ee967985aa0d3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision f2821a4b299043f78c93fb0acf5851081f96961b)
@@ -43,30 +43,30 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Creators\SlipPlaneUpliftVanCreator.cs" />
-    <Compile Include="Creators\SoilProfileCreator.cs" />
-    <Compile Include="Creators\StabilityLocationCreator.cs" />
-    <Compile Include="Creators\SurfaceLineCreator.cs" />
-    <Compile Include="IUpliftVanCalculator.cs" />
-    <Compile Include="IMacroStabilityInwardsCalculatorFactory.cs" />
-    <Compile Include="UpliftVanCalculator.cs" />
-    <Compile Include="MacroStabilityInwardsCalculatorFactory.cs" />
-    <Compile Include="UpliftVanCalculatorInput.cs" />
-    <Compile Include="UpliftVanCalculatorResult.cs" />
-    <Compile Include="Creators\SoilCreator.cs" />
-    <Compile Include="Creators\SoilModelCreator.cs" />
-    <Compile Include="Result\UpliftVanGridResult.cs" />
-    <Compile Include="Result\UpliftVanSliceResult.cs" />
-    <Compile Include="Result\UpliftVanSlidingCircleResult.cs" />
-    <Compile Include="Result\UpliftVanSlidingCurveResult.cs" />
+    <Compile Include="Creators\Input\SlipPlaneUpliftVanCreator.cs" />
+    <Compile Include="Creators\Input\SoilProfileCreator.cs" />
+    <Compile Include="Creators\Input\StabilityLocationCreator.cs" />
+    <Compile Include="Creators\Input\SurfaceLineCreator.cs" />
+    <Compile Include="Calculators\UpliftVan\IUpliftVanCalculator.cs" />
+    <Compile Include="Calculators\IMacroStabilityInwardsCalculatorFactory.cs" />
+    <Compile Include="Calculators\UpliftVan\UpliftVanCalculator.cs" />
+    <Compile Include="Calculators\MacroStabilityInwardsCalculatorFactory.cs" />
+    <Compile Include="Calculators\UpliftVan\Input\UpliftVanCalculatorInput.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorResult.cs" />
+    <Compile Include="Creators\Input\SoilCreator.cs" />
+    <Compile Include="Creators\Input\SoilModelCreator.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanGridResult.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSliceResult.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCircleResult.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCurveResult.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Creators\UpliftVanSlidingCurveResultCreator.cs" />
-    <Compile Include="Result\UpliftVanCalculationGridResult.cs" />
-    <Compile Include="Creators\UpliftVanCalculationGridResultCreator.cs" />
-    <Compile Include="Kernel\IMacroStabilityInwardsKernelFactory.cs" />
-    <Compile Include="Kernel\IUpliftVanKernel.cs" />
-    <Compile Include="Kernel\MacroStabilityInwardsKernelWrapperFactory.cs" />
-    <Compile Include="Kernel\UpliftVanKernelWrapper.cs" />
+    <Compile Include="Creators\Output\UpliftVanSlidingCurveResultCreator.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculationGridResult.cs" />
+    <Compile Include="Creators\Output\UpliftVanCalculationGridResultCreator.cs" />
+    <Compile Include="Kernels\IMacroStabilityInwardsKernelFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\IUpliftVanKernel.cs" />
+    <Compile Include="Kernels\MacroStabilityInwardsKernelWrapperFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\UpliftVanKernelWrapper.cs" />
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>