Index: src/Deltares.DSoilModel.Forms/PreconsolidationStressControl.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/PreconsolidationStressControl.cs	(.../PreconsolidationStressControl.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/PreconsolidationStressControl.cs	(.../PreconsolidationStressControl.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System.Windows.Forms;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelPluginTests.cs
===================================================================
diff -u -r859 -r879
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelPluginTests.cs	(.../DSoilModelPluginTests.cs)	(revision 859)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelPluginTests.cs	(.../DSoilModelPluginTests.cs)	(revision 879)
@@ -8,6 +8,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Forms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Data/DSoilModelDataSourceRedirector.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/DSoilModelDataSourceRedirector.cs	(.../DSoilModelDataSourceRedirector.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/DSoilModelDataSourceRedirector.cs	(.../DSoilModelDataSourceRedirector.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
 using Deltares.Standard.Reflection;
Index: src/Deltares.DSoilModel.Data/SosSoilLayer1D.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/SosSoilLayer1D.cs	(.../SosSoilLayer1D.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/SosSoilLayer1D.cs	(.../SosSoilLayer1D.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System.ComponentModel;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 879)
@@ -35,6 +35,8 @@
 using Deltares.Geotechnics.Forms;
 using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Geotechnics.IO;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs	(.../DSoilModelTransformerTests.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs	(.../DSoilModelTransformerTests.cs)	(revision 879)
@@ -22,6 +22,7 @@
 using System;
 using System.Reflection;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs	(.../DSoilModelDataSourceRedirectorTests.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs	(.../DSoilModelDataSourceRedirectorTests.cs)	(revision 879)
@@ -23,6 +23,7 @@
 using System.Linq;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
 using Deltares.Standard.Reflection;
Index: src/Deltares.DSoilModel.Data/DSoilModelStiFileTransformer.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/DSoilModelStiFileTransformer.cs	(.../DSoilModelStiFileTransformer.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/DSoilModelStiFileTransformer.cs	(.../DSoilModelStiFileTransformer.cs)	(revision 879)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
 
Index: src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs
===================================================================
diff -u -r667 -r879
--- src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 667)
+++ src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 879)
@@ -1,6 +1,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Data/DSoilModelProject.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/DSoilModelProject.cs	(.../DSoilModelProject.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/DSoilModelProject.cs	(.../DSoilModelProject.cs)	(revision 879)
@@ -33,6 +33,8 @@
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Geotechnics.Xsd;
 using Deltares.Soilbase;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs
===================================================================
diff -u -r848 -r879
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 848)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 879)
@@ -4,6 +4,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.IO;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs
===================================================================
diff -u -r568 -r879
--- src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 568)
+++ src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 879)
@@ -1,5 +1,6 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs	(.../CenterCrestLocationTest.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs	(.../CenterCrestLocationTest.cs)	(revision 879)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Language;
 using Deltares.Standard.TestUtils;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs
===================================================================
diff -u -r872 -r879
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs	(.../DSoilModelProjectTest.cs)	(revision 872)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs	(.../DSoilModelProjectTest.cs)	(revision 879)
@@ -30,6 +30,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.TestUtils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Forms/DrawingLayerObsolete.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DrawingLayerObsolete.cs	(.../DrawingLayerObsolete.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DrawingLayerObsolete.cs	(.../DrawingLayerObsolete.cs)	(revision 879)
@@ -25,6 +25,7 @@
 using System.Drawing.Drawing2D;
 using Deltares.Geometry.Forms;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Mathematics;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs
===================================================================
diff -u -r350 -r879
--- src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 350)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 879)
@@ -1,4 +1,5 @@
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms/SoilProfile1DLookup2DControl.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/SoilProfile1DLookup2DControl.cs	(.../SoilProfile1DLookup2DControl.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/SoilProfile1DLookup2DControl.cs	(.../SoilProfile1DLookup2DControl.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System.Windows.Forms;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Language;
Index: src/Deltares.DSoilModel.Forms/FilmStrip.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/FilmStrip.cs	(.../FilmStrip.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/FilmStrip.cs	(.../FilmStrip.cs)	(revision 879)
@@ -29,6 +29,7 @@
 using Deltares.DSoilModel.Forms.Properties;
 using Deltares.Geometry.Forms;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.EventPublisher.Enum;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Forms/DrawingBoringLayer.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DrawingBoringLayer.cs	(.../DrawingBoringLayer.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DrawingBoringLayer.cs	(.../DrawingBoringLayer.cs)	(revision 879)
@@ -23,6 +23,7 @@
 using System.Drawing.Drawing2D;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.Forms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Mathematics;
 using Deltares.Standard;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 879)
@@ -26,9 +26,12 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Probabilistic;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.Forms.DExpress;
+using Deltares.Standard.Forms.DExpress.ComponentWrappers;
 using Deltares.Standard.Reflection;
 
 namespace Deltares.DSoilModel.Forms
Index: src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs
===================================================================
diff -u -r350 -r879
--- src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs	(.../CptLookup1DControlTests.cs)	(revision 350)
+++ src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs	(.../CptLookup1DControlTests.cs)	(revision 879)
@@ -1,5 +1,6 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs
===================================================================
diff -u -r510 -r879
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs	(.../SosSoilLayer1DControlTests.cs)	(revision 510)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs	(.../SosSoilLayer1DControlTests.cs)	(revision 879)
@@ -1,6 +1,7 @@
 using System.Drawing;
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs
===================================================================
diff -u -r501 -r879
--- src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 501)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 879)
@@ -1,4 +1,5 @@
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 879)
@@ -36,6 +36,8 @@
 using Deltares.Geotechnics.Forms;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Probabilistic;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs
===================================================================
diff -u -r501 -r879
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 501)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 879)
@@ -1,5 +1,6 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms/SegmentControl.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/SegmentControl.cs	(.../SegmentControl.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/SegmentControl.cs	(.../SegmentControl.cs)	(revision 879)
@@ -22,6 +22,7 @@
 using System.Windows.Forms;
 using Deltares.Standard;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher.Enum;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r743 -r879
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 743)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 879)
@@ -6,6 +6,8 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Data/SosSoilProfilesImporter.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/SosSoilProfilesImporter.cs	(.../SosSoilProfilesImporter.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/SosSoilProfilesImporter.cs	(.../SosSoilProfilesImporter.cs)	(revision 879)
@@ -28,6 +28,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO.Exception;
 using Deltares.Geotechnics.IO.Importers;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Extensions;
 using Deltares.Standard.IO;
Index: src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs
===================================================================
diff -u -r634 -r879
--- src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs	(.../FilmStripTest.cs)	(revision 634)
+++ src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs	(.../FilmStripTest.cs)	(revision 879)
@@ -6,6 +6,7 @@
 using System.Reflection;
 using Deltares.Geometry;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.TestUtils;
 using Deltares.Standard.Extensions;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Data/SoilSegmentSplitLocation.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/SoilSegmentSplitLocation.cs	(.../SoilSegmentSplitLocation.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/SoilSegmentSplitLocation.cs	(.../SoilSegmentSplitLocation.cs)	(revision 879)
@@ -23,6 +23,7 @@
 using System.Xml.Serialization;
 using Deltares.Geographic;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.Maps;
Index: src/Deltares.DSoilModel.Forms/DrawingSosSoilLayer1D.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DrawingSosSoilLayer1D.cs	(.../DrawingSosSoilLayer1D.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DrawingSosSoilLayer1D.cs	(.../DrawingSosSoilLayer1D.cs)	(revision 879)
@@ -27,6 +27,7 @@
 using Deltares.Geometry;
 using Deltares.Geometry.Forms;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Mathematics;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs
===================================================================
diff -u -r523 -r879
--- src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs	(.../CptLookup2DControlTests.cs)	(revision 523)
+++ src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs	(.../CptLookup2DControlTests.cs)	(revision 879)
@@ -1,5 +1,6 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms/DSoilModelSegmentGeometryEditor.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DSoilModelSegmentGeometryEditor.cs	(.../DSoilModelSegmentGeometryEditor.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DSoilModelSegmentGeometryEditor.cs	(.../DSoilModelSegmentGeometryEditor.cs)	(revision 879)
@@ -33,6 +33,7 @@
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Forms;
 using Deltares.Geotechnics.GeotechnicalGeometry;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Extensions;
Index: src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs
===================================================================
diff -u -r496 -r879
--- src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs	(.../SegmentControlTests.cs)	(revision 496)
+++ src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs	(.../SegmentControlTests.cs)	(revision 879)
@@ -4,6 +4,8 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Geotechnics.Xsd;
 using Deltares.Standard.Forms;
 using Deltares.Standard.TestUtils;
Index: src/Deltares.DSoilModel.Forms/HighlightSoilSegment.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/HighlightSoilSegment.cs	(.../HighlightSoilSegment.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/HighlightSoilSegment.cs	(.../HighlightSoilSegment.cs)	(revision 879)
@@ -25,6 +25,7 @@
 using System.Text;
 using Deltares.Geographic;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 
 namespace Deltares.DSoilModel.Forms
 {
Index: src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs	(.../SosSoilLayer1DControl.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs	(.../SosSoilLayer1DControl.cs)	(revision 879)
@@ -23,6 +23,7 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.Forms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
 
Index: src/Deltares.DSoilModel.Forms/FilmStripThumbnail.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/FilmStripThumbnail.cs	(.../FilmStripThumbnail.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/FilmStripThumbnail.cs	(.../FilmStripThumbnail.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System.Drawing;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 
 namespace Deltares.DSoilModel.Forms
 {
Index: src/Deltares.DSoilModel.Forms/SosSoilProfile1DControl.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/SosSoilProfile1DControl.cs	(.../SosSoilProfile1DControl.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/SosSoilProfile1DControl.cs	(.../SosSoilProfile1DControl.cs)	(revision 879)
@@ -22,6 +22,7 @@
 using System.Windows.Forms;
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher.Enum;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs
===================================================================
diff -u -r350 -r879
--- src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs	(.../SoilProfile1DLookup2DControlTest.cs)	(revision 350)
+++ src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs	(.../SoilProfile1DLookup2DControlTest.cs)	(revision 879)
@@ -1,4 +1,5 @@
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs
===================================================================
diff -u -r395 -r879
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs	(.../DSoilModelSegmentGeometryEditorTests.cs)	(revision 395)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs	(.../DSoilModelSegmentGeometryEditorTests.cs)	(revision 879)
@@ -1,6 +1,7 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geometry;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.EventPublisher.Enum;
Index: src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs
===================================================================
diff -u -r338 -r879
--- src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs	(.../PreconsolidationStressControlTests.cs)	(revision 338)
+++ src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs	(.../PreconsolidationStressControlTests.cs)	(revision 879)
@@ -1,4 +1,5 @@
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Data/SoilSegmentFactory.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/SoilSegmentFactory.cs	(.../SoilSegmentFactory.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/SoilSegmentFactory.cs	(.../SoilSegmentFactory.cs)	(revision 879)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.IO;
 
Index: src/Deltares.DSoilModel.Data/DSoilModelTransformer.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/DSoilModelTransformer.cs	(.../DSoilModelTransformer.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/DSoilModelTransformer.cs	(.../DSoilModelTransformer.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
 using Deltares.Standard.Reflection;
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 879)
@@ -27,6 +27,7 @@
 using System.Xml.Serialization;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Language;
 using Deltares.Standard.TestUtils;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs	(.../DSoilModelIOTest.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs	(.../DSoilModelIOTest.cs)	(revision 879)
@@ -27,6 +27,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Geotechnics.Mechanisms;
+using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Language;
Index: src/Deltares.DSoilModel.Data/CenterCrestLocation.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/CenterCrestLocation.cs	(.../CenterCrestLocation.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/CenterCrestLocation.cs	(.../CenterCrestLocation.cs)	(revision 879)
@@ -21,6 +21,7 @@
 
 using System.ComponentModel;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Language;
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs	(.../SosSoilProfilesImporterTests.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs	(.../SosSoilProfilesImporterTests.cs)	(revision 879)
@@ -22,6 +22,7 @@
 using System.Drawing;
 using System.IO;
 using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Logging;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Data/DSoilModelIO.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Data/DSoilModelIO.cs	(.../DSoilModelIO.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data/DSoilModelIO.cs	(.../DSoilModelIO.cs)	(revision 879)
@@ -28,6 +28,7 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.IO.Importers;
+using Deltares.Geotechnics.Soils;
 using Deltares.Soilbase;
 using Deltares.Standard;
 using Deltares.Standard.Maps;
Index: src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs
===================================================================
diff -u -r867 -r879
--- src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs	(.../DSoilModelMapEditor.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs	(.../DSoilModelMapEditor.cs)	(revision 879)
@@ -29,6 +29,7 @@
 using Deltares.Geographic;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Extensions;