Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rfbf9eca188c20c352a702ee20c183e5dc3c7acf1 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fbf9eca188c20c352a702ee20c183e5dc3c7acf1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -1659,6 +1659,25 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap StructuresIcon {
+            get {
+                object obj = ResourceManager.GetObject("StructuresIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kunstwerklocaties.
+        /// </summary>
+        public static string StructuresImporter_DisplayName {
+            get {
+                return ResourceManager.GetString("StructuresImporter_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &amp;Valideren.
         /// </summary>
         public static string Validate {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rfbf9eca188c20c352a702ee20c183e5dc3c7acf1 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision fbf9eca188c20c352a702ee20c183e5dc3c7acf1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -661,4 +661,10 @@
   <data name="StructuresCollection_DisplayName" xml:space="preserve">
     <value>Kunstwerken</value>
   </data>
+  <data name="StructuresImporter_DisplayName" xml:space="preserve">
+    <value>Kunstwerklocaties</value>
+  </data>
+  <data name="StructuresIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Structures.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/Structures.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rd7e204007a0a9e73fdfec7e570a397d4c41a463b -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -231,6 +231,7 @@
     <None Include="Resources\text_columns.png" />
     <None Include="Resources\point_shape_file.png" />
     <None Include="Resources\PointShapefileIcon.png" />
+    <None Include="Resources\Structures.png" />
     <Content Include="Resources\wand-hat.png" />
     <None Include="Resources\database.png" />
     <None Include="Resources\chart_single_line.png" />
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,279 @@
+// 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;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using Core.Common.Base.IO;
+using Core.Common.IO.Exceptions;
+using Core.Common.IO.Readers;
+using log4net;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.IO.Properties;
+using Ringtoets.Common.IO.Structures;
+
+namespace Ringtoets.Common.IO.FileImporters
+{
+    /// <summary>
+    /// Abstact class for structure importers, providing an implementation of importing point shapefiles 
+    /// containing structure locations and csv files containing structure schematizations.
+    /// </summary>
+    public abstract class StructuresImporter<T> : FileImporterBase<T>
+    {
+        protected readonly ILog log = LogManager.GetLogger(typeof(StructuresImporter<T>));
+        private readonly ReferenceLine referenceLine;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="StructuresImporter{T}"/>.
+        /// </summary>
+        /// <param name="referenceLine">The reference line used to check if the imported structures are intersecting it.</param>
+        /// <param name="filePath">The path to the file to import from.</param>
+        /// <param name="importTarget">The import target.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="referenceLine"/>, 
+        /// <paramref name="filePath"/> or <paramref name="importTarget"/> is <c>null</c>.</exception>
+        protected StructuresImporter(ReferenceLine referenceLine, string filePath, T importTarget)
+            : base(filePath, importTarget)
+        {
+            if (referenceLine == null)
+            {
+                throw new ArgumentNullException("referenceLine");
+            }
+
+            this.referenceLine = referenceLine;
+        }
+
+        public override bool Import()
+        {
+            ReadResult<StructureLocation> importStructureLocationsResult = ReadStructureLocations();
+            if (importStructureLocationsResult.CriticalErrorOccurred)
+            {
+                return false;
+            }
+
+            if (Canceled)
+            {
+                HandleUserCancellingImport();
+                return false;
+            }
+
+            ReadResult<StructuresParameterRow> importStructureParameterRowsDataResult = ReadStructureParameterRowsData();
+            if (importStructureParameterRowsDataResult.CriticalErrorOccurred)
+            {
+                return false;
+            }
+
+            if (Canceled)
+            {
+                HandleUserCancellingImport();
+                return false;
+            }
+
+            CreateStructures(importStructureLocationsResult, importStructureParameterRowsDataResult);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Act upon the user cancelling the import operation.
+        /// </summary>
+        protected virtual void HandleUserCancellingImport()
+        {
+            Canceled = false;
+        }
+
+        private void CreateStructures(ReadResult<StructureLocation> importStructureLocationsResult,
+                                      ReadResult<StructuresParameterRow> importStructureParameterRowsDataResult)
+        {
+            Dictionary<string, List<StructuresParameterRow>> groupedRows =
+                importStructureParameterRowsDataResult.ImportedItems
+                                                      .GroupBy(row => row.LocationId)
+                                                      .ToDictionary(g => g.Key, g => g.ToList());
+
+            CreateSpecificStructures(importStructureLocationsResult.ImportedItems, groupedRows);
+        }
+
+        /// <summary>
+        /// Create structure objects from location and geometry data.
+        /// </summary>
+        /// <param name="structureLocations">The read structure locations.</param>
+        /// <param name="groupedStructureParameterRows">The read structure parameters, grouped by location identifier.</param>
+        protected abstract void CreateSpecificStructures(ICollection<StructureLocation> structureLocations,
+                                                         Dictionary<string, List<StructuresParameterRow>> groupedStructureParameterRows);
+
+        private ReadResult<StructuresParameterRow> ReadStructureParameterRowsData()
+        {
+            NotifyProgress(Resources.StructuresImporter_ReadStructureParameterRowsData_reading_structure_data, 1, 1);
+
+            string csvFilePath = Path.ChangeExtension(FilePath, ".csv");
+
+            StructuresCharacteristicsCsvReader rowsReader;
+            try
+            {
+                rowsReader = new StructuresCharacteristicsCsvReader(csvFilePath);
+            }
+            catch (ArgumentException exception)
+            {
+                log.Error(exception.Message);
+                return new ReadResult<StructuresParameterRow>(true);
+            }
+
+            int totalNumberOfRows;
+            try
+            {
+                totalNumberOfRows = rowsReader.GetLineCount();
+            }
+            catch (CriticalFileReadException exception)
+            {
+                log.Error(exception.Message);
+                return new ReadResult<StructuresParameterRow>(true);
+            }
+
+            var rows = new List<StructuresParameterRow>();
+
+            for (int i = 0; i < totalNumberOfRows; i++)
+            {
+                if (Canceled)
+                {
+                    return new ReadResult<StructuresParameterRow>(false);
+                }
+
+                NotifyProgress(Resources.StructuresImporter_ReadStructureParameterRowsData_reading_structuredata, i + 1, totalNumberOfRows);
+
+                try
+                {
+                    StructuresParameterRow row = rowsReader.ReadLine();
+                    rows.Add(row);
+                }
+                catch (CriticalFileReadException exception)
+                {
+                    log.Error(exception.Message);
+                }
+                catch (LineParseException exception)
+                {
+                    log.Error(exception.Message);
+                }
+            }
+
+            return new ReadResult<StructuresParameterRow>(false)
+            {
+                ImportedItems = rows
+            };
+        }
+
+        private ReadResult<StructureLocation> ReadStructureLocations()
+        {
+            NotifyProgress(Resources.StructuresImporter_ReadStructureLocations_reading_structurelocations, 1, 1);
+            try
+            {
+                using (var structureLocationReader = new StructureLocationReader(FilePath))
+                {
+                    return GetStructureLocationReadResult(structureLocationReader);
+                }
+            }
+            catch (CriticalFileReadException exception)
+            {
+                log.Error(exception.Message);
+            }
+            catch (ArgumentException exception)
+            {
+                log.Error(exception.Message);
+            }
+            return new ReadResult<StructureLocation>(true);
+        }
+
+        private ReadResult<StructureLocation> GetStructureLocationReadResult(StructureLocationReader structureLocationReader)
+        {
+            var structureLocations = new Collection<StructureLocation>();
+
+            int totalNumberOfSteps = structureLocationReader.GetStructureCount;
+            for (int i = 0; i < totalNumberOfSteps; i++)
+            {
+                if (Canceled)
+                {
+                    return new ReadResult<StructureLocation>(false);
+                }
+
+                try
+                {
+                    NotifyProgress(Resources.StructuresImporter_GetStructureLocationReadResult_reading_structurelocation, i + 1, totalNumberOfSteps);
+                    AddNextStructureLocation(structureLocationReader, structureLocations);
+                }
+                catch (LineParseException exception)
+                {
+                    var message = string.Format(
+                        Resources.StructuresImporter_GetStructureLocationReadResult_Error_reading_Structure_LineNumber_0_Error_1_The_Structure_is_skipped,
+                        i + 1,
+                        exception.Message);
+                    log.Warn(message);
+                }
+                catch (CriticalFileReadException exception)
+                {
+                    log.Error(exception.Message);
+                    return new ReadResult<StructureLocation>(true);
+                }
+            }
+            return new ReadResult<StructureLocation>(false)
+            {
+                ImportedItems = structureLocations
+            };
+        }
+
+        /// <summary>
+        /// Get the next <see cref="StructureLocation"/> from <paramref name="structureLocationReader"/>
+        /// and add to <paramref name="structureLocations"/> in case it is close enough to the <see cref="ReferenceLine"/>.
+        /// </summary>
+        /// <param name="structureLocationReader">Reader reading <see cref="StructureLocation"/> objects from a shapefile.</param>
+        /// <param name="structureLocations">Collection of <see cref="StructureLocation"/> objects
+        /// to which the new <see cref="StructureLocation"/> is to be added.</param>
+        /// <exception cref="LineParseException"><list type="bullet">
+        /// <item>The shapefile misses a value for a required attribute.</item>
+        /// <item>The shapefile has an attribute whose type is incorrect.</item>
+        /// </list></exception>
+        private void AddNextStructureLocation(StructureLocationReader structureLocationReader, ICollection<StructureLocation> structureLocations)
+        {
+            StructureLocation structureLocation = structureLocationReader.GetNextStructureLocation();
+            double distanceToReferenceLine = GetDistanceToReferenceLine(structureLocation.Point);
+            if (distanceToReferenceLine > 1.0)
+            {
+                log.ErrorFormat(Resources.StructuresImporter_AddNextStructureLocation_0_skipping_location_outside_referenceline, structureLocation.Id);
+                return;
+            }
+            if (structureLocations.Any(dpl => dpl.Id.Equals(structureLocation.Id)))
+            {
+                log.WarnFormat(Resources.StructuresImporter_AddNextStructureLocation_Location_with_kwkident_0_already_read, structureLocation.Id);
+            }
+            structureLocations.Add(structureLocation);
+        }
+
+        private double GetDistanceToReferenceLine(Point2D point)
+        {
+            return GetLineSegments(referenceLine.Points).Min(segment => segment.GetEuclideanDistanceToPoint(point));
+        }
+
+        private static IEnumerable<Segment2D> GetLineSegments(IEnumerable<Point2D> linePoints)
+        {
+            return Math2D.ConvertLinePointsToLineSegments(linePoints);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -ref33df6df23a479f0002ee7ac929865c53ed6d82 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ef33df6df23a479f0002ee7ac929865c53ed6d82)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -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.18444
@@ -779,6 +800,109 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Een kunstwerklocatie met KWKIDENT &apos;{0}&apos; ligt niet op de referentielijn. Locatie wordt overgeslagen..
+        /// </summary>
+        public static string StructuresImporter_AddNextStructureLocation_0_skipping_location_outside_referenceline {
+            get {
+                return ResourceManager.GetString("StructuresImporter_AddNextStructureLocation_0_skipping_location_outside_reference" +
+                        "line", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kunstwerklocatie met KWKIDENT &apos;{0}&apos; is opnieuw ingelezen..
+        /// </summary>
+        public static string StructuresImporter_AddNextStructureLocation_Location_with_kwkident_0_already_read {
+            get {
+                return ResourceManager.GetString("StructuresImporter_AddNextStructureLocation_Location_with_kwkident_0_already_read" +
+                        "", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kan geen geldige gegevens vinden voor kunstwerklocatie met KWKIDENT &apos;{0}&apos;..
+        /// </summary>
+        public static string StructuresImporter_CreateSpecificStructures_no_structursdata_for_location_0_ {
+            get {
+                return ResourceManager.GetString("StructuresImporter_CreateSpecificStructures_no_structursdata_for_location_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fout bij het lezen van kunstwerk op regel {0}. {1} Dit kunstwerk wordt overgeslagen..
+        /// </summary>
+        public static string StructuresImporter_GetStructureLocationReadResult_Error_reading_Structure_LineNumber_0_Error_1_The_Structure_is_skipped {
+            get {
+                return ResourceManager.GetString("StructuresImporter_GetStructureLocationReadResult_Error_reading_Structure_LineNum" +
+                        "ber_0_Error_1_The_Structure_is_skipped", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inlezen van kunstwerklocatie..
+        /// </summary>
+        public static string StructuresImporter_GetStructureLocationReadResult_reading_structurelocation {
+            get {
+                return ResourceManager.GetString("StructuresImporter_GetStructureLocationReadResult_reading_structurelocation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inlezen van kunstwerklocaties uit een shapebestand..
+        /// </summary>
+        public static string StructuresImporter_ReadStructureLocations_reading_structurelocations {
+            get {
+                return ResourceManager.GetString("StructuresImporter_ReadStructureLocations_reading_structurelocations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inlezen van kunstwerkgegevens uit een kommagescheiden bestand..
+        /// </summary>
+        public static string StructuresImporter_ReadStructureParameterRowsData_reading_structure_data {
+            get {
+                return ResourceManager.GetString("StructuresImporter_ReadStructureParameterRowsData_reading_structure_data", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Inlezen van kunstwerkgegevens..
+        /// </summary>
+        public static string StructuresImporter_ReadStructureParameterRowsData_reading_structuredata {
+            get {
+                return ResourceManager.GetString("StructuresImporter_ReadStructureParameterRowsData_reading_structuredata", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; ontbreekt voor de kunstwerklocatie met KWKIDENT &apos;{1}&apos;..
+        /// </summary>
+        public static string StructuresImporter_ValidateParameterNames_Parameter_0_missing_for_structure_1_ {
+            get {
+                return ResourceManager.GetString("StructuresImporter_ValidateParameterNames_Parameter_0_missing_for_structure_1_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; wordt herhaald voor de kunstwerklocatie met KWKIDENT &apos;{1}&apos;..
+        /// </summary>
+        public static string StructuresImporter_ValidateParameterNames_Parameter_0_repeated_for_structure_1_ {
+            get {
+                return ResourceManager.GetString("StructuresImporter_ValidateParameterNames_Parameter_0_repeated_for_structure_1_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kunstwerklocatie met KWKIDENT &apos;{0}&apos; bevat teveel parameters. De verwachte parameters zijn: &apos;{1}&apos;..
+        /// </summary>
+        public static string StructuresImporter_ValidateParameterNames_Structure_0_has_too_many_parameters_expected_parameters_1_ {
+            get {
+                return ResourceManager.GetString("StructuresImporter_ValidateParameterNames_Structure_0_has_too_many_parameters_exp" +
+                        "ected_parameters_1_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Het kunstwerk heeft geen geldige waarde voor attribuut &apos;{0}&apos;..
         /// </summary>
         public static string StructuresReader_GetNextStructure_Invalid_KWKIDENT {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -ref33df6df23a479f0002ee7ac929865c53ed6d82 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision ef33df6df23a479f0002ee7ac929865c53ed6d82)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -335,4 +335,37 @@
   <data name="StructuresCharacteristicsCsvReader_ParseVarianceType_Column_only_allows_certain_values" xml:space="preserve">
     <value>De 'Boolean' kolom mag uitsluitend de waardes '0' of '1' bevatten, of mag leeg zijn.</value>
   </data>
+  <data name="StructuresImporter_AddNextStructureLocation_0_skipping_location_outside_referenceline" xml:space="preserve">
+    <value>Een kunstwerklocatie met KWKIDENT '{0}' ligt niet op de referentielijn. Locatie wordt overgeslagen.</value>
+  </data>
+  <data name="StructuresImporter_AddNextStructureLocation_Location_with_kwkident_0_already_read" xml:space="preserve">
+    <value>Kunstwerklocatie met KWKIDENT '{0}' is opnieuw ingelezen.</value>
+  </data>
+  <data name="StructuresImporter_GetStructureLocationReadResult_Error_reading_Structure_LineNumber_0_Error_1_The_Structure_is_skipped" xml:space="preserve">
+    <value>Fout bij het lezen van kunstwerk op regel {0}. {1} Dit kunstwerk wordt overgeslagen.</value>
+  </data>
+  <data name="StructuresImporter_GetStructureLocationReadResult_reading_structurelocation" xml:space="preserve">
+    <value>Inlezen van kunstwerklocatie.</value>
+  </data>
+  <data name="StructuresImporter_ReadStructureLocations_reading_structurelocations" xml:space="preserve">
+    <value>Inlezen van kunstwerklocaties uit een shapebestand.</value>
+  </data>
+  <data name="StructuresImporter_ReadStructureParameterRowsData_reading_structure_data" xml:space="preserve">
+    <value>Inlezen van kunstwerkgegevens uit een kommagescheiden bestand.</value>
+  </data>
+  <data name="StructuresImporter_ReadStructureParameterRowsData_reading_structuredata" xml:space="preserve">
+    <value>Inlezen van kunstwerkgegevens.</value>
+  </data>
+  <data name="StructuresImporter_CreateSpecificStructures_no_structursdata_for_location_0_" xml:space="preserve">
+    <value>Kan geen geldige gegevens vinden voor kunstwerklocatie met KWKIDENT '{0}'.</value>
+  </data>
+  <data name="StructuresImporter_ValidateParameterNames_Structure_0_has_too_many_parameters_expected_parameters_1_" xml:space="preserve">
+    <value>Kunstwerklocatie met KWKIDENT '{0}' bevat teveel parameters. De verwachte parameters zijn: '{1}'.</value>
+  </data>
+  <data name="StructuresImporter_ValidateParameterNames_Parameter_0_missing_for_structure_1_" xml:space="preserve">
+    <value>Parameter '{0}' ontbreekt voor de kunstwerklocatie met KWKIDENT '{1}'.</value>
+  </data>
+  <data name="StructuresImporter_ValidateParameterNames_Parameter_0_repeated_for_structure_1_" xml:space="preserve">
+    <value>Parameter '{0}' wordt herhaald voor de kunstwerklocatie met KWKIDENT '{1}'.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -r653c18f73b4404d9ac58d818845474d68e48635d -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 653c18f73b4404d9ac58d818845474d68e48635d)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -56,6 +56,7 @@
     <Compile Include="DikeProfiles\ProfileLocationReader.cs" />
     <Compile Include="DikeProfiles\SheetPileType.cs" />
     <Compile Include="Exceptions\CriticalFileValidationException.cs" />
+    <Compile Include="FileImporters\StructuresImporter.cs" />
     <Compile Include="HydraulicBoundaryLocationsExporter.cs" />
     <Compile Include="ReferenceLines\ReferenceLineExporter.cs" />
     <Compile Include="ReferenceLines\ReferenceLineMetaImporter.cs" />
@@ -71,9 +72,9 @@
     <Compile Include="ReferenceLines\ReferenceLineReader.cs" />
     <Compile Include="ReferenceLines\ReferenceLineWriter.cs" />
     <Compile Include="Structures\StructuresCharacteristicsCsvReader.cs" />
-    <Compile Include="Structures\Structure.cs" />
+    <Compile Include="Structures\StructureLocation.cs" />
     <Compile Include="Structures\StructuresParameterRow.cs" />
-    <Compile Include="Structures\StructuresReader.cs" />
+    <Compile Include="Structures\StructureLocationReader.cs" />
     <Compile Include="Structures\VarianceType.cs" />
   </ItemGroup>
   <ItemGroup>
Fisheye: Tag 423010168fe01b2373e9be55f047659911e670f5 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.IO/Structures/Structure.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocation.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocation.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocation.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,73 @@
+// 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;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.Common.IO.Structures
+{
+    /// <summary>
+    /// Representation of a structure as read from a shapefile.
+    /// </summary>
+    public class StructureLocation
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StructureLocation"/>.
+        /// </summary>
+        /// <param name="id">The identifier for this <see cref="StructureLocation"/>.</param>
+        /// <param name="name">The name of this <see cref="StructureLocation"/>.</param>
+        /// <param name="point">The coordinates of this <see cref="StructureLocation"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public StructureLocation(string id, string name, Point2D point)
+        {
+            if (id == null)
+            {
+                throw new ArgumentNullException("id");
+            }
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+            if (point == null)
+            {
+                throw new ArgumentNullException("point");
+            }
+            Id = id;
+            Name = name;
+            Point = point;
+        }
+
+        /// <summary>
+        /// Gets the identifier for this <see cref="StructureLocation"/>.
+        /// </summary>
+        public string Id { get; private set; }
+
+        /// <summary>
+        /// Gets the name of this <see cref="StructureLocation"/>.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Gets the actual location of this <see cref="StructureLocation"/>.
+        /// </summary>
+        public Point2D Point { get; private set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocationReader.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocationReader.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocationReader.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,169 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using Core.Common.IO.Exceptions;
+using Core.Common.Utils;
+using Core.Common.Utils.Builders;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.IO.Readers;
+using Ringtoets.Common.IO.Properties;
+using CoreCommonUtilsResources = Core.Common.Utils.Properties.Resources;
+
+namespace Ringtoets.Common.IO.Structures
+{
+    /// <summary>
+    /// This class is responsible for reading structures for <see cref="StructureLocation"/> instances.
+    /// </summary>
+    public class StructureLocationReader : IDisposable
+    {
+        private const string idAttributeName = "KWKIDENT";
+        private const string nameAttributeName = "KWKNAAM";
+        private readonly PointShapeFileReader pointsShapeFileReader;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StructureLocationReader"/> class.
+        /// </summary>
+        /// <param name="shapeFilePath">The shape file path.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="shapeFilePath"/> is invalid.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when: <list type="bullet">
+        /// <item><paramref name="shapeFilePath"/> points to a file that does not exist.</item>
+        /// <item><paramref name="shapeFilePath"/> does not only contain point features.</item>
+        /// <item><paramref name="shapeFilePath"/> does not contain all of the required attributes.</item>
+        /// </list></exception>
+        public StructureLocationReader(string shapeFilePath)
+        {
+            FileUtils.ValidateFilePath(shapeFilePath);
+            if (!File.Exists(shapeFilePath))
+            {
+                string message = new FileReaderErrorMessageBuilder(shapeFilePath)
+                    .Build(CoreCommonUtilsResources.Error_File_does_not_exist);
+                throw new CriticalFileReadException(message);
+            }
+
+            pointsShapeFileReader = OpenPointsShapeFile(shapeFilePath);
+
+            CheckRequiredAttributePresence();
+        }
+
+        /// <summary>
+        /// Gets the number of structures present in the shapefile.
+        /// </summary>
+        public int GetStructureCount
+        {
+            get
+            {
+                return pointsShapeFileReader.GetNumberOfFeatures();
+            }
+        }
+
+        /// <summary>
+        /// Retrieve a <see cref="StructureLocation"/> based on the next point feature in the shapefile.
+        /// </summary>
+        /// <exception cref="LineParseException">Thrown when either:
+        /// <list type="bullet">
+        /// <item>The shapefile misses a value for a required attribute.</item>
+        /// <item>The shapefile has an attribute whose type is incorrect.</item>
+        /// </list></exception>
+        /// <returns>A <see cref="StructureLocation"/> based on the next point feature in the shapefile.</returns>
+        public StructureLocation GetNextStructureLocation()
+        {
+            MapPointData mapPointData = (MapPointData) pointsShapeFileReader.ReadFeature();
+
+            IDictionary<string, object> attributes = mapPointData.Features.First().MetaData;
+
+            string attributeIdValue = GetIdAttributeValue(attributes);
+            string attributeNameValue = GetNameAttributeValue(attributes, attributeIdValue);
+
+            Point2D point = mapPointData.Features.First().MapGeometries.First().PointCollections.First().First();
+            if (attributeIdValue == null)
+            {
+                throw new LineParseException(string.Format(Resources.StructuresReader_GetNextStructure_Invalid_KWKIDENT, idAttributeName));
+            }
+            return new StructureLocation(attributeIdValue, attributeNameValue, point);
+        }
+
+        public void Dispose()
+        {
+            pointsShapeFileReader.Dispose();
+        }
+
+        private static string GetIdAttributeValue(IDictionary<string, object> attributes)
+        {
+            var attributeIdValue = attributes[idAttributeName] as string;
+            return attributeIdValue;
+        }
+
+        private string GetNameAttributeValue(IDictionary<string, object> attributes, string defaultName)
+        {
+            if (!pointsShapeFileReader.HasAttribute(nameAttributeName))
+            {
+                return defaultName;
+            }
+            var attributeNameValue = attributes[nameAttributeName] as string;
+            return string.IsNullOrWhiteSpace(attributeNameValue) ? defaultName : attributeNameValue;
+        }
+
+        /// <summary>
+        /// Open a shapefile containing structures as point features.
+        /// </summary>
+        /// <param name="shapeFilePath">Shape file path.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="shapeFilePath"/> is invalid.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when:
+        /// <list type="bullet">
+        /// <item><paramref name="shapeFilePath"/> points to a file that doesn't exist.</item>
+        /// <item>The shapefile has non-point geometries in it.</item>
+        /// <item>An unexpected error occurred when reading the shapefile.</item>
+        /// </list></exception>
+        /// <returns>Return an instance of <see cref="PointShapeFileReader"/>.</returns>
+        private static PointShapeFileReader OpenPointsShapeFile(string shapeFilePath)
+        {
+            try
+            {
+                return new PointShapeFileReader(shapeFilePath);
+            }
+            catch (CriticalFileReadException e)
+            {
+                if (e.InnerException is ApplicationException)
+                {
+                    string message = new FileReaderErrorMessageBuilder(shapeFilePath)
+                        .Build(Resources.PointShapefileReader_File_can_only_contain_points);
+                    throw new CriticalFileReadException(message, e);
+                }
+
+                throw;
+            }
+        }
+
+        private void CheckRequiredAttributePresence()
+        {
+            if (!pointsShapeFileReader.HasAttribute(idAttributeName))
+            {
+                throw new CriticalFileReadException(
+                    string.Format(Resources.ProfileLocationReader_CheckRequiredAttributePresence_Missing_attribute_0_, idAttributeName));
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 423010168fe01b2373e9be55f047659911e670f5 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresReader.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/StructuresImporterTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/StructuresImporterTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/StructuresImporterTest.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,31 @@
+// 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 NUnit.Framework;
+
+namespace Ringtoets.Common.IO.Test.FileImporters
+{
+    [TestFixture]
+    public class StructuresImporterTest
+    {
+         
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj
===================================================================
diff -u -r653c18f73b4404d9ac58d818845474d68e48635d -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj	(.../Ringtoets.Common.IO.Test.csproj)	(revision 653c18f73b4404d9ac58d818845474d68e48635d)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj	(.../Ringtoets.Common.IO.Test.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -59,6 +59,7 @@
     <Compile Include="DikeProfiles\ProfileLocationReaderTest.cs" />
     <Compile Include="DikeProfiles\ProfileLocationTest.cs" />
     <Compile Include="Exceptions\CriticalFileValidationExceptionTest.cs" />
+    <Compile Include="FileImporters\StructuresImporterTest.cs" />
     <Compile Include="HydraulicBoundaryLocationsExporterTest.cs" />
     <Compile Include="ReferenceLines\ReferenceLineExporterTest.cs" />
     <Compile Include="ReferenceLines\ReferenceLineMetaImporterTest.cs" />
@@ -68,10 +69,10 @@
     <Compile Include="ReferenceLines\ReferenceLineImporterTest.cs" />
     <Compile Include="ReferenceLines\ReferenceLineReaderTest.cs" />
     <Compile Include="ReferenceLines\ReferenceLineWriterTest.cs" />
+    <Compile Include="Structures\StructureLocationReaderTest.cs" />
+    <Compile Include="Structures\StructureLocationTest.cs" />
     <Compile Include="Structures\StructuresCharacteristicsCsvReaderTest.cs" />
     <Compile Include="Structures\StructuresParameterRowTest.cs" />
-    <Compile Include="Structures\StructuresReaderTest.cs" />
-    <Compile Include="Structures\StructureTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureLocationReaderTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureLocationReaderTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureLocationReaderTest.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,325 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using Core.Common.Base.Geometry;
+using Core.Common.IO.Exceptions;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.IO.Structures;
+
+namespace Ringtoets.Common.IO.Test.Structures
+{
+    [TestFixture]
+    public class StructureLocationReaderTest
+    {
+        [Test]
+        public void Constructor_ValidFilePath_ExpectedValues()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "CorrectFiles", "Kunstwerken.shp"));
+
+            // Call
+            using (var reader = new StructureLocationReader(validFilePath))
+            {
+                // Assert
+                Assert.IsInstanceOf<IDisposable>(reader);
+            }
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase("      ")]
+        [TestCase(null)]
+        public void Constructor_FilePathIsNullOrWhiteSpace_ThrowArgumentException(string invalidFilePath)
+        {
+            // Call
+            TestDelegate call = () => new StructureLocationReader(invalidFilePath);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet leeg of ongedefinieerd zijn.",
+                                                invalidFilePath);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        [Test]
+        public void Constructor_FilePathHasInvalidPathCharacter_ThrowArgumentException()
+        {
+            // Setup
+            char[] invalidFileNameChars = Path.GetInvalidFileNameChars();
+
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "CorrectFiles", "Kunstwerken.shp"));
+            string invalidFilePath = validFilePath.Replace("e", invalidFileNameChars[1].ToString());
+
+            // Call
+            TestDelegate call = () => new StructureLocationReader(invalidFilePath);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet de volgende tekens bevatten: {1}",
+                                                invalidFilePath, string.Join(", ", invalidFileNameChars));
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        [Test]
+        public void Constructor_FilePathIsActuallyDirectoryPath_ThrowArgumentException()
+        {
+            // Setup
+            string invalidFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                                Path.DirectorySeparatorChar.ToString());
+
+            // Call
+            TestDelegate call = () => new StructureLocationReader(invalidFilePath);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet verwijzen naar een lege bestandsnaam.",
+                                                invalidFilePath);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        [Test]
+        public void Constructor_FileDoesNotExist_ThrowCriticalFileReadException()
+        {
+            // Setup
+            string invalidFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "I_do_not_exist.shp");
+
+            // Call
+            TestDelegate call = () => new StructureLocationReader(invalidFilePath);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.",
+                                                invalidFilePath);
+            var message = Assert.Throws<CriticalFileReadException>(call).Message;
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        [TestCase("Multiple_Polygon_with_ID.shp")]
+        [TestCase("Multiple_PolyLine_with_ID.shp")]
+        [TestCase("Single_Multi-Polygon_with_ID.shp")]
+        [TestCase("Single_Multi-PolyLine_with_ID.shp")]
+        [TestCase("Single_Polygon_with_ID.shp")]
+        [TestCase("Single_PolyLine_with_ID.shp")]
+        public void Constructor_ShapefileDoesNotHavePointFeatures_ThrowCriticalFileReadException(string shapeFileName)
+        {
+            // Setup
+            string invalidFilePath = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, shapeFileName);
+
+            // Call
+            TestDelegate call = () => new StructureLocationReader(invalidFilePath);
+
+            // Assert
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Kon geen punten vinden in dit bestand.",
+                                                invalidFilePath);
+            var message = Assert.Throws<CriticalFileReadException>(call).Message;
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        public void Constructor_ShapefileWithoutAttributeKWKIDENT_ThrowCriticalFileReadException()
+        {
+            // Setup
+            string invalidFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                                Path.Combine("Structures", "StructuresWithoutKWKIDENT", "Kunstwerken.shp"));
+
+            // Call
+            TestDelegate call = () => new StructureLocationReader(invalidFilePath);
+
+            // Assert
+            var expectedMessage = string.Format("Het bestand heeft geen attribuut '{0}'. Dit attribuut is vereist.",
+                                                "KWKIDENT");
+            string message = Assert.Throws<CriticalFileReadException>(call).Message;
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        public void Constructor_FileInUse_ThrowCriticalFileReadException()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "CorrectFiles", "Kunstwerken.shp"));
+
+            using (new FileStream(validFilePath, FileMode.Open))
+            {
+                // Call
+                TestDelegate call = () => new StructureLocationReader(validFilePath);
+
+                // Assert
+                var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie.",
+                                                    validFilePath);
+                var exception = Assert.Throws<CriticalFileReadException>(call);
+                Assert.AreEqual(expectedMessage, exception.Message);
+                Assert.IsInstanceOf<IOException>(exception.InnerException);
+            }
+        }
+
+        [Test]
+        public void GetStructureCount_FileWithSixPoints_GetSix()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "CorrectFiles", "Kunstwerken.shp"));
+
+            using (var reader = new StructureLocationReader(validFilePath))
+            {
+                // Call
+                int count = reader.GetStructureCount;
+
+                // Assert
+                Assert.AreEqual(6, count);
+            }
+        }
+
+        [Test]
+        public void GetNextStructure_ShapefileWithoutAttributeKWKNAAM_NamesEqualAttributeKWKIDENT()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "StructuresWithoutKWKNAAM", "Kunstwerken.shp"));
+            IList<StructureLocation> structures = new List<StructureLocation>();
+
+            using (var reader = new StructureLocationReader(validFilePath))
+            {
+                // Call
+                int count = reader.GetStructureCount;
+                for (int i = 0; i < count; i++)
+                {
+                    structures.Add(reader.GetNextStructureLocation());
+                }
+
+                // Assert
+                Assert.AreEqual(structures[0].Id, structures[0].Name);
+                Assert.AreEqual(structures[1].Id, structures[1].Name);
+                Assert.AreEqual(structures[2].Id, structures[2].Name);
+                Assert.AreEqual(structures[3].Id, structures[3].Name);
+                Assert.AreEqual(structures[4].Id, structures[4].Name);
+                Assert.AreEqual(structures[5].Id, structures[5].Name);
+            }
+        }
+
+        [Test]
+        public void GetNextStructure_ShapefileAttributeKWKNAAMSometimesNullOrWhitespace_GetSixStructuresWithCorrectAttributes()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "StructuresSomeWithEmptyKWKNAAM", "Kunstwerken.shp"));
+            IList<StructureLocation> structures = new List<StructureLocation>();
+
+            using (var reader = new StructureLocationReader(validFilePath))
+            {
+                // Call
+                int count = reader.GetStructureCount;
+                for (int i = 0; i < count; i++)
+                {
+                    structures.Add(reader.GetNextStructureLocation());
+                }
+
+                // Assert
+                Assert.AreEqual(6, structures.Count);
+
+                Assert.AreEqual("Coupure Den Oever (90k1)", structures[0].Name);
+                Assert.AreEqual("KUNST2", structures[1].Name);
+                Assert.AreEqual("Gemaal Lely (93k4)", structures[2].Name);
+                Assert.AreEqual("Gemaal de Stontele (94k1)", structures[3].Name);
+                Assert.AreEqual("KUNST5", structures[4].Name);
+                Assert.AreEqual("KUNST6", structures[5].Name);
+            }
+        }
+
+        [Test]
+        public void GetNextStructure_ShapefileAttributeKWKIDENTValuesAreNull_ThrowLineParseException()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "StructuresWithNullKWKIDENT", "Kunstwerken.shp"));
+
+            using (var reader = new StructureLocationReader(validFilePath))
+            {
+                // Call
+                TestDelegate call = () => reader.GetNextStructureLocation();
+
+                // Assert
+                var exception = Assert.Throws<LineParseException>(call);
+                Assert.AreEqual("Het kunstwerk heeft geen geldige waarde voor attribuut 'KWKIDENT'.", exception.Message);
+            }
+        }
+
+        [Test]
+        public void GetNextStructure_FileWithSixStructures_GetSixStructuresWithCorrectAttributes()
+        {
+            // Setup
+            string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
+                                                              Path.Combine("Structures", "CorrectFiles", "Kunstwerken.shp"));
+            IList<StructureLocation> structures = new List<StructureLocation>();
+
+            using (var reader = new StructureLocationReader(validFilePath))
+            {
+                // Call
+                int count = reader.GetStructureCount;
+                for (int i = 0; i < count; i++)
+                {
+                    structures.Add(reader.GetNextStructureLocation());
+                }
+
+                // Assert
+                Assert.AreEqual(6, structures.Count);
+
+                Assert.AreEqual("KUNST1", structures[0].Id);
+                Assert.AreEqual("KUNST2", structures[1].Id);
+                Assert.AreEqual("KUNST3", structures[2].Id);
+                Assert.AreEqual("KUNST4", structures[3].Id);
+                Assert.AreEqual("KUNST5", structures[4].Id);
+                Assert.AreEqual("KUNST6", structures[5].Id);
+
+                Assert.AreEqual("Coupure Den Oever (90k1)", structures[0].Name);
+                Assert.AreEqual("Gemaal Leemans (93k3)", structures[1].Name);
+                Assert.AreEqual("Gemaal Lely (93k4)", structures[2].Name);
+                Assert.AreEqual("Gemaal de Stontele (94k1)", structures[3].Name);
+                Assert.AreEqual("Stontelerkeersluis (93k1)", structures[4].Name);
+                Assert.AreEqual("Stontelerschutsluis (93k2)", structures[5].Name);
+
+                Assert.IsInstanceOf(typeof(Point2D), structures[0].Point);
+                Assert.IsInstanceOf(typeof(Point2D), structures[1].Point);
+                Assert.IsInstanceOf(typeof(Point2D), structures[2].Point);
+                Assert.IsInstanceOf(typeof(Point2D), structures[3].Point);
+                Assert.IsInstanceOf(typeof(Point2D), structures[4].Point);
+                Assert.IsInstanceOf(typeof(Point2D), structures[5].Point);
+
+                Assert.AreEqual(131144.094, structures[0].Point.X);
+                Assert.AreEqual(131538.705, structures[1].Point.X);
+                Assert.AreEqual(135878.442, structures[2].Point.X);
+                Assert.AreEqual(131225.017, structures[3].Point.X);
+                Assert.AreEqual(131270.38, structures[4].Point.X);
+                Assert.AreEqual(131507.119, structures[5].Point.X);
+
+                Assert.AreEqual(549979.893, structures[0].Point.Y);
+                Assert.AreEqual(548316.752, structures[1].Point.Y);
+                Assert.AreEqual(532149.859, structures[2].Point.Y);
+                Assert.AreEqual(548395.948, structures[3].Point.Y);
+                Assert.AreEqual(548367.462, structures[4].Point.Y);
+                Assert.AreEqual(548322.951, structures[5].Point.Y);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureLocationTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureLocationTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureLocationTest.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,81 @@
+// 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;
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+using Ringtoets.Common.IO.Structures;
+
+namespace Ringtoets.Common.IO.Test.Structures
+{
+    [TestFixture]
+    public class StructureLocationTest
+    {
+        private const string id = "anId";
+        private const string name = "aName";
+        private readonly Point2D point = new Point2D(0, 0);
+
+        [Test]
+        public void Constructor_IdNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new StructureLocation(null, name, point);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("id", paramName);
+        }
+
+        [Test]
+        public void Constructor_NameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new StructureLocation(id, null, point);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("name", paramName);
+        }
+
+        [Test]
+        public void Constructor_PointNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new StructureLocation(id, name, null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("point", paramName);
+        }
+
+        [Test]
+        public void Constructor_ValidParameters_ExpectedProperties()
+        {
+            // Call
+            var structure = new StructureLocation(id, name, point);
+
+            // Assert
+            Assert.AreEqual("anId", structure.Id);
+            Assert.AreEqual("aName", structure.Name);
+            Assert.AreEqual(new Point2D(0, 0), structure.Point);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 423010168fe01b2373e9be55f047659911e670f5 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructureTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 423010168fe01b2373e9be55f047659911e670f5 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresReaderTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs
===================================================================
diff -u -r3500ad219742fca6d4a9057e8c92435dde8d8fc1 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs	(.../HeightStructure.cs)	(revision 3500ad219742fca6d4a9057e8c92435dde8d8fc1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs	(.../HeightStructure.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -19,12 +19,154 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Ringtoets.Common.Data.Probabilistics;
+
 namespace Ringtoets.HeightStructures.Data
 {
     /// <summary>
     /// Definition of a height structure for the <see cref="HeightStructuresFailureMechanism"/>.
     /// </summary>
     public class HeightStructure
     {
+        /// <summary>
+        /// Creates a new instance of <see cref="HeightStructure"/>.
+        /// </summary>
+        /// <param name="name">The name of the height structure.</param>
+        /// <param name="id">The identifier of the height structure.</param>
+        /// <param name="location">The location of the height structure.</param>
+        /// <param name="orientationOfTheNormalOfTheStructure">The orientation of the height structure, relative to north.</param>
+        /// <param name="levelOfCrestOfStructureMean">The mean crest level of the height structure.</param>
+        /// <param name="levelOfCrestOfStructureStandardDeviation">The standard deviation of the crest level of the height structure.</param>
+        /// <param name="flowWidthAtBottomProtectionMean">The mean flow width of the height structure at the bottom protection.</param>
+        /// <param name="flowWidthAtBottomProtectionStandardDeviation">The standard deviation of the flow width of the height structure at the bottom protection.</param>
+        /// <param name="criticalOvertoppingDischargeMean">The mean critical overtopping discharge of the height structure.</param>
+        /// <param name="criticalOvertoppingDischargeStandardDeviation">The standard deviation of critical overtopping discharge of the height structure.</param>
+        /// <param name="widthOfFlowAperturesMean">The mean flow apertures width of the height structure.</param>
+        /// <param name="widthOfFlowAperturesStandardDeviation">The standard deviation of flow apertures width of the height structure.</param>
+        /// <param name="failureProbabilityOfStructureGivenErosion">The failure probability of the height structure, given erosion.</param>
+        /// <param name="storageStructureAreaMean">The mean storage area of the height structure.</param>
+        /// <param name="storageStructureAreaStandardDeviation">The standard deviation of storage area of the height structure.</param>
+        /// <param name="allowableIncreaseOfLevelForStorageMean">The mean allowable increase of level for storage of the height structure.</param>
+        /// <param name="allowableIncreaseOfLevelForStorageStandardDeviation">The standard deviation of allowable increase of level for storage of the height structure.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> or <paramref name="id"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="location"/> is <c>null</c>.</exception>
+        public HeightStructure(string name, string id, Point2D location,
+                               double orientationOfTheNormalOfTheStructure,
+                               double levelOfCrestOfStructureMean, double levelOfCrestOfStructureStandardDeviation,
+                               double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation,
+                               double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeStandardDeviation,
+                               double widthOfFlowAperturesMean, double widthOfFlowAperturesStandardDeviation,
+                               double failureProbabilityOfStructureGivenErosion,
+                               double storageStructureAreaMean, double storageStructureAreaStandardDeviation,
+                               double allowableIncreaseOfLevelForStorageMean, double allowableIncreaseOfLevelForStorageStandardDeviation
+            )
+        {
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                throw new ArgumentException("name");
+            }
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                throw new ArgumentException("id");
+            }
+            if (location == null)
+            {
+                throw new ArgumentNullException("location");
+            }
+
+            Name = name;
+            Id = id;
+            Location = location;
+            OrientationOfTheNormalOfTheStructure = new RoundedDouble(2, orientationOfTheNormalOfTheStructure);
+            LevelOfCrestOfStructure = new NormalDistribution(2)
+            {
+                Mean = new RoundedDouble(2, levelOfCrestOfStructureMean),
+                StandardDeviation = new RoundedDouble(2, levelOfCrestOfStructureStandardDeviation)
+            };
+            FlowWidthAtBottomProtection = new LogNormalDistribution(2)
+            {
+                Mean = new RoundedDouble(2, flowWidthAtBottomProtectionMean),
+                StandardDeviation = new RoundedDouble(2, flowWidthAtBottomProtectionStandardDeviation)
+            };
+            CriticalOvertoppingDischarge = new LogNormalDistribution(2)
+            {
+                Mean = new RoundedDouble(2, criticalOvertoppingDischargeMean),
+                StandardDeviation = new RoundedDouble(2, criticalOvertoppingDischargeStandardDeviation)
+            };
+            WidthOfFlowApertures = new NormalDistribution(2)
+            {
+                Mean = new RoundedDouble(2, widthOfFlowAperturesMean),
+                StandardDeviation = new RoundedDouble(2, widthOfFlowAperturesStandardDeviation)
+            };
+            FailureProbabilityOfStructureGivenErosion = failureProbabilityOfStructureGivenErosion;
+            StorageStructureArea = new LogNormalDistribution(2)
+            {
+                Mean = new RoundedDouble(2, storageStructureAreaMean),
+                StandardDeviation = new RoundedDouble(2, storageStructureAreaStandardDeviation)
+            };
+            AllowableIncreaseOfLevelForStorage = new LogNormalDistribution(2)
+            {
+                Mean = new RoundedDouble(2, allowableIncreaseOfLevelForStorageMean),
+                StandardDeviation = new RoundedDouble(2, allowableIncreaseOfLevelForStorageStandardDeviation)
+            };
+        }
+
+        /// <summary>
+        /// Gets the name of the height structure.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Gets the identifier of the height structure.
+        /// </summary>
+        public string Id { get; private set; }
+
+        /// <summary>
+        /// Gets the location of the height structure.
+        /// </summary>
+        public Point2D Location { get; private set; }
+
+        /// <summary>
+        /// Gets the orientation of the height structure, relative to north.
+        /// </summary>
+        public RoundedDouble OrientationOfTheNormalOfTheStructure { get; private set; }
+
+        /// <summary>
+        /// Gets the crest level of the height structure.
+        /// </summary>
+        public NormalDistribution LevelOfCrestOfStructure { get; private set; }
+
+        /// <summary>
+        /// Gets the flow width of the height structure at the bottom protection.
+        /// </summary>
+        public LogNormalDistribution FlowWidthAtBottomProtection { get; private set; }
+
+        /// <summary>
+        /// Gets the critical overtopping discharge of the height structure.
+        /// </summary>
+        public LogNormalDistribution CriticalOvertoppingDischarge { get; private set; }
+
+        /// <summary>
+        /// Gets the flow apertures width of the height structure.
+        /// </summary>
+        public NormalDistribution WidthOfFlowApertures { get; private set; }
+
+        /// <summary>
+        /// Gets the failure probability of the height structure, given erosion.
+        /// </summary>
+        public double FailureProbabilityOfStructureGivenErosion { get; private set; }
+
+        /// <summary>
+        /// Gets the storage area of the height structure.
+        /// </summary>
+        public LogNormalDistribution StorageStructureArea { get; private set; }
+
+        /// <summary>
+        /// Gets the allowable increase of level for storage of the height structure.
+        /// </summary>
+        public LogNormalDistribution AllowableIncreaseOfLevelForStorage { get; private set; }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs	(revision 0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,150 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.IO.FileImporters;
+using Ringtoets.Common.IO.Properties;
+using Ringtoets.Common.IO.Structures;
+using Ringtoets.HeightStructures.Data;
+using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
+
+namespace Ringtoets.HeightStructures.IO
+{
+    /// <summary>
+    /// Imports point shapefiles containing height structure locations and csv files containing height structure schematizations.
+    /// </summary>
+    public class HeightStructuresImporter : StructuresImporter<ObservableList<HeightStructure>>
+    {
+        private static readonly string[] requiredParameterNames =
+        {
+            "KW_HOOGTE1",
+            "KW_HOOGTE2",
+            "KW_HOOGTE3",
+            "KW_HOOGTE4",
+            "KW_HOOGTE5",
+            "KW_HOOGTE6",
+            "KW_HOOGTE7",
+            "KW_HOOGTE8"
+        };
+
+        private readonly ObservableList<HeightStructure> importTarget;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="HeightStructuresImporter"/>.
+        /// </summary>
+        /// <param name="importTarget">The height structures to import on.</param>
+        /// <param name="referenceLine">The reference line used to check if the <see cref="HeightStructure"/>
+        /// objects found in the file are intersecting it.</param>
+        /// <param name="filePath">The path to the file to import from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="referenceLine"/>, 
+        /// <paramref name="filePath"/> or <paramref name="importTarget"/> is <c>null</c>.</exception>
+        public HeightStructuresImporter(ObservableList<HeightStructure> importTarget, ReferenceLine referenceLine, string filePath)
+            : base(referenceLine, filePath, importTarget)
+        {
+            this.importTarget = importTarget;
+        }
+
+        protected override void CreateSpecificStructures(ICollection<StructureLocation> structureLocations,
+                                                         Dictionary<string, List<StructuresParameterRow>> groupedStructureParameterRows)
+        {
+            IEnumerable<HeightStructure> importedHeightStructures = CreateHeightStructures(structureLocations, groupedStructureParameterRows);
+
+            foreach (HeightStructure heightStructure in importedHeightStructures)
+            {
+                importTarget.Add(heightStructure);
+            }
+        }
+
+        private IEnumerable<HeightStructure> CreateHeightStructures(IEnumerable<StructureLocation> structureLocations,
+                                                                    Dictionary<string, List<StructuresParameterRow>> groupedStructureParameterRows)
+        {
+            var heightStructures = new List<HeightStructure>();
+            foreach (StructureLocation structureLocation in structureLocations)
+            {
+                string id = structureLocation.Id;
+
+                if (!groupedStructureParameterRows.ContainsKey(id))
+                {
+                    log.ErrorFormat(Resources.StructuresImporter_CreateSpecificStructures_no_structursdata_for_location_0_, id);
+                    continue;
+                }
+
+                List<StructuresParameterRow> structureParameterRows = groupedStructureParameterRows[id];
+                if (!ValidateParameterNames(structureParameterRows, id))
+                {
+                    continue;
+                }
+
+                HeightStructure heightStructure = CreateHeightStructure(structureLocation, structureParameterRows);
+                heightStructures.Add(heightStructure);
+            }
+            return heightStructures;
+        }
+
+        private bool ValidateParameterNames(List<StructuresParameterRow> structureParameterRows, string id)
+        {
+            bool isValid = true;
+            if (structureParameterRows.Count > requiredParameterNames.Length)
+            {
+                log.ErrorFormat(RingtoetsCommonIOResources.StructuresImporter_ValidateParameterNames_Structure_0_has_too_many_parameters_expected_parameters_1_, id, string.Join(", ", requiredParameterNames));
+                isValid = false;
+            }
+
+            foreach (string name in requiredParameterNames)
+            {
+                int count = structureParameterRows.Count(row => row.ParameterId.Equals(name));
+                if (count < 1)
+                {
+                    log.ErrorFormat(RingtoetsCommonIOResources.StructuresImporter_ValidateParameterNames_Parameter_0_missing_for_structure_1_, name, id);
+                    isValid = false;
+                }
+                if (count > 1)
+                {
+                    log.ErrorFormat(RingtoetsCommonIOResources.StructuresImporter_ValidateParameterNames_Parameter_0_repeated_for_structure_1_, name, id);
+                    isValid = false;
+                }
+            }
+            return isValid;
+        }
+
+        private static HeightStructure CreateHeightStructure(StructureLocation structureLocation, List<StructuresParameterRow> structureParameterRows)
+        {
+            var heightStructure = new HeightStructure(
+                structureLocation.Name,
+                structureLocation.Id,
+                structureLocation.Point,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE1").NumericalValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE2").NumericalValue, structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE2").VarianceValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE3").NumericalValue, structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE3").VarianceValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE4").NumericalValue, structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE4").VarianceValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE5").NumericalValue, structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE5").VarianceValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE6").NumericalValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE7").NumericalValue, structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE7").VarianceValue,
+                structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE8").NumericalValue, structureParameterRows.First(row => row.ParameterId == "KW_HOOGTE8").VarianceValue
+                );
+            return heightStructure;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Ringtoets.HeightStructures.IO.csproj
===================================================================
diff -u -r60bd3c063c8173f762c5762096efa38b87f780ed -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Ringtoets.HeightStructures.IO.csproj	(.../Ringtoets.HeightStructures.IO.csproj)	(revision 60bd3c063c8173f762c5762096efa38b87f780ed)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Ringtoets.HeightStructures.IO.csproj	(.../Ringtoets.HeightStructures.IO.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -32,20 +32,58 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <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>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="HeightStructuresImporter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
+      <Name>Core.Common.Base</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.IO\Core.Common.IO.csproj">
+      <Project>{e344867e-9ac9-44c8-88a5-8185681679a9}</Project>
+      <Name>Core.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
+      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
+      <Name>Ringtoets.Common.Data</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.HeightStructures.Data\Ringtoets.HeightStructures.Data.csproj">
+      <Project>{1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}</Project>
+      <Name>Ringtoets.HeightStructures.Data</Name>
+      <Private>False</Private>
+    </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: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/packages.config
===================================================================
diff -u
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/packages.config	(revision 0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/packages.config	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.4" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r6e5f2280217d2ba8367c240bd44bcfe3a21cebc8 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 6e5f2280217d2ba8367c240bd44bcfe3a21cebc8)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -39,13 +39,15 @@
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.PropertyClasses;
 using Ringtoets.HeightStructures.Forms.Views;
+using Ringtoets.HeightStructures.IO;
 using Ringtoets.HeightStructures.Service;
 using Ringtoets.HydraRing.IO;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using HeightStructuresDataResources = Ringtoets.HeightStructures.Data.Properties.Resources;
 using HeightStructuresFormsResources = Ringtoets.HeightStructures.Forms.Properties.Resources;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Plugin
 {
@@ -64,13 +66,14 @@
         {
             yield return new ImportInfo<HeightStructureContext>()
             {
-                Name = RingtoetsCommonFormsResources.StructuresCollection_DisplayName,
+                CreateFileImporter = (context, filePath) => new HeightStructuresImporter(context.WrappedData,
+                                                                                         context.AssessmentSection.ReferenceLine,
+                                                                                         filePath),
+                Name = RingtoetsCommonFormsResources.StructuresImporter_DisplayName,
                 Category = RingtoetsCommonFormsResources.Ringtoets_Category,
-                FileFilter = string.Format("{0} {1}",
-                                           RingtoetsCommonFormsResources.StructuresCollection_DisplayName,
-                                           RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter),
+                Image = RingtoetsCommonFormsResources.StructuresIcon,
+                FileFilter = RingtoetsCommonIOResources.DataTypeDisplayName_shape_file_filter,
                 IsEnabled = context => context.AssessmentSection.ReferenceLine != null
-                //TODO: WTI-579 Hook this up with the importer
             };
         }
 
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj
===================================================================
diff -u -r915001caffacbbee15c0e3bf449072245bc5f509 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 915001caffacbbee15c0e3bf449072245bc5f509)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -75,6 +75,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52ba7627-cbab-4209-be77-3b5f31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
       <Name>Ringtoets.Common.Service</Name>
@@ -105,6 +110,11 @@
       <Name>Ringtoets.HeightStructures.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.HeightStructures.IO\Ringtoets.HeightStructures.IO.csproj">
+      <Project>{d63fcfec-34e8-4c68-8b4f-99338d2447ac}</Project>
+      <Name>Ringtoets.HeightStructures.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.HeightStructures.Service\Ringtoets.HeightStructures.Service.csproj">
       <Project>{20DD96D3-001E-407A-AE2E-432887088F1F}</Project>
       <Name>Ringtoets.HeightStructures.Service</Name>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs
===================================================================
diff -u -r2956b333ae2eca4e763754a548fc964f413058a7 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs	(.../HeightStructureTest.cs)	(revision 2956b333ae2eca4e763754a548fc964f413058a7)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs	(.../HeightStructureTest.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -19,12 +19,126 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Probabilistics;
 
 namespace Ringtoets.HeightStructures.Data.Test
 {
     [TestFixture]
     public class HeightStructureTest
     {
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void Constructor_NameNullOrWhiteSpace_ThrowsArgumentException(string name)
+        {
+            // Call
+            TestDelegate call = () => new HeightStructure(name, "anId", new Point2D(0, 0), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "name");
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void Constructor_IdNullOrWhiteSpace_ThrowsArgumentException(string id)
+        {
+            // Call
+            TestDelegate call = () => new HeightStructure("aName", id, new Point2D(0, 0), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "id");
+        }
+
+        [Test]
+        public void Constructor_LocationNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new HeightStructure("aName", "anId", null, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("location", paramName);
+        }
+
+        [Test]
+        public void Constructor_ValidData_ExpectedValues()
+        {
+            // Setup
+            var location = new Point2D(1.22, 2.333);
+
+            // Call
+            var heightStructure = new HeightStructure("aName", "anId", location, 
+                                                      0.12345, 
+                                                      234.567, 0.23456, 
+                                                      345.678, 0.34567, 
+                                                      456.789, 0.45678, 
+                                                      567.890, 0.56789, 
+                                                      0.67890, 
+                                                      112.223, 0.11222, 
+                                                      225.336, 0.22533);
+
+            // Assert
+            Assert.AreEqual("aName", heightStructure.Name);
+            Assert.AreEqual("anId", heightStructure.Id);
+            Assert.IsInstanceOf<Point2D>(heightStructure.Location);
+            Assert.AreEqual(location.X, heightStructure.Location.X);
+            Assert.AreEqual(location.Y, heightStructure.Location.Y);
+
+            Assert.IsInstanceOf<RoundedDouble>(heightStructure.OrientationOfTheNormalOfTheStructure);
+            Assert.AreEqual(2, heightStructure.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.12, heightStructure.OrientationOfTheNormalOfTheStructure.Value);
+
+            var levelOfCrestOfStructure = heightStructure.LevelOfCrestOfStructure;
+            Assert.IsInstanceOf<NormalDistribution>(levelOfCrestOfStructure);
+            Assert.AreEqual(2, levelOfCrestOfStructure.Mean.NumberOfDecimalPlaces);
+            Assert.AreEqual(234.57, levelOfCrestOfStructure.Mean.Value);
+            Assert.AreEqual(2, levelOfCrestOfStructure.StandardDeviation.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.23, levelOfCrestOfStructure.StandardDeviation.Value);
+
+            var flowWidthAtBottomProtection = heightStructure.FlowWidthAtBottomProtection;
+            Assert.IsInstanceOf<LogNormalDistribution>(flowWidthAtBottomProtection);
+            Assert.AreEqual(2, flowWidthAtBottomProtection.Mean.NumberOfDecimalPlaces);
+            Assert.AreEqual(345.68, flowWidthAtBottomProtection.Mean.Value);
+            Assert.AreEqual(2, flowWidthAtBottomProtection.StandardDeviation.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.35, flowWidthAtBottomProtection.StandardDeviation.Value);
+
+            var criticalOvertoppingDischarge = heightStructure.CriticalOvertoppingDischarge;
+            Assert.IsInstanceOf<LogNormalDistribution>(criticalOvertoppingDischarge);
+            Assert.AreEqual(2, criticalOvertoppingDischarge.Mean.NumberOfDecimalPlaces);
+            Assert.AreEqual(456.79, criticalOvertoppingDischarge.Mean.Value);
+            Assert.AreEqual(2, criticalOvertoppingDischarge.StandardDeviation.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.46, criticalOvertoppingDischarge.StandardDeviation.Value);
+
+            var widthOfFlowApertures = heightStructure.WidthOfFlowApertures;
+            Assert.IsInstanceOf<NormalDistribution>(widthOfFlowApertures);
+            Assert.AreEqual(2, widthOfFlowApertures.Mean.NumberOfDecimalPlaces);
+            Assert.AreEqual(567.89, widthOfFlowApertures.Mean.Value);
+            Assert.AreEqual(2, widthOfFlowApertures.StandardDeviation.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.57, widthOfFlowApertures.StandardDeviation.Value);
+
+            Assert.AreEqual(0.67890, heightStructure.FailureProbabilityOfStructureGivenErosion);
+
+            var storageStructureArea = heightStructure.StorageStructureArea;
+            Assert.IsInstanceOf<LogNormalDistribution>(storageStructureArea);
+            Assert.AreEqual(2, storageStructureArea.Mean.NumberOfDecimalPlaces);
+            Assert.AreEqual(112.22, storageStructureArea.Mean.Value);
+            Assert.AreEqual(2, storageStructureArea.StandardDeviation.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.11, storageStructureArea.StandardDeviation.Value);
+
+            var allowableIncreaseOfLevelForStorage = heightStructure.AllowableIncreaseOfLevelForStorage;
+            Assert.IsInstanceOf<LogNormalDistribution>(allowableIncreaseOfLevelForStorage);
+            Assert.AreEqual(2, allowableIncreaseOfLevelForStorage.Mean.NumberOfDecimalPlaces);
+            Assert.AreEqual(225.34, allowableIncreaseOfLevelForStorage.Mean.Value);
+            Assert.AreEqual(2, allowableIncreaseOfLevelForStorage.StandardDeviation.NumberOfDecimalPlaces);
+            Assert.AreEqual(0.23, allowableIncreaseOfLevelForStorage.StandardDeviation.Value);
+        }
     }
 }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructureContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0b5415143ee123cb716065ae7b7681913d2587e2 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructureContextTreeNodeInfoTest.cs	(.../HeightStructureContextTreeNodeInfoTest.cs)	(revision 0b5415143ee123cb716065ae7b7681913d2587e2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructureContextTreeNodeInfoTest.cs	(.../HeightStructureContextTreeNodeInfoTest.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -22,6 +22,7 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
@@ -227,8 +228,16 @@
 
         private static HeightStructure CreateHeightStructure()
         {
-            // Creation of height structure object will be defined by issue WTI-579
-            return null;
+            var heightStructure = new HeightStructure("aName", "anId", new Point2D(1.22, 2.333),
+                                                      0.12345,
+                                                      234.567, 0.23456,
+                                                      345.678, 0.34567,
+                                                      456.789, 0.45678,
+                                                      567.890, 0.56789,
+                                                      0.67890,
+                                                      112.223, 0.11222,
+                                                      225.336, 0.22533);
+            return heightStructure;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresImporterTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresImporterTest.cs	(revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresImporterTest.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,31 @@
+// 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 NUnit.Framework;
+
+namespace Ringtoets.HeightStructures.IO.Test
+{
+    [TestFixture]
+    public class HeightStructuresImporterTest
+    {
+         
+    }
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Ringtoets.HeightStructures.IO.Test.csproj
===================================================================
diff -u -r60bd3c063c8173f762c5762096efa38b87f780ed -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Ringtoets.HeightStructures.IO.Test.csproj	(.../Ringtoets.HeightStructures.IO.Test.csproj)	(revision 60bd3c063c8173f762c5762096efa38b87f780ed)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Ringtoets.HeightStructures.IO.Test.csproj	(.../Ringtoets.HeightStructures.IO.Test.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -48,6 +48,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="HeightStructuresImporterTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -r3500ad219742fca6d4a9057e8c92435dde8d8fc1 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 3500ad219742fca6d4a9057e8c92435dde8d8fc1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -159,5 +159,20 @@
             }
             mocks.VerifyAll();
         }
+
+        [Test]
+        public void GetImportInfos_ReturnsExpectedImportInfos()
+        {
+            // Setup
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                // Call
+                ImportInfo[] importInfos = plugin.GetImportInfos().ToArray();
+
+                // Assert
+                Assert.AreEqual(1, importInfos.Length);
+                Assert.IsTrue(importInfos.Any(i => i.DataType == typeof(HeightStructureContext)));
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructureContextImportInfoTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructureContextImportInfoTest.cs	(revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructureContextImportInfoTest.cs	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -0,0 +1,189 @@
+// 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.Base.IO;
+using Core.Common.Gui.Plugin;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Forms.PresentationObjects;
+using Ringtoets.HeightStructures.IO;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.HeightStructures.Plugin.Test.ImportInfos
+{
+    [TestFixture]
+    public class HeightStructureContextImportInfoTest
+    {
+        [Test]
+        public void CreateFileImporter_Always_ExpectedPropertiesSet()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            ReferenceLine referenceLine = mocks.Stub<ReferenceLine>();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.ReferenceLine = referenceLine;
+            mocks.ReplayAll();
+
+            var list = new ObservableList<HeightStructure>();
+
+            var importTarget = new HeightStructureContext(list, assessmentSection);
+
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                IFileImporter importer = importInfo.CreateFileImporter(importTarget, "test");
+
+                // Assert
+                Assert.IsInstanceOf<HeightStructuresImporter>(importer);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Name_Always_ReturnExpectedName()
+        {
+            // Setup
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                string name = importInfo.Name;
+
+                // Assert
+                Assert.AreEqual("Kunstwerklocaties", name);
+            }
+        }
+
+        [Test]
+        public void Category_Always_ReturnExpectedCategory()
+        {
+            // Setup
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                string category = importInfo.Category;
+
+                // Assert
+                Assert.AreEqual("Algemeen", category);
+            }
+        }
+
+        [Test]
+        public void Image_Always_ReturnExpectedIcon()
+        {
+            // Setup
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                Image image = importInfo.Image;
+
+                // Assert
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.StructuresIcon, image);
+            }
+        }
+
+        [Test]
+        public void FileFilter_Always_ReturnExpectedFileFilter()
+        {
+            // Setup
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                string fileFilter = importInfo.FileFilter;
+
+                // Assert
+                Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter);
+            }
+        }
+
+        [Test]
+        public void IsEnabled_ReferenceLineSet_ReturnTrue()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.ReferenceLine = new ReferenceLine();
+            mocks.ReplayAll();
+
+            var list = new ObservableList<HeightStructure>();
+
+            var context = new HeightStructureContext(list, assessmentSection);
+
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                bool isEnabled = importInfo.IsEnabled(context);
+
+                // Assert
+                Assert.IsTrue(isEnabled);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void IsEnabled_ReferenceLineNotSet_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.ReferenceLine = null;
+            mocks.ReplayAll();
+
+            var list = new ObservableList<HeightStructure>();
+
+            var context = new HeightStructureContext(list, assessmentSection);
+
+            using (var plugin = new HeightStructuresPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                bool isEnabled = importInfo.IsEnabled(context);
+
+                // Assert
+                Assert.IsFalse(isEnabled);
+            }
+            mocks.VerifyAll();
+        }
+
+        private static ImportInfo GetImportInfo(HeightStructuresPlugin plugin)
+        {
+            return plugin.GetImportInfos().First(ii => ii.DataType == typeof(HeightStructureContext));
+        } 
+    }
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj	(.../Ringtoets.HeightStructures.Plugin.Test.csproj)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj	(.../Ringtoets.HeightStructures.Plugin.Test.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -55,6 +55,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="HeightStructuresPluginTest.cs" />
+    <Compile Include="ImportInfos\HeightStructureContextImportInfoTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewInfos\HeightStructuresFailureMechanismResultViewInfoTest.cs" />
   </ItemGroup>
@@ -97,6 +98,10 @@
       <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
       <Name>Ringtoets.Common.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.HeightStructures.Data\Ringtoets.HeightStructures.Data.csproj">
       <Project>{1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}</Project>
       <Name>Ringtoets.HeightStructures.Data</Name>
@@ -105,6 +110,10 @@
       <Project>{F0BCF06A-3D01-4D65-A249-E2A14AEC6EFD}</Project>
       <Name>Ringtoets.HeightStructures.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.HeightStructures.IO\Ringtoets.HeightStructures.IO.csproj">
+      <Project>{D63FCFEC-34E8-4C68-8B4F-99338D2447AC}</Project>
+      <Name>Ringtoets.HeightStructures.IO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.HeightStructures.Plugin\Ringtoets.HeightStructures.Plugin.csproj">
       <Project>{9AF85B2B-8D78-43C5-9542-FBB3A14EAB36}</Project>
       <Name>Ringtoets.HeightStructures.Plugin</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -rba95a59f738989357f485c3aa3cb06961af930a2 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision ba95a59f738989357f485c3aa3cb06961af930a2)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -117,6 +117,11 @@
       <Name>Ringtoets.ClosingStructures.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HeightStructures\src\Ringtoets.HeightStructures.IO\Ringtoets.HeightStructures.IO.csproj">
+      <Project>{D63FCFEC-34E8-4C68-8B4F-99338D2447AC}</Project>
+      <Name>Ringtoets.HeightStructures.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\StabilityPointStructures\src\Ringtoets.StabilityPointStructures.Data\Ringtoets.StabilityPointStructures.Data.csproj">
       <Project>{3D4B9740-8348-4434-8D77-B611FC6EE57F}</Project>
       <Name>Ringtoets.StabilityPointStructures.Data</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs
===================================================================
diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs	(.../DikeProfilesContextImportInfoTest.cs)	(revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs	(.../DikeProfilesContextImportInfoTest.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.Base.IO;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
@@ -32,57 +30,87 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
+using Ringtoets.Integration.Plugin.FileImporters;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ImportInfos
 {
     [TestFixture]
     public class DikeProfilesContextImportInfoTest
     {
-        private ImportInfo importInfo;
-        private RingtoetsPlugin plugin;
-
-        [SetUp]
-        public void SetUp()
+        [Test]
+        public void CreateFileImporter_Always_ExpectedPropertiesSet()
         {
-            plugin = new RingtoetsPlugin();
-            importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(DikeProfilesContext));
-        }
+            // Setup
+            var mocks = new MockRepository();
+            ReferenceLine referenceLine = mocks.Stub<ReferenceLine>();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.ReferenceLine = referenceLine;
+            mocks.ReplayAll();
 
-        [TearDown]
-        public void TearDown()
-        {
-            plugin.Dispose();
+            var list = new ObservableList<DikeProfile>();
+
+            var importTarget = new DikeProfilesContext(list, assessmentSection);
+
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                IFileImporter importer = importInfo.CreateFileImporter(importTarget, "test");
+
+                // Assert
+                Assert.IsInstanceOf<ProfilesImporter<ObservableList<DikeProfile>>>(importer);
+            }
+            mocks.VerifyAll();
         }
 
         [Test]
         public void Name_Always_ReturnExpectedName()
         {
-            // Call
-            string name = importInfo.Name;
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.AreEqual("Dijkprofiellocaties", name);
+                // Call
+                string name = importInfo.Name;
+
+                // Assert
+                Assert.AreEqual("Dijkprofiellocaties", name);
+            }
         }
 
         [Test]
         public void Category_Always_ReturnExpectedCategory()
         {
-            // Call
-            string category = importInfo.Category;
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.AreEqual("Algemeen", category);
+                // Call
+                string category = importInfo.Category;
+
+                // Assert
+                Assert.AreEqual("Algemeen", category);
+            }
         }
 
         [Test]
         public void Image_Always_ReturnExpectedIcon()
         {
-            // Call
-            Image image = importInfo.Image;
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.DikeProfile, image);
+                // Call
+                Image image = importInfo.Image;
+
+                // Assert
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.DikeProfile, image);
+            }
         }
 
         [Test]
@@ -98,11 +126,16 @@
 
             var context = new DikeProfilesContext(list, assessmentSection);
 
-            // Call
-            bool isEnabled = importInfo.IsEnabled(context);
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.IsTrue(isEnabled);
+                // Call
+                bool isEnabled = importInfo.IsEnabled(context);
+
+                // Assert
+                Assert.IsTrue(isEnabled);
+            }
             mocks.VerifyAll();
         }
 
@@ -119,62 +152,38 @@
 
             var context = new DikeProfilesContext(list, assessmentSection);
 
-            // Call
-            bool isEnabled = importInfo.IsEnabled(context);
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.IsFalse(isEnabled);
+                // Call
+                bool isEnabled = importInfo.IsEnabled(context);
+
+                // Assert
+                Assert.IsFalse(isEnabled);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
         public void FileFilter_Always_ReturnExpectedFileFilter()
         {
-            // Call
-            string fileFilter = importInfo.FileFilter;
-
-            // Assert
-            Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter);
-        }
-
-        [Test]
-        public void CreateFileImporter_ValidInput_SuccessfulImport()
-        {
             // Setup
-            var mocks = new MockRepository();
-            ReferenceLine referenceLine = CreateMatchingReferenceLine();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
-            mocks.ReplayAll();
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            var list = new ObservableList<DikeProfile>();
+                // Call
+                string fileFilter = importInfo.FileFilter;
 
-            string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
-                                                     Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp"));
-
-            var importTarget = new DikeProfilesContext(list, assessmentSection);
-
-            // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, path);
-
-            // Assert
-            Assert.IsTrue(importer.Import());
-
-            mocks.VerifyAll();
+                // Assert
+                Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter);
+            }
         }
 
-        private ReferenceLine CreateMatchingReferenceLine()
+        private static ImportInfo GetImportInfo(RingtoetsPlugin plugin)
         {
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new[]
-            {
-                new Point2D(131223.2, 548393.4),
-                new Point2D(133854.3, 545323.1),
-                new Point2D(135561.0, 541920.3),
-                new Point2D(136432.1, 538235.2),
-                new Point2D(136039.4, 533920.2)
-            });
-            return referenceLine;
+            return plugin.GetImportInfos().First(ii => ii.DataType == typeof(DikeProfilesContext));
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs
===================================================================
diff -u -r866c784ab07dfe5f28c0b25eeaa7d8a82ab55253 -r423010168fe01b2373e9be55f047659911e670f5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs	(.../ForeshoreProfilesContextImportInfoTest.cs)	(revision 866c784ab07dfe5f28c0b25eeaa7d8a82ab55253)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs	(.../ForeshoreProfilesContextImportInfoTest.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.Base.IO;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
@@ -32,56 +30,86 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Integration.Plugin.FileImporters;
 using Ringtoets.Integration.Plugin.Properties;
 
 namespace Ringtoets.Integration.Plugin.Test.ImportInfos
 {
     public class ForeshoreProfilesContextImportInfoTest
     {
-        private ImportInfo importInfo;
-        private RingtoetsPlugin plugin;
-
-        [SetUp]
-        public void SetUp()
+        [Test]
+        public void CreateFileImporter_Always_ExpectedPropertiesSet()
         {
-            plugin = new RingtoetsPlugin();
-            importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(ForeshoreProfilesContext));
-        }
+            // Setup
+            var mocks = new MockRepository();
+            ReferenceLine referenceLine = mocks.Stub<ReferenceLine>();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.ReferenceLine = referenceLine;
+            mocks.ReplayAll();
 
-        [TearDown]
-        public void TearDown()
-        {
-            plugin.Dispose();
+            var list = new ObservableList<ForeshoreProfile>();
+
+            var importTarget = new ForeshoreProfilesContext(list, assessmentSection);
+
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
+
+                // Call
+                IFileImporter importer = importInfo.CreateFileImporter(importTarget, "test");
+
+                // Assert
+                Assert.IsInstanceOf<ProfilesImporter<ObservableList<ForeshoreProfile>>>(importer);
+            }
+            mocks.VerifyAll();
         }
 
         [Test]
         public void Name_Always_ReturnExpectedName()
         {
-            // Call
-            string name = importInfo.Name;
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.AreEqual("Voorlandprofiellocaties", name);
+                // Call
+                string name = importInfo.Name;
+
+                // Assert
+                Assert.AreEqual("Voorlandprofiellocaties", name);
+            }
         }
 
         [Test]
         public void Category_Always_ReturnExpectedCategory()
         {
-            // Call
-            string category = importInfo.Category;
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.AreEqual("Algemeen", category);
+                // Call
+                string category = importInfo.Category;
+
+                // Assert
+                Assert.AreEqual("Algemeen", category);
+            }
         }
 
         [Test]
         public void Image_Always_ReturnExpectedIcon()
         {
-            // Call
-            Image image = importInfo.Image;
+            // Setup
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            TestHelper.AssertImagesAreEqual(Resources.Foreshore, image);
+                // Call
+                Image image = importInfo.Image;
+
+                // Assert
+                TestHelper.AssertImagesAreEqual(Resources.Foreshore, image);
+            }
         }
 
         [Test]
@@ -97,11 +125,16 @@
 
             var context = new ForeshoreProfilesContext(list, assessmentSection);
 
-            // Call
-            bool isEnabled = importInfo.IsEnabled(context);
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.IsTrue(isEnabled);
+                // Call
+                bool isEnabled = importInfo.IsEnabled(context);
+
+                // Assert
+                Assert.IsTrue(isEnabled);
+            }
             mocks.VerifyAll();
         }
 
@@ -118,62 +151,38 @@
 
             var context = new ForeshoreProfilesContext(list, assessmentSection);
 
-            // Call
-            bool isEnabled = importInfo.IsEnabled(context);
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            // Assert
-            Assert.IsFalse(isEnabled);
+                // Call
+                bool isEnabled = importInfo.IsEnabled(context);
+
+                // Assert
+                Assert.IsFalse(isEnabled);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
         public void FileFilter_Always_ReturnExpectedFileFilter()
         {
-            // Call
-            string fileFilter = importInfo.FileFilter;
-
-            // Assert
-            Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter);
-        }
-
-        [Test]
-        public void CreateFileImporter_ValidInput_SuccessfulImport()
-        {
             // Setup
-            var mocks = new MockRepository();
-            ReferenceLine referenceLine = CreateMatchingReferenceLine();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.ReferenceLine = referenceLine;
-            mocks.ReplayAll();
+            using (var plugin = new RingtoetsPlugin())
+            {
+                ImportInfo importInfo = GetImportInfo(plugin);
 
-            var list = new ObservableList<ForeshoreProfile>();
+                // Call
+                string fileFilter = importInfo.FileFilter;
 
-            string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin,
-                                                     Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp"));
-
-            var importTarget = new ForeshoreProfilesContext(list, assessmentSection);
-
-            // Call
-            IFileImporter importer = importInfo.CreateFileImporter(importTarget, path);
-
-            // Assert
-            Assert.IsTrue(importer.Import());
-
-            mocks.VerifyAll();
+                // Assert
+                Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter);
+            }
         }
 
-        private ReferenceLine CreateMatchingReferenceLine()
+        private static ImportInfo GetImportInfo(RingtoetsPlugin plugin)
         {
-            var referenceLine = new ReferenceLine();
-            referenceLine.SetGeometry(new[]
-            {
-                new Point2D(131223.2, 548393.4),
-                new Point2D(133854.3, 545323.1),
-                new Point2D(135561.0, 541920.3),
-                new Point2D(136432.1, 538235.2),
-                new Point2D(136039.4, 533920.2)
-            });
-            return referenceLine;
+            return plugin.GetImportInfos().First(ii => ii.DataType == typeof(ForeshoreProfilesContext));
         }
     }
 }
\ No newline at end of file