Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/LayerCreatorTests.cs
===================================================================
diff -u -r3177 -r3183
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/LayerCreatorTests.cs	(.../LayerCreatorTests.cs)	(revision 3177)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/LayerCreatorTests.cs	(.../LayerCreatorTests.cs)	(revision 3183)
@@ -116,7 +116,7 @@
         public void TestDetermineLoweredSurfaceLineForGivenLayerThickness()
         {
             var originalSurfaceLine = CreateSimpleStraightSurfaceLine();
-            var loweredSurfaceLine = originalSurfaceLine.DetermineLoweredSurfaceLineForGivenLayerThickness(1);
+            var loweredSurfaceLine = originalSurfaceLine.CreateLoweredSurfaceLineForGivenLayerThickness(1);
             Assert.AreEqual(11,loweredSurfaceLine.SurfaceLinePoints.Count);
             Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].XCoordinate, Diff);
             Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].ZCoordinate, Diff);
Fisheye: Tag 3183 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/GeometryCreator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs
===================================================================
diff -u -r3179 -r3183
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs	(.../LayerCreator.cs)	(revision 3179)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs	(.../LayerCreator.cs)	(revision 3183)
@@ -24,6 +24,7 @@
 using System.IO;
 using Deltares.LayerOnSlopeTool.Data;
 using Deltares.LayerOnSlopeTool.Importer;
+using Deltares.LayerOnSlopeTool.StiFileCreator;
 
 namespace Deltares.LayerOnSlopeTool.LayerCreator
 {
@@ -95,21 +96,24 @@
                 loggedLocations.Add(string.Format("Handling location {0} with surface line {1}", location.LocationId, location.SurfacelineId));
                 WriteToLog(loggedLocations);
                 SurfaceLine surfaceLine = FindSurfaceLine(location.SurfacelineId);
-                var layerSurfaceLine = DetermineSurfaceLineForGivenLayerData(surfaceLine, location.LayerThickness);
+                var loweredSurfaceLine = DetermineSurfaceLineForGivenLayerData(surfaceLine, location.LayerThickness);
 
-                var layerGeometryCreator = new GeometryCreator(location, surfaceLine, layerSurfaceLine, InputFolderName, OutputFolderName);
                 try
                 {
-                    layerGeometryCreator.Execute(true);
-                    layerGeometryCreator.Execute(false);
+                    Execute(true, loweredSurfaceLine, location);
+                    Execute(false, surfaceLine, location);
                 }
                 catch (Exception e)
                 {
                     errorFound = true;
                     errors.Add(e.Message);
-                    WriteToLog(errors);
                 }
             }
+
+            if (errors.Count > 0)
+            {
+                WriteToLog(errors);
+            }
         }
 
         private void PrepareOutputFolder()
@@ -168,9 +172,36 @@
             File.AppendAllLines(fullLogFilePath, linesToAdd);
         }
 
+        private void Execute(bool isForLoweredSurfaceLine, SurfaceLine surfaceLine, Location location)
+        {
+            // for the original surface line, use offset = 0. Use the Interim file in output folder as input file. Save as original file in output folder.
+            var xOffset = 0.0;
+            var folderName = OutputFolderName;
+            var inputFileName = "Interim" + location.SoilGeometryName;
+            var outputFileName = location.SoilGeometryName;
+            if (isForLoweredSurfaceLine)
+            {
+                // for the lowered surface line, use the given offset. Use the original input file from the input folder. Save as Interim file in output folder.
+                xOffset = location.XOffset;
+                folderName = InputFolderName;
+                inputFileName = location.SoilGeometryName;
+                outputFileName = "Interim" + location.SoilGeometryName;
+            }
+            var stiFileCreatorInput = new StiFileCreatorInput
+            {
+                // Note that for second generation the offset MUST be 0 as any offset is already taken care of in the first generation.
+                XOffset = xOffset,
+                SurfaceLine = surfaceLine,
+                DikeMaterialName = location.LayerMaterial,
+                InputFilename = Path.Combine(folderName, inputFileName),
+                OutputFilename = Path.Combine(OutputFolderName, outputFileName)
+            };
+            StiFileCreator.StiFileCreator.ProcessFile(stiFileCreatorInput);
+        }
+
         private SurfaceLine DetermineSurfaceLineForGivenLayerData(SurfaceLine originalSurfaceLine, double layerThickness)
         {
-            return originalSurfaceLine.DetermineLoweredSurfaceLineForGivenLayerThickness(layerThickness);
+            return originalSurfaceLine.CreateLoweredSurfaceLineForGivenLayerThickness(layerThickness);
         }
     }
 
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/SurfaceLine.cs
===================================================================
diff -u -r3176 -r3183
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/SurfaceLine.cs	(.../SurfaceLine.cs)	(revision 3176)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/SurfaceLine.cs	(.../SurfaceLine.cs)	(revision 3183)
@@ -88,7 +88,7 @@
             return surfaceLinePoint;
         }
 
-        public SurfaceLine DetermineLoweredSurfaceLineForGivenLayerThickness(double layerThickness)
+        public SurfaceLine CreateLoweredSurfaceLineForGivenLayerThickness(double layerThickness)
         {
             const double diff = 1e-4;
             var loweredSurfaceLine = new SurfaceLine();
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj
===================================================================
diff -u -r3176 -r3183
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj	(.../Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj)	(revision 3176)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj	(.../Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj)	(revision 3183)
@@ -28,7 +28,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GeometryCreatorTests.cs" />
     <Compile Include="LayerCreatorTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
Fisheye: Tag 3183 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/GeometryCreatorTests.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/Deltares.LayerOnSlopeTool.LayerCreator.csproj
===================================================================
diff -u -r3175 -r3183
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/Deltares.LayerOnSlopeTool.LayerCreator.csproj	(.../Deltares.LayerOnSlopeTool.LayerCreator.csproj)	(revision 3175)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/Deltares.LayerOnSlopeTool.LayerCreator.csproj	(.../Deltares.LayerOnSlopeTool.LayerCreator.csproj)	(revision 3183)
@@ -44,7 +44,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GeometryCreator.cs" />
     <Compile Include="LayerCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>