Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -26,7 +26,6 @@
 using Core.Common.Base.Geometry;
 using Core.Common.Utils;
 using Ringtoets.Asphalt.Data;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -28,7 +28,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Asphalt.Data;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
Index: Ringtoets/Asphalt/src/Ringtoets.Asphalt.Data/WaveImpactAsphaltCoverFailureMechanism.cs
===================================================================
diff -u -r35e7ce9a8fc466c028bf48609a7314f4f416583e -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Asphalt/src/Ringtoets.Asphalt.Data/WaveImpactAsphaltCoverFailureMechanism.cs	(.../WaveImpactAsphaltCoverFailureMechanism.cs)	(revision 35e7ce9a8fc466c028bf48609a7314f4f416583e)
+++ Ringtoets/Asphalt/src/Ringtoets.Asphalt.Data/WaveImpactAsphaltCoverFailureMechanism.cs	(.../WaveImpactAsphaltCoverFailureMechanism.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -62,6 +62,9 @@
             }
         }
 
+        /// <summary>
+        /// Gets the available foreshores for this instance.
+        /// </summary>
         public ObservableList<ForeShore> ForeShores { get; private set; }
 
         public override void AddSection(FailureMechanismSection section)
Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/Ringtoets.Asphalt.Forms.Test.csproj
===================================================================
diff -u -rbbf215488ec670989eca94379ea62ef4c9155540 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/Ringtoets.Asphalt.Forms.Test.csproj	(.../Ringtoets.Asphalt.Forms.Test.csproj)	(revision bbf215488ec670989eca94379ea62ef4c9155540)
+++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/Ringtoets.Asphalt.Forms.Test.csproj	(.../Ringtoets.Asphalt.Forms.Test.csproj)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -54,6 +54,7 @@
     <Compile Include="PresentationObjects\WaveImpactAsphaltCoverFailureMechanismContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\WaveImpactAsphaltCoverFailureMechanismContextPropertiesTest.cs" />
