Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminatorException.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminatorException.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminatorException.cs	(revision 1009)
@@ -0,0 +1,20 @@
+using System;
+
+namespace Deltares.DamEngine.Calculators.Uplift
+{
+    /// <summary>
+    /// Exception for UpliftLocationDeterminator class
+    /// </summary>
+    public class UpliftLocationDeterminatorException : ApplicationException
+    {
+        //
+        // For guidelines regarding the creation of new exception types, see
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
+        // and
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
+        //
+
+        public UpliftLocationDeterminatorException() { }
+        public UpliftLocationDeterminatorException(string message) : base(message) { }
+    }
+}
Index: DamEngine/trunk/release/Deltares.DamEngine.Version.dll
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Calculators.pdb
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Calculators.dll
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Interface.pdb
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationAndResult.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationAndResult.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationAndResult.cs	(revision 1009)
@@ -0,0 +1,34 @@
+using Deltares.DamEngine.Data.Geometry;
+
+namespace Deltares.DamEngine.Calculators.Uplift
+{
+    /// <summary>
+    /// Data class containing information about uplift location and uplift factor
+    /// </summary>
+    public class UpliftLocationAndResult : GeometryPoint
+    {
+        public UpliftLocationAndResult()
+        {
+            UpliftFactor = 0;
+            LayerWhereUpliftOccuresId = "";
+        }
+
+        public UpliftLocationAndResult(double upliftFactor, string layerWhereUpliftOccuresId)
+        {
+            UpliftFactor = upliftFactor;
+            LayerWhereUpliftOccuresId = layerWhereUpliftOccuresId;
+        }
+
+        public UpliftLocationAndResult(GeometryPoint point, double upliftFactor, string layerWhereUpliftOccuresId)
+        {
+            X = point.X;
+            Y = point.Y;
+            Z = point.Z;
+            UpliftFactor = upliftFactor;
+            LayerWhereUpliftOccuresId = layerWhereUpliftOccuresId;
+        }
+
+        public double? UpliftFactor { get; set; }
+        public string LayerWhereUpliftOccuresId { get; set; }
+    }
+}
Index: DamEngine/trunk/release/Deltares.DamEngine.Version.pdb
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r971 -r1009
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 971)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 1009)
@@ -131,7 +131,9 @@
     <Compile Include="Stability\StabilityServiceAgentException.cs" />
     <Compile Include="Uplift\SoilVolumicMassCalculator.cs" />
     <Compile Include="Uplift\UpliftCalculator.cs" />
+    <Compile Include="Uplift\UpliftLocationAndResult.cs" />
     <Compile Include="Uplift\UpliftLocationDeterminator.cs" />
+    <Compile Include="Uplift\UpliftLocationDeterminatorException.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
Index: DamEngine/trunk/release/Deltares.DamEngine.Io.dll
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Data.dll
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Io.pdb
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs
===================================================================
diff -u -r899 -r1009
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs	(.../UpliftLocationDeterminator.cs)	(revision 899)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs	(.../UpliftLocationDeterminator.cs)	(revision 1009)
@@ -31,52 +31,6 @@
 namespace Deltares.DamEngine.Calculators.Uplift
 {
     /// <summary>
-    /// Exception for UpliftLocationDeterminator class
-    /// </summary>
-    public class UpliftLocationDeterminatorException : ApplicationException
-    {
-        //
-        // For guidelines regarding the creation of new exception types, see
-        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
-        // and
-        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
-        //
-
-        public UpliftLocationDeterminatorException() { }
-        public UpliftLocationDeterminatorException(string message) : base(message) { }
-    }
-
-    /// <summary>
-    /// Data class containing information about uplift location and uplift factor
-    /// </summary>
-    public class UpliftLocationAndResult : GeometryPoint
-    {
-        public UpliftLocationAndResult()
-        {
-            UpliftFactor = 0;
-            LayerWhereUpliftOccuresId = "";
-        }
-
-        public UpliftLocationAndResult(double upliftFactor, string layerWhereUpliftOccuresId)
-        {
-            UpliftFactor = upliftFactor;
-            LayerWhereUpliftOccuresId = layerWhereUpliftOccuresId;
-        }
-
-        public UpliftLocationAndResult(GeometryPoint point, double upliftFactor, string layerWhereUpliftOccuresId)
-        {
-            X = point.X;
-            Y = point.Y;
-            Z = point.Z;
-            UpliftFactor = upliftFactor;
-            LayerWhereUpliftOccuresId = layerWhereUpliftOccuresId;
-        }
-
-        public double? UpliftFactor { get; set; }
-        public string LayerWhereUpliftOccuresId { get; set; }
-    }
-
-    /// <summary>
     /// Determie uplift location and uplift factor
     /// </summary>
     public class UpliftLocationDeterminator
Index: DamEngine/trunk/release/Deltares.DamEngine.Interface.dll
===================================================================
diff -u -r1006 -r1009
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Data.pdb
===================================================================
diff -u -r1006 -r1009
Binary files differ