Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(revision 439)
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Deltares.Dam.Data.DamEngineIo;
+
+namespace Deltares.Dam.Tests.DamEngineIo
+{
+    [TestFixture]
+    public class FillDamUiFromXmlOutputTests
+    {
+    }
+}
Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r339 -r439
--- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 439)
@@ -78,17 +78,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CSDupuitNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Dupuit\CSDupuitNet.dll</HintPath>
-    </Reference>
     <Reference Include="Deltares.Authorization, Version=7.21.5457.26349, Culture=neutral, PublicKeyToken=379d563066715186, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.FlowSlide.Data, Version=16.1.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\FlowSlide\Deltares.FlowSlide.Data.dll</HintPath>
+    <Reference Include="Deltares.DamEngine.Io">
+      <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geographic">
       <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
@@ -118,10 +113,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.WTIPiping, Version=1.1.1.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\VTVFailureMechanisms\DikesPiping\Deltares.WTIPiping.dll</HintPath>
-    </Reference>
     <Reference Include="DotSpatial.Controls, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Controls.dll</HintPath>
@@ -154,10 +145,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="LumenWorks.Framework.IO, Version=3.8.0.0, Culture=neutral, PublicKeyToken=5ad3ea2f85776344, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\LumenWorks.Framework.IO.3.8.0\lib\net20\LumenWorks.Framework.IO.dll</HintPath>
-    </Reference>
     <Reference Include="NetTopologySuite, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\NetTopologySuite.dll</HintPath>
@@ -198,6 +185,10 @@
     <Compile Include="CsvImporters\CsvImporterSoilProfiles.cs" />
     <Compile Include="CsvImporters\CsvImporterSurfaceLines.cs" />
     <Compile Include="CsvImporters\SurfaceLineCsvColumnNames.cs" />
+    <Compile Include="DamEngineIo\FillDamUiFromXmlInput.cs" />
+    <Compile Include="DamEngineIo\FillDamUiFromXmlOutput.cs" />
+    <Compile Include="DamEngineIo\FillXmlInputFromDamUi.cs" />
+    <Compile Include="DamEngineIo\FillXmlOutputFromDamUi.cs" />
     <Compile Include="DAMEnumerations.cs" />
     <Compile Include="DamGlobalConstants.cs" />
     <Compile Include="DamHelperFunctions.cs" />
@@ -457,6 +448,10 @@
       <Project>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</Project>
       <Name>Deltares.Maps</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tools\LumenWorks.Framework.IO\LumenWorks.Framework.IO.csproj">
+      <Project>{e3b83d68-c90c-4874-8e5f-dec8d038bc7c}</Project>
+      <Name>LumenWorks.Framework.IO</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DtoAssembler\Properties\" />
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlOutputFromDamUi.cs	(revision 439)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    public class FillXmlOutputFromDamUi
+    {
+    }
+}
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(revision 439)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    public class FillDamUiFromXmlOutput
+    {
+    }
+}
Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r339 -r439
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 439)
@@ -114,6 +114,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AuthorizationTestBase.cs" />
+    <Compile Include="DamEngineIo\FillDamUiFromXmlOutputTests.cs" />
+    <Compile Include="DamEngineIo\FillXmlInputFromDamUiTests.cs" />
     <Compile Include="DamHelperFunctionsTest.cs" />
     <Compile Include="DamContextTest.cs" />
     <Compile Include="DamLiveAuthorizationTest.cs" />
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj
===================================================================
diff -u -r339 -r439
--- dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 439)
@@ -59,9 +59,9 @@
     <Reference Include="Deltares.Geotechnics.TestUtils">
       <HintPath>..\..\..\..\lib\DSL-Geo\Deltares.Geotechnics.TestUtils.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Soilbase, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Deltares.Soilbase, Version=17.2.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\Soilbase\Deltares.Soilbase.dll</HintPath>
+      <HintPath>..\..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(revision 439)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    public class FillXmlInputFromDamUi
+    {
+    }
+}
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs
===================================================================
diff -u -r341 -r439
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs	(.../LocationPropertyImporter.cs)	(revision 341)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs	(.../LocationPropertyImporter.cs)	(revision 439)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Deltares.Maps;
Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(revision 439)
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Deltares.Dam.Data.DamEngineIo;
+using NUnit.Framework;
+
+namespace Deltares.Dam.Tests.DamEngineIo
+{
+    [TestFixture]
+    public class FillXmlInputFromDamUiTests
+    {
+    }
+}
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(revision 439)
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    public class FillDamUiFromXmlInput
+    {
+    }
+}