+    <Compile Include="TreeNodeInfos\ForeShoresContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="Views\WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs" />
     <Compile Include="Views\WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs" />
Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/TreeNodeInfos/ForeShoresContextTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/TreeNodeInfos/ForeShoresContextTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/TreeNodeInfos/ForeShoresContextTreeNodeInfoTest.cs	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -0,0 +1,176 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.TreeView;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Asphalt.Plugin;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Forms.PresentationObjects;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Asphalt.Forms.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class ForeShoresContextTreeNodeInfoTest
+    {
+        private WaveImpactAsphaltCoverPlugin plugin;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void SetUp()
+        {
+            plugin = new WaveImpactAsphaltCoverPlugin();
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ForeShoresContext));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Assert
+            Assert.AreEqual(typeof(ForeShoresContext), info.TagType);
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ForeColor);
+            Assert.IsNotNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNull(info.CanDrag);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
+        }
+
+        [Test]
+        public void Text_Always_ReturnExpectedText()
+        {
+            // Setup
+            var foreShores = new ObservableList<ForeShore>();
+
+            var foreShoresContext = new ForeShoresContext(foreShores);
+
+            // Call
+            string text = info.Text(foreShoresContext);
+
+            // Assert
+            const string expectedText = "Voorlanden";
+            Assert.AreEqual(expectedText, text);
+        }
+
+        [Test]
+        public void Image_Always_ReturnExpectedImage()
+        {
+            // Setup
+            var foreShores = new ObservableList<ForeShore>();
+
+            var foreShoresContext = new ForeShoresContext(foreShores);
+
+            // Call
+            Image image = info.Image(foreShoresContext);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, image);
+        }
+
+        [Test]
+        public void ForeColor_CollectionIsEmpty_ReturnGrayText()
+        {
+            // Setup
+            var foreShores = new ObservableList<ForeShore>();
+
+            // Precondition
+            CollectionAssert.IsEmpty(foreShores);
+
+            var foreShoresContext = new ForeShoresContext(foreShores);
+
+            // Call
+            Color color = info.ForeColor(foreShoresContext);
+
+            // Assert
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color);
+        }
+
+        [Test]
+        public void ForeColor_CollectionHasElementsEmpty_ReturnControlText()
+        {
+            // Setup
+            var foreShores = new ObservableList<ForeShore>
+            {
+                CreateForeShore()
+            };
+
+            // Precondition
+            CollectionAssert.IsNotEmpty(foreShores);
+
+            var foreShoresContext = new ForeShoresContext(foreShores);
+
+            // Call
+            Color color = info.ForeColor(foreShoresContext);
+
+            // Assert
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color);
+        }
+
+        [Test]
+        public void ChildNodeObjects_Always_ReturnDikeProfiles()
+        {
+            // Setup
+            ForeShore foreShore1 = CreateForeShore();
+            ForeShore foreShore2 = CreateForeShore();
+            var foreShores = new ObservableList<ForeShore>
+            {
+                foreShore1,
+                foreShore2
+            };
+
+            var foreShoresContext = new ForeShoresContext(foreShores);
+
+            // Call
+            var children = info.ChildNodeObjects(foreShoresContext);
+
+            // Assert
+            Assert.AreEqual(2, children.Length);
+            Assert.AreSame(foreShore1, children.ElementAt(0));
+            Assert.AreSame(foreShore2, children.ElementAt(1));
+        }
+
+        private static ForeShore CreateForeShore()
+        {
+            return new ForeShore();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -r35e7ce9a8fc466c028bf48609a7314f4f416583e -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 35e7ce9a8fc466c028bf48609a7314f4f416583e)
+++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -38,6 +38,17 @@
     public class WaveImpactAsphaltCoverPluginTest
     {
         [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // call
+            using (var plugin = new WaveImpactAsphaltCoverPlugin())
+            {
+                // assert
+                Assert.IsInstanceOf<PluginBase>(plugin);
+            }
+        }
+
+        [Test]
         public void GetPropertiesInfos_ReturnSupportedPropertyInfos()
         {
             // Setup
Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeShore.cs
===================================================================
diff -u -r35e7ce9a8fc466c028bf48609a7314f4f416583e -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeShore.cs	(.../ForeShore.cs)	(revision 35e7ce9a8fc466c028bf48609a7314f4f416583e)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeShore.cs	(.../ForeShore.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -24,5 +24,14 @@
     /// <summary>
     /// Definition for a foreshore for a failure mechanism.
     /// </summary>
-    public class ForeShore {}
+    public class ForeShore
+    {
+        // TODO
+        // Should this be stored?
+        // If Yes, add IStorable and update Excel sheet
+        //
+        // Please note that there are property classes defined for ForeShores
+        //    GrassCoverErosionInwardsInputContextForeshoreProperties
+        //    DikeProfileForeshoreProperties
+    }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r35e7ce9a8fc466c028bf48609a7314f4f416583e -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 35e7ce9a8fc466c028bf48609a7314f4f416583e)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -28,7 +28,7 @@
   <ItemGroup>
     <Reference Include="MathNet.Numerics, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\MathNet.Numerics.3.8.0\lib\net40\MathNet.Numerics.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -46,7 +46,7 @@
         }
 
         /// <summary>
-        /// Gets the parent of <see cref="ObservableWrappedObjectContextBase{T}.WrappedData"/>.
+        /// Gets the parent of <see cref="WrappedObjectContextBase{T}.WrappedData"/>.
         /// </summary>
         public IAssessmentSection Parent { get; private set; }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(.../FailureMechanismContributionContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(.../FailureMechanismContributionContext.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -46,7 +46,7 @@
         }
 
         /// <summary>
-        /// Gets the assessment section to which <see cref="ObservableWrappedObjectContextBase{T}.WrappedData"/> belongs to.
+        /// Gets the assessment section to which <see cref="WrappedObjectContextBase{T}.WrappedData"/> belongs to.
         /// </summary>
         public IAssessmentSection Parent { get; private set; }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/ForeShoresContext.cs
===================================================================
diff -u -r35e7ce9a8fc466c028bf48609a7314f4f416583e -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/ForeShoresContext.cs	(.../ForeShoresContext.cs)	(revision 35e7ce9a8fc466c028bf48609a7314f4f416583e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/ForeShoresContext.cs	(.../ForeShoresContext.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -34,7 +34,7 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ForeShoresContext"/> class.
         /// </summary>
-        /// <param name="wrappedData">The observable list of foreshores.</param>
-        public ForeShoresContext(ObservableList<ForeShore> wrappedData) : base(wrappedData) {}
+        /// <param name="foreshores">The observable list of <see cref="ForeShore"/> objects.</param>
+        public ForeShoresContext(ObservableList<ForeShore> foreshores) : base(foreshores) { }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -36,7 +36,7 @@
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -34,11 +34,11 @@
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="MathNet.Numerics, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\MathNet.Numerics.3.8.0\lib\net40\MathNet.Numerics.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r1d1714a744afa41c6da4d755e44d16f4dca7a355
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs	(.../DikeProfileTest.cs)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs	(.../DikeProfileTest.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
@@ -51,8 +51,8 @@
             };
 
             // Call
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(worldCoordinate, dikeGeometry, foreshoreGeometry,
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            var dikeProfile = new DikeProfile(worldCoordinate, dikeGeometry, foreshoreGeometry,
+                                              null, new DikeProfile.ConstructionProperties());
 
             // Assert
             Assert.IsInstanceOf<IStorable>(dikeProfile);
@@ -78,8 +78,8 @@
         public void Constructor_WorldReferencePointIsNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new Data.DikeProfiles.DikeProfile(null, new RoughnessPoint[0], new Point2D[0],
-                                                      null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            TestDelegate call = () => new DikeProfile(null, new RoughnessPoint[0], new Point2D[0],
+                                                      null, new DikeProfile.ConstructionProperties());
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -90,8 +90,8 @@
         public void Constructor_DikeGeometryNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), null, new Point2D[0],
-                                                      null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            TestDelegate call = () => new DikeProfile(new Point2D(0, 0), null, new Point2D[0],
+                                                      null, new DikeProfile.ConstructionProperties());
 
             // Assert
             var expectedMessage = Resources.DikeProfile_SetGeometry_Collection_of_points_for_geometry_is_null;
@@ -103,13 +103,13 @@
         public void Constructor_DikeGeometryContainsNullPoint_ThrowsArgumentException()
         {
             // Call
-            TestDelegate call = () => new Data.DikeProfiles.DikeProfile(new Point2D(0.0, 0.0),
+            TestDelegate call = () => new DikeProfile(new Point2D(0.0, 0.0),
                                                       new RoughnessPoint[]
                                                       {
                                                           null
                                                       },
                                                       new Point2D[0],
-                                                      null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+                                                      null, new DikeProfile.ConstructionProperties());
 
             // Assert
             var expectedMessage = Resources.DikeProfile_SetGeometry_A_point_in_the_collection_is_null;
@@ -120,8 +120,8 @@
         public void Constructor_ForeshoreGeometryNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], null,
-                                                      null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            TestDelegate call = () => new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], null,
+                                                      null, new DikeProfile.ConstructionProperties());
 
             // Assert
             var expectedMessage = Resources.DikeProfile_SetForeshoreGeometry_Collection_of_points_for_foreshore_geometry_is_null;
@@ -133,11 +133,11 @@
         public void Constructor_ForeshoreGeometryContainsNullPoint_ThrowsArgumentException()
         {
             // Call
-            TestDelegate call = () => new Data.DikeProfiles.DikeProfile(new Point2D(0.0, 0.0), new RoughnessPoint[0],
+            TestDelegate call = () => new DikeProfile(new Point2D(0.0, 0.0), new RoughnessPoint[0],
                                                       new Point2D[]
                                                       {
                                                           null
-                                                      }, null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+                                                      }, null, new DikeProfile.ConstructionProperties());
 
             // Assert
             var expectedMessage = Resources.DikeProfile_SetForeshoreGeometry_A_point_in_the_collection_is_null;
@@ -148,7 +148,7 @@
         public void Constructor_ConstructionPropertiesIsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0], null, null);
+            TestDelegate call = () => new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0], null, null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -159,8 +159,8 @@
         public void Orientation_SetToValueWithTooManyDecimalPlaces_ValueIsRounded()
         {
             // Call
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              null, new DikeProfile.ConstructionProperties
                                               {
                                                   Orientation = 1.23456
                                               });
@@ -174,8 +174,8 @@
         public void DikeHeight_SetToValueWithTooManyDecimalPlaces_ValueIsRounded()
         {
             // Call
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              null, new DikeProfile.ConstructionProperties
                                               {
                                                   DikeHeight = 1.23456
                                               });
@@ -192,8 +192,8 @@
         public void Name_SetNewValue_GetsNewValue(string name)
         {
             // Call
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              null, new DikeProfile.ConstructionProperties
                                               {
                                                   Name = name
                                               });
@@ -206,8 +206,8 @@
         public void BreakWater_SetToNull_GetsNewlySetNull()
         {
             // Call
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              null, new DikeProfile.ConstructionProperties());
 
             // Assert
             Assert.IsNull(dikeProfile.BreakWater);
@@ -220,8 +220,8 @@
             var newBreakWater = new BreakWater(BreakWaterType.Caisson, 1.1);
 
             // Call
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              newBreakWater, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              newBreakWater, new DikeProfile.ConstructionProperties());
 
             // Assert
             Assert.AreSame(newBreakWater, dikeProfile.BreakWater);
@@ -231,8 +231,8 @@
         public void HasBreakWater_BreakWaterSetToNull_ReturnFalse()
         {
             // Setup
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              null, new DikeProfile.ConstructionProperties());
 
             // Call
             bool hasBreakWater = dikeProfile.HasBreakWater;
@@ -246,8 +246,8 @@
         {
             // Setup
             var breakWater = new BreakWater(BreakWaterType.Dam, 12.34);
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              breakWater, new Data.DikeProfiles.DikeProfile.ConstructionProperties());
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              breakWater, new DikeProfile.ConstructionProperties());
 
             // Call
             bool hasBreakWater = dikeProfile.HasBreakWater;
@@ -261,8 +261,8 @@
         {
             // Setup
             var testName = "testName";
-            var dikeProfile = new Data.DikeProfiles.DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
-                                              null, new Data.DikeProfiles.DikeProfile.ConstructionProperties
+            var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0],
+                                              null, new DikeProfile.ConstructionProperties
                                               {
                                                   Name = testName
                                               });