Index: src/Deltares.Soilbase/Deltares.Soilbase.csproj
===================================================================
diff -u -r31 -r34
--- src/Deltares.Soilbase/Deltares.Soilbase.csproj	(.../Deltares.Soilbase.csproj)	(revision 31)
+++ src/Deltares.Soilbase/Deltares.Soilbase.csproj	(.../Deltares.Soilbase.csproj)	(revision 34)
@@ -197,14 +197,14 @@
           <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
           <Name>Deltares.Geometry</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj">
-          <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
-          <Name>Deltares.Geographic</Name>
-        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
           <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
           <Name>Deltares.Geotechnics</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj">
+          <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
+          <Name>Deltares.Geographic</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
           <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
           <Name>Deltares.Probabilistic</Name>
@@ -221,13 +221,13 @@
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Geotechnics">
+          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geotechnics">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Probabilistic">
           <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
         </Reference>
Index: src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj
===================================================================
diff -u -r31 -r34
--- src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj	(.../Deltares.DSoilModel.Tests.csproj)	(revision 31)
+++ src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj	(.../Deltares.DSoilModel.Tests.csproj)	(revision 34)
@@ -176,10 +176,18 @@
           <Project>{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}</Project>
           <Name>Deltares.Standard.Maps</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
+          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
+          <Name>Deltares.Standard.Forms.DExpress</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geometry\Deltares.Geometry.csproj">
           <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
           <Name>Deltares.Geometry</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
+          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
+          <Name>Deltares.Geotechnics</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
           <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
           <Name>Deltares.Mathematics</Name>
@@ -188,14 +196,6 @@
           <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
           <Name>Deltares.Geographic</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
-          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
-          <Name>Deltares.Geotechnics</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
-          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
-          <Name>Deltares.Standard.Forms.DExpress</Name>
-        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
           <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
           <Name>Deltares.Probabilistic</Name>
@@ -215,24 +215,24 @@
         <Reference Include="Deltares.Standard.Maps">
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Standard.Forms.DExpress">
+          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Mathematics">
           <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
         </Reference>
         <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard.Forms.DExpress">
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Probabilistic">
           <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
         </Reference>
Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj
===================================================================
diff -u -r31 -r34
--- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 31)
+++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 34)
@@ -183,6 +183,10 @@
           <Project>{09FF663B-6789-4CA6-910E-5C8AB0DE243E}</Project>
           <Name>Deltares.Standard.Forms</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
+          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
+          <Name>Deltares.Standard.Forms.DExpress</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslFormsGeo\sources\Deltares.Geometry.Forms\Deltares.Geometry.Forms.csproj">
           <Project>{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}</Project>
           <Name>Deltares.Geometry.Forms</Name>
@@ -191,10 +195,6 @@
           <Project>{C05D6847-29B0-40DB-A0C6-6328368A6E78}</Project>
           <Name>Deltares.Geotechnics.Forms</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
-          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
-          <Name>Deltares.Standard.Forms.DExpress</Name>
-        </ProjectReference>
       </ItemGroup>
     </When>
     <Otherwise>
@@ -207,15 +207,15 @@
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Standard.Forms.DExpress">
+          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Geometry.Forms">
           <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>
         </Reference>
         <Reference Include="Deltares.Geotechnics.Forms">
           <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geotechnics.Forms.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Standard.Forms.DExpress">
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
-        </Reference>
       </ItemGroup>
     </Otherwise>
   </Choose>
Index: src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj
===================================================================
diff -u -r31 -r34
--- src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj	(.../Deltares.Geotechnics.IO.Tests.csproj)	(revision 31)
+++ src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj	(.../Deltares.Geotechnics.IO.Tests.csproj)	(revision 34)
@@ -168,6 +168,10 @@
           <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
           <Name>Deltares.Geometry</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
+          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
+          <Name>Deltares.Geotechnics</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
           <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
           <Name>Deltares.Mathematics</Name>
