Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r76511556cd5348a48bb0401dae48e6ed2215fa61 -rd58a7ff7f54c83dfe5d1ef28417c43a83346b5ba
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 76511556cd5348a48bb0401dae48e6ed2215fa61)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision d58a7ff7f54c83dfe5d1ef28417c43a83346b5ba)
@@ -44,6 +44,7 @@
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
 using Ringtoets.StabilityStoneCover.Forms.Views;
+using Ringtoets.StabilityStoneCover.IO;
 using Ringtoets.StabilityStoneCover.Plugin.Properties;
 using Ringtoets.StabilityStoneCover.Service;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
@@ -141,38 +142,19 @@
         {
             yield return new ExportInfo<StabilityStoneCoverWaveConditionsCalculationGroupContext>
             {
-                CreateFileExporter = (context, filePath) => CreateWaveConditionsExporter(context.WrappedData.Children.OfType<ICalculation>().Cast<StabilityStoneCoverWaveConditionsCalculation>(), filePath),
+                CreateFileExporter = (context, filePath) => new StabilityStoneCoverWaveConditionsExporter(context.WrappedData.Children.OfType<ICalculation>().Cast<StabilityStoneCoverWaveConditionsCalculation>(), filePath),
                 IsEnabled = context => context.WrappedData.Children.OfType<ICalculation>().Cast<StabilityStoneCoverWaveConditionsCalculation>().Any(c => c.HasOutput),
                 FileFilter = Resources.DataTypeDisplayName_csv_file_filter
             };
 
             yield return new ExportInfo<StabilityStoneCoverWaveConditionsCalculationContext>
             {
-                CreateFileExporter = (context, filePath) => CreateWaveConditionsExporter(new[] { context.WrappedData }, filePath),
+                CreateFileExporter = (context, filePath) => new StabilityStoneCoverWaveConditionsExporter(new[] { context.WrappedData }, filePath),
                 IsEnabled = context => context.WrappedData.HasOutput,
                 FileFilter = Resources.DataTypeDisplayName_csv_file_filter
             };
         }
 
-        #region ExportInfos
-
-        private static WaveConditionsExporter CreateWaveConditionsExporter(IEnumerable<StabilityStoneCoverWaveConditionsCalculation> calculations, string filePath)
-        {
-            var exportableWaveConditions = new List<ExportableWaveConditions>();
-
-            IEnumerable<StabilityStoneCoverWaveConditionsCalculation> exportableCalculations = calculations.Where(c => c.HasOutput);
-
-            foreach (StabilityStoneCoverWaveConditionsCalculation calculation in exportableCalculations)
-            {
-                exportableWaveConditions.AddRange(
-                    ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(
-                        calculation.Name, calculation.InputParameters, calculation.Output.ColumnsOutput, calculation.Output.BlocksOutput));
-            }
-            return new WaveConditionsExporter(exportableWaveConditions, filePath);
-        }
-
-        #endregion
-
         #region ViewInfos
 
         #region FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResult>