Index: dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r711 -r762
--- dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 711)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 762)
@@ -62,6 +62,7 @@
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>GlobalAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="General\Physics.cs" />
     <Compile Include="General\Results\DesignResult.cs" />
     <Compile Include="Design\DesignScenario.cs" />
     <Compile Include="General\CompositeJob.cs" />
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Physics.cs
===================================================================
diff -u -r684 -r762
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Physics.cs	(.../Deltares.DamEngine.Calculators/General/Physics.cs)	(revision 684)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Physics.cs	(.../Deltares.DamEngine.Data/General/Physics.cs)	(revision 762)
@@ -4,9 +4,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deltares.DamEngine.Calculators.General
+namespace Deltares.DamEngine.Data.General
 {
-    class Physics
+    public class Physics
     {
         public const double FactorMicroMeterToMeter = 1E-06;
         public const double FactorMeterToMicroMeter = 1000000.0;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r761 -r762
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 761)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 762)
@@ -51,8 +51,6 @@
     <Compile Include="KernelWrappers\DamPipingBligh\DamPipingBlighKernelWrapperTests.cs" />
     <Compile Include="KernelWrappers\DamPipingSellmeijer4Forces\DamPipingSellmeijer4ForcesKernelWrapperTests.cs" />
     <Compile Include="KernelWrappers\DamPipingSellmeijerVnk\DamPipingSellmeijerVnkKernelWrapperTests.cs" />
-    <Compile Include="PlLinesCreator\FactoryForSoilProfiles.cs" />
-    <Compile Include="PlLinesCreator\FactoryForSurfaceLines.cs" />
     <Compile Include="PlLinesCreator\PLLinesCreatorTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