@@ -176,10 +180,6 @@
           <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
           <Name>Deltares.Geographic</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
-          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
-          <Name>Deltares.Geotechnics</Name>
-        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
           <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
           <Name>Deltares.Probabilistic</Name>
@@ -200,17 +200,17 @@
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
         </Reference>
         <Reference Include="Deltares.Geographic">
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Probabilistic">
           <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
         </Reference>
Index: src/DSoilModel_Full.sln
===================================================================
diff -u -r31 -r34
--- src/DSoilModel_Full.sln	(.../DSoilModel_Full.sln)	(revision 31)
+++ src/DSoilModel_Full.sln	(.../DSoilModel_Full.sln)	(revision 34)
@@ -6,20 +6,22 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Standard.Maps", "..\extern\DslFormsMap\sources\Deltares.Standard.Maps\Deltares.Standard.Maps.csproj", "{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geometry", "..\extern\DslGeo\sources\Deltares.Geometry\Deltares.Geometry.csproj", "{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Standard.Forms.DExpress", "..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj", "{8AA0B08A-B23F-495D-8496-F715451B2978}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Mathematics", "..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj", "{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Standard.Forms.Maps", "..\extern\DslFormsMap\sources\Deltares.Standard.Forms.Maps\Deltares.Standard.Forms.Maps.csproj", "{581488C1-6C5C-4744-99EC-72EA23010E02}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geographic", "..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj", "{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geometry", "..\extern\DslGeo\sources\Deltares.Geometry\Deltares.Geometry.csproj", "{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geometry.Forms", "..\extern\DslFormsGeo\sources\Deltares.Geometry.Forms\Deltares.Geometry.Forms.csproj", "{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geotechnics", "..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj", "{03031080-1B65-496D-B28C-47EFB176A203}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geotechnics.Forms", "..\extern\DslFormsGeo\sources\Deltares.Geotechnics.Forms\Deltares.Geotechnics.Forms.csproj", "{C05D6847-29B0-40DB-A0C6-6328368A6E78}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Standard.Forms.DExpress", "..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj", "{8AA0B08A-B23F-495D-8496-F715451B2978}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Mathematics", "..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj", "{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geographic", "..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj", "{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Probabilistic", "..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj", "{A9598E77-68A1-429B-B3CD-90AC9A28002D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Soilbase", "Deltares.Soilbase\Deltares.Soilbase.csproj", "{5C29009E-A60B-4F4C-A2D8-D46DD7F2DB0F}"
@@ -84,24 +86,24 @@
 		{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
 		{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}.Release|x86.ActiveCfg = Release|x86
 		{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}.Release|x86.Build.0 = Release|x86
+		{8AA0B08A-B23F-495D-8496-F715451B2978}.Debug|x86.ActiveCfg = Debug|x86
+		{8AA0B08A-B23F-495D-8496-F715451B2978}.Debug|x86.Build.0 = Debug|x86
+		{8AA0B08A-B23F-495D-8496-F715451B2978}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
+		{8AA0B08A-B23F-495D-8496-F715451B2978}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
+		{8AA0B08A-B23F-495D-8496-F715451B2978}.Release|x86.ActiveCfg = Release|x86
+		{8AA0B08A-B23F-495D-8496-F715451B2978}.Release|x86.Build.0 = Release|x86
+		{581488C1-6C5C-4744-99EC-72EA23010E02}.Debug|x86.ActiveCfg = Debug|x86
+		{581488C1-6C5C-4744-99EC-72EA23010E02}.Debug|x86.Build.0 = Debug|x86
+		{581488C1-6C5C-4744-99EC-72EA23010E02}.DebugWithSources|x86.ActiveCfg = Debug|x86
+		{581488C1-6C5C-4744-99EC-72EA23010E02}.DebugWithSources|x86.Build.0 = Debug|x86
+		{581488C1-6C5C-4744-99EC-72EA23010E02}.Release|x86.ActiveCfg = Release|x86
+		{581488C1-6C5C-4744-99EC-72EA23010E02}.Release|x86.Build.0 = Release|x86
 		{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}.Debug|x86.ActiveCfg = Debug|x86
 		{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}.Debug|x86.Build.0 = Debug|x86
 		{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
 		{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
 		{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}.Release|x86.ActiveCfg = Release|x86
 		{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}.Release|x86.Build.0 = Release|x86
-		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Debug|x86.ActiveCfg = Debug|x86
-		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Debug|x86.Build.0 = Debug|x86
-		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
-		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
-		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Release|x86.ActiveCfg = Release|x86
-		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Release|x86.Build.0 = Release|x86
-		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Debug|x86.ActiveCfg = Debug|x86
-		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Debug|x86.Build.0 = Debug|x86
-		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
-		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
-		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Release|x86.ActiveCfg = Release|x86
-		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Release|x86.Build.0 = Release|x86
 		{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}.Debug|x86.ActiveCfg = Debug|x86
 		{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}.Debug|x86.Build.0 = Debug|x86
 		{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
@@ -120,12 +122,18 @@
 		{C05D6847-29B0-40DB-A0C6-6328368A6E78}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
 		{C05D6847-29B0-40DB-A0C6-6328368A6E78}.Release|x86.ActiveCfg = Release|x86
 		{C05D6847-29B0-40DB-A0C6-6328368A6E78}.Release|x86.Build.0 = Release|x86
-		{8AA0B08A-B23F-495D-8496-F715451B2978}.Debug|x86.ActiveCfg = Debug|x86
-		{8AA0B08A-B23F-495D-8496-F715451B2978}.Debug|x86.Build.0 = Debug|x86
-		{8AA0B08A-B23F-495D-8496-F715451B2978}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
-		{8AA0B08A-B23F-495D-8496-F715451B2978}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
-		{8AA0B08A-B23F-495D-8496-F715451B2978}.Release|x86.ActiveCfg = Release|x86
-		{8AA0B08A-B23F-495D-8496-F715451B2978}.Release|x86.Build.0 = Release|x86
+		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Debug|x86.ActiveCfg = Debug|x86
+		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Debug|x86.Build.0 = Debug|x86
+		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
+		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
+		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Release|x86.ActiveCfg = Release|x86
+		{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}.Release|x86.Build.0 = Release|x86
+		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Debug|x86.ActiveCfg = Debug|x86
+		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Debug|x86.Build.0 = Debug|x86
+		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
+		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.DebugWithSources|x86.Build.0 = DebugWithSources|x86
+		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Release|x86.ActiveCfg = Release|x86
+		{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}.Release|x86.Build.0 = Release|x86
 		{A9598E77-68A1-429B-B3CD-90AC9A28002D}.Debug|x86.ActiveCfg = Debug|x86
 		{A9598E77-68A1-429B-B3CD-90AC9A28002D}.Debug|x86.Build.0 = Debug|x86
 		{A9598E77-68A1-429B-B3CD-90AC9A28002D}.DebugWithSources|x86.ActiveCfg = DebugWithSources|x86
Index: src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj
===================================================================
diff -u -r31 -r34
--- src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj	(.../Deltares.Geotechnics.IO.csproj)	(revision 31)
+++ src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj	(.../Deltares.Geotechnics.IO.csproj)	(revision 34)
@@ -197,6 +197,10 @@
           <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
           <Name>Deltares.Geometry</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
+          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
+          <Name>Deltares.Geotechnics</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
           <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
           <Name>Deltares.Mathematics</Name>
@@ -205,10 +209,6 @@
           <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
           <Name>Deltares.Geographic</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
-          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
-          <Name>Deltares.Geotechnics</Name>
-        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
           <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
           <Name>Deltares.Probabilistic</Name>
@@ -224,16 +224,16 @@
         <Reference Include="Deltares.Geometry">
           <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Geotechnics">
+          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
         </Reference>
         <Reference Include="Deltares.Geographic">
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geotechnics">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Probabilistic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ad0f6a98dfa90ad, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj
===================================================================
diff -u -r33 -r34
--- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 33)
+++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 34)
@@ -144,9 +144,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Standard.Forms.Maps">
-      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Forms.Maps.dll</HintPath>
-    </Reference>
     <Reference Include="DevExpress.Printing.v12.2.Core, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -429,18 +426,18 @@
           <Project>{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}</Project>
           <Name>Deltares.Standard.Maps</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
+          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
+          <Name>Deltares.Standard.Forms.DExpress</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Standard.Forms.Maps\Deltares.Standard.Forms.Maps.csproj">
+          <Project>{581488C1-6C5C-4744-99EC-72EA23010E02}</Project>
+          <Name>Deltares.Standard.Forms.Maps</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geometry\Deltares.Geometry.csproj">
           <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
           <Name>Deltares.Geometry</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
-          <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
-          <Name>Deltares.Mathematics</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj">
-          <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
-          <Name>Deltares.Geographic</Name>
-        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslFormsGeo\sources\Deltares.Geometry.Forms\Deltares.Geometry.Forms.csproj">
           <Project>{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}</Project>
           <Name>Deltares.Geometry.Forms</Name>
@@ -453,10 +450,14 @@
           <Project>{C05D6847-29B0-40DB-A0C6-6328368A6E78}</Project>
           <Name>Deltares.Geotechnics.Forms</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
-          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
-          <Name>Deltares.Standard.Forms.DExpress</Name>
+        <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
+          <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
+          <Name>Deltares.Mathematics</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj">
+          <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
+          <Name>Deltares.Geographic</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
           <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
           <Name>Deltares.Probabilistic</Name>
@@ -476,17 +477,15 @@
         <Reference Include="Deltares.Standard.Maps">
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Standard.Forms.DExpress">
+          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+        </Reference>
+        <Reference Include="Deltares.Standard.Forms.Maps">
+          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Forms.Maps.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Geometry">
           <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Geometry.Forms">
           <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>
         </Reference>
@@ -496,9 +495,14 @@
         <Reference Include="Deltares.Geotechnics.Forms">
           <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geotechnics.Forms.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Standard.Forms.DExpress">
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+        <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Probabilistic">
           <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
         </Reference>
Index: src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj
===================================================================
diff -u -r31 -r34
--- src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj	(.../Deltares.DSoilModel.Data.csproj)	(revision 31)
+++ src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj	(.../Deltares.DSoilModel.Data.csproj)	(revision 34)
@@ -139,6 +139,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Geotechnics.WaternetCreator">
+      <HintPath>..\..\lib\Deltares\Deltares.Geotechnics.WaternetCreator.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.MStab.IO.Classic">
       <HintPath>..\..\lib\Deltares\Deltares.MStab.IO.Classic.dll</HintPath>
     </Reference>
@@ -227,6 +230,10 @@
           <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
           <Name>Deltares.Geometry</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
+          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
+          <Name>Deltares.Geotechnics</Name>
+        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
           <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
           <Name>Deltares.Mathematics</Name>
@@ -235,10 +242,6 @@
           <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
           <Name>Deltares.Geographic</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
-          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
-          <Name>Deltares.Geotechnics</Name>
-        </ProjectReference>
         <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
           <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
           <Name>Deltares.Probabilistic</Name>
@@ -261,16 +264,16 @@
         <Reference Include="Deltares.Geometry">
           <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Geotechnics">
+          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+        </Reference>
         <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
           <SpecificVersion>False</SpecificVersion>
           <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
         </Reference>
         <Reference Include="Deltares.Geographic">
           <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geotechnics">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Probabilistic">
           <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
         </Reference>