Index: dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs
===================================================================
diff -u -r692 -r762
--- dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs	(.../Deltares.DamEngine.Calculators.Tests/PlLinesCreator/FactoryForSoilProfiles.cs)	(revision 692)
+++ dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs	(.../Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs)	(revision 762)
@@ -1,7 +1,7 @@
-using Deltares.DamEngine.Calculators.General;
+using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.Tests
+namespace Deltares.DamEngine.TestHelpers
 {
     public class FactoryForSoilProfiles
     {
@@ -491,59 +491,64 @@
             return soilProfile;
         }
 
-        ///// <summary>
-        ///// Create three layer soil profile with pleistocene and intermediate sand layer
-        ///// </summary>
-        ///// <returns>soil profile</returns>
-        //public static SoilProfile1D CreatePipingSellmeijerProfileWithTwoSandlayers()
-        //{
-        //    var soilProfile = new SoilProfile1D();
+//        /// <summary>
+//        /// Create three layer soil profile with pleistocene and intermediate sand layer
+//        /// </summary>
+//        /// <returns>soil profile</returns>
+//        public static SoilProfile1D CreatePipingSellmeijerProfileWithTwoSandlayers()
+//        {
+//            var soilProfile = new SoilProfile1D();
+//
+//            var layer = new SoilLayer1D()
+//            {
+//                Name = GetNewUniqueLayerName(soilProfile)
+//            };
+//            layer.TopLevel = 10.0;
+//            layer.Soil = new Soil("Topmaterial", 1.0, 1.0, 0.0003, Physics.FactorMicroMeterToMeter*300.0, 0.5, 57.0);
+//            layer.Soil.DryUnitWeight = 0.01;
+//            layer.IsAquifer = false;
+//            soilProfile.Layers.Add(layer);
+//
+//            layer = new SoilLayer1D()
+//            {
+//                Name = GetNewUniqueLayerName(soilProfile)
+//            };
+//            layer.TopLevel = -2.0;
+//            layer.Soil = new Soil("Sand upper", 22.0, 20.0, 0.0001, Physics.FactorMicroMeterToMeter*200.0, 0.25, 37.0);
+//            layer.Soil.DryUnitWeight = 0.01;
+//            layer.IsAquifer = true;
+//            soilProfile.Layers.Add(layer);
+//
+//            layer = new SoilLayer1D()
+//            {
+//                Name = GetNewUniqueLayerName(soilProfile)
+//            };
+//            layer.TopLevel = -3.99;
+//            layer.Soil = new Soil("Clay", 22.0, 20.0, 0.0001, Physics.FactorMicroMeterToMeter*200.0, 0.25, 37.0);
+//            layer.Soil.DryUnitWeight = 0.01;
+//            layer.IsAquifer = false;
+//            soilProfile.Layers.Add(layer);
+//
+//            layer = new SoilLayer1D()
+//            {
+//                Name = GetNewUniqueLayerName(soilProfile)
+//            };
+//            layer.TopLevel = -4.0;
+//            layer.Soil = new Soil("Sand lower", 22.0, 20.0, 0.0002, Physics.FactorMicroMeterToMeter*300.0, 0.35, 47.0);
+//            layer.Soil.DryUnitWeight = 0.01;
+//            layer.IsAquifer = true;
+//            soilProfile.Layers.Add(layer);
+//
+//            soilProfile.BottomLevel = -10.0;
+//
+//            return soilProfile;
+//        }
 
-        //    var layer = new SoilLayer1D()
-        //    {
-        //        Name = GetNewUniqueLayerName(soilProfile)
-        //    };
-        //    layer.TopLevel = 10.0;
-        //    layer.Soil = new Soil("Topmaterial", 1.0, 1.0, 0.0003, Physics.FactorMicroMeterToMeter*300.0, 0.5, 57.0);
-        //    layer.Soil.DryUnitWeight = 0.01;
-        //    layer.IsAquifer = false;
-        //    soilProfile.Layers.Add(layer);
+        private static string GetNewUniqueLayerName(SoilProfile1D soilProfile)
+        {
+            throw new System.NotImplementedException();
+        }
 
-        //    layer = new SoilLayer1D()
-        //    {
-        //        Name = GetNewUniqueLayerName(soilProfile)
-        //    };
-        //    layer.TopLevel = -2.0;
-        //    layer.Soil = new Soil("Sand upper", 22.0, 20.0, 0.0001, Physics.FactorMicroMeterToMeter*200.0, 0.25, 37.0);
-        //    layer.Soil.DryUnitWeight = 0.01;
-        //    layer.IsAquifer = true;
-        //    soilProfile.Layers.Add(layer);
-
-        //    layer = new SoilLayer1D()
-        //    {
-        //        Name = GetNewUniqueLayerName(soilProfile)
-        //    };
-        //    layer.TopLevel = -3.99;
-        //    layer.Soil = new Soil("Clay", 22.0, 20.0, 0.0001, Physics.FactorMicroMeterToMeter*200.0, 0.25, 37.0);
-        //    layer.Soil.DryUnitWeight = 0.01;
-        //    layer.IsAquifer = false;
-        //    soilProfile.Layers.Add(layer);
-
-        //    layer = new SoilLayer1D()
-        //    {
-        //        Name = GetNewUniqueLayerName(soilProfile)
-        //    };
-        //    layer.TopLevel = -4.0;
-        //    layer.Soil = new Soil("Sand lower", 22.0, 20.0, 0.0002, Physics.FactorMicroMeterToMeter*300.0, 0.35, 47.0);
-        //    layer.Soil.DryUnitWeight = 0.01;
-        //    layer.IsAquifer = true;
-        //    soilProfile.Layers.Add(layer);
-
-        //    soilProfile.BottomLevel = -10.0;
-
-        //    return soilProfile;
-        //}
-
         /// <summary>
         /// Create two layer soil profile with pleistocene sand layer (no intermediate layer
         /// </summary>
Index: dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
===================================================================
diff -u -r761 -r762
--- dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 761)
+++ dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 762)
@@ -38,13 +38,21 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Categories.cs" />
+    <Compile Include="Factories\FactoryForSoilProfiles.cs" />
+    <Compile Include="Factories\FactoryForSurfaceLines.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Copying.AGPL.licenseheader">
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
+      <Project>{B7A49C1A-1C91-4D72-ABA9-9FBAC2509D8E}</Project>
+      <Name>Deltares.DamEngine.Data</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r715 -r762
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 715)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 762)
@@ -77,7 +77,6 @@
     <Compile Include="General\LogHelper.cs" />
     <Compile Include="General\Parallel.cs" />
     <Compile Include="General\ParameterMissingException.cs" />
-    <Compile Include="General\Physics.cs" />
     <Compile Include="General\RequiredEntityNotExistException.cs" />
     <Compile Include="Dikes Design\SurfaceLineAdapter.cs" />
     <Compile Include="Dikes Design\SurfaceLineAdapterException.cs" />
Fisheye: Tag 762 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/FactoryForSoilProfiles.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PLLinesCreatorTest.cs
===================================================================
diff -u -r684 -r762
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PLLinesCreatorTest.cs	(.../PLLinesCreatorTest.cs)	(revision 684)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PLLinesCreatorTest.cs	(.../PLLinesCreatorTest.cs)	(revision 762)
@@ -5,6 +5,7 @@
 using Deltares.DamEngine.Data.General.PlLines;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Calculators.Tests
Fisheye: Tag 762 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Physics.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs
===================================================================
diff -u -r684 -r762
--- dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs	(.../Deltares.DamEngine.Calculators.Tests/PlLinesCreator/FactoryForSurfaceLines.cs)	(revision 684)
+++ dam engine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs	(.../Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs)	(revision 762)
@@ -1,7 +1,7 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 
-namespace Deltares.DamEngine.Calculators.Tests
+namespace Deltares.DamEngine.TestHelpers
 {
     public class FactoryForSurfaceLines
     {
Fisheye: Tag 762 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/FactoryForSurfaceLines.cs'.
Fisheye: No comparison available.  Pass `N' to diff?