Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/CalculationChangeHandler.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/CalculationChangeHandler.cs	(.../CalculationChangeHandler.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/CalculationChangeHandler.cs	(.../CalculationChangeHandler.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.IO;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBase.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationChangeHandlerBase.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationChangeHandlerBase.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationCollectionChangeHandlerBase.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 
 namespace Riskeer.Common.Forms.ChangeHandlers
 {
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 using Riskeer.Common.Forms.Properties;
 
 namespace Riskeer.Common.Forms.ChangeHandlers
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs	(.../ClearIllustrationPointsOfStructureCalculationCollectionChangeHandler.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 using Riskeer.Common.Data.Structures;
 using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Service;
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandler.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandler.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 using Riskeer.Common.Data.Structures;
 
 namespace Riskeer.Common.Forms.ChangeHandlers
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/FailureMechanismCalculationChangeHandler.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/FailureMechanismCalculationChangeHandler.cs	(.../FailureMechanismCalculationChangeHandler.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/FailureMechanismCalculationChangeHandler.cs	(.../FailureMechanismCalculationChangeHandler.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,7 +21,7 @@
 
 using System;
 using System.Linq;
-using Core.Common.Gui.Helpers;
+using Core.Gui.Helpers;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.IO;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/ExportInfos/RiskeerExportInfoFactory.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ExportInfos/RiskeerExportInfoFactory.cs	(.../RiskeerExportInfoFactory.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ExportInfos/RiskeerExportInfoFactory.cs	(.../RiskeerExportInfoFactory.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,9 +21,9 @@
 
 using System;
 using Core.Common.Base.IO;
-using Core.Common.Gui.Helpers;
-using Core.Common.Gui.Plugin;
 using Core.Common.Util;
+using Core.Gui.Helpers;
+using Core.Gui.Plugin;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.PresentationObjects;
Index: Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Core.Common.Gui.Forms.ProgressDialog;
+using Core.Gui.Forms.ProgressDialog;
 using log4net;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
Index: Riskeer/Common/src/Riskeer.Common.Forms/ImportInfos/RiskeerImportInfoFactory.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/ImportInfos/RiskeerImportInfoFactory.cs	(.../RiskeerImportInfoFactory.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ImportInfos/RiskeerImportInfoFactory.cs	(.../RiskeerImportInfoFactory.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.IO;
-using Core.Common.Gui.Plugin;
 using Core.Common.Util;
+using Core.Gui.Plugin;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.PresentationObjects;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/BreakWaterProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/BreakWaterProperties.cs	(.../BreakWaterProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/BreakWaterProperties.cs	(.../BreakWaterProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,10 +21,10 @@
 
 using System.ComponentModel;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignVariableProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignVariableProperties.cs	(.../DesignVariableProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignVariableProperties.cs	(.../DesignVariableProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsGroupProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsGroupProperties.cs	(.../DesignWaterLevelCalculationsGroupProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsGroupProperties.cs	(.../DesignWaterLevelCalculationsGroupProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,8 +23,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs	(.../DesignWaterLevelCalculationsProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs	(.../DesignWaterLevelCalculationsProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,8 +22,8 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelHydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelHydraulicBoundaryLocationProperties.cs	(.../DesignWaterLevelHydraulicBoundaryLocationProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelHydraulicBoundaryLocationProperties.cs	(.../DesignWaterLevelHydraulicBoundaryLocationProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs	(.../DistributionPropertiesBase.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs	(.../DistributionPropertiesBase.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,9 +21,9 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Forms.ChangeHandlers;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs	(.../FailureMechanismSectionProbabilityAssessmentProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs	(.../FailureMechanismSectionProbabilityAssessmentProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Forms.Properties;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs	(.../FailureMechanismSectionProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs	(.../FailureMechanismSectionProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.ComponentModel;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionsProbabilityAssessmentProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionsProbabilityAssessmentProperties.cs	(.../FailureMechanismSectionsProbabilityAssessmentProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionsProbabilityAssessmentProperties.cs	(.../FailureMechanismSectionsProbabilityAssessmentProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,10 +22,10 @@
 using System;
 using System.ComponentModel;
 using Core.Common.Base;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Forms.Helpers;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionsProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionsProperties.cs	(.../FailureMechanismSectionsProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FailureMechanismSectionsProperties.cs	(.../FailureMechanismSectionsProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,10 +22,10 @@
 using System;
 using System.ComponentModel;
 using Core.Common.Base;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.Properties;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs	(.../FaultTreeIllustrationPointProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs	(.../FaultTreeIllustrationPointProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreGeometryProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreGeometryProperties.cs	(.../ForeshoreGeometryProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreGeometryProperties.cs	(.../ForeshoreGeometryProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreProfileCollectionProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreProfileCollectionProperties.cs	(.../ForeshoreProfileCollectionProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreProfileCollectionProperties.cs	(.../ForeshoreProfileCollectionProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreProfileProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreProfileProperties.cs	(.../ForeshoreProfileProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ForeshoreProfileProperties.cs	(.../ForeshoreProfileProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,9 +22,9 @@
 using System.ComponentModel;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationBaseProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationBaseProperties.cs	(.../HydraulicBoundaryLocationBaseProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationBaseProperties.cs	(.../HydraulicBoundaryLocationBaseProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationBaseProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationBaseProperties.cs	(.../HydraulicBoundaryLocationCalculationBaseProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationBaseProperties.cs	(.../HydraulicBoundaryLocationCalculationBaseProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -24,11 +24,11 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryProperties.cs	(.../HydraulicBoundaryLocationCalculationCategoryBoundaryProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryProperties.cs	(.../HydraulicBoundaryLocationCalculationCategoryBoundaryProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationProperties.cs	(.../HydraulicBoundaryLocationCalculationProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationProperties.cs	(.../HydraulicBoundaryLocationCalculationProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs	(.../HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs	(.../HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.Hydraulics;
 
 namespace Riskeer.Common.Forms.PropertyClasses
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs	(.../HydraulicBoundaryLocationCalculationsProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsProperties.cs	(.../HydraulicBoundaryLocationCalculationsProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,7 +21,7 @@
 
 using System;
 using Core.Common.Base;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.Hydraulics;
 
 namespace Riskeer.Common.Forms.PropertyClasses
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/IllustrationPointProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/IllustrationPointProperties.cs	(.../IllustrationPointProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/IllustrationPointProperties.cs	(.../IllustrationPointProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,10 +22,10 @@
 using System;
 using System.ComponentModel;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Forms.TypeConverters;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ShiftedLogNormalDistributionProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ShiftedLogNormalDistributionProperties.cs	(.../ShiftedLogNormalDistributionProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/ShiftedLogNormalDistributionProperties.cs	(.../ShiftedLogNormalDistributionProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Probabilistics;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructureCollectionProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructureCollectionProperties.cs	(.../StructureCollectionProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructureCollectionProperties.cs	(.../StructureCollectionProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -25,9 +25,9 @@
 using System.Drawing.Design;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresOutputProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresOutputProperties.cs	(.../StructuresOutputProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresOutputProperties.cs	(.../StructuresOutputProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,11 +23,11 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
 using Core.Common.Util.Extensions;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.Structures;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs	(.../SubMechanismIllustrationPointProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs	(.../SubMechanismIllustrationPointProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,9 +22,9 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/SubMechanismIllustrationPointValuesProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/SubMechanismIllustrationPointValuesProperties.cs	(.../SubMechanismIllustrationPointValuesProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/SubMechanismIllustrationPointValuesProperties.cs	(.../SubMechanismIllustrationPointValuesProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,10 +22,10 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs	(.../TopLevelFaultTreeIllustrationPointProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs	(.../TopLevelFaultTreeIllustrationPointProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -24,11 +24,11 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Forms.TypeConverters;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs	(.../TopLevelSubMechanismIllustrationPointProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs	(.../TopLevelSubMechanismIllustrationPointProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -24,12 +24,12 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util;
 using Core.Common.Util.Attributes;
 using Core.Common.Util.Extensions;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Forms.TypeConverters;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs	(.../TruncatedNormalDistributionProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs	(.../TruncatedNormalDistributionProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -24,9 +24,9 @@
 using System.ComponentModel;
 using Core.Common.Base;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Forms.TypeConverters;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/UseForeshoreProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/UseForeshoreProperties.cs	(.../UseForeshoreProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/UseForeshoreProperties.cs	(.../UseForeshoreProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -25,9 +25,9 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs	(.../VariationCoefficientDesignVariableProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs	(.../VariationCoefficientDesignVariableProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs	(.../VariationCoefficientDistributionPropertiesBase.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs	(.../VariationCoefficientDistributionPropertiesBase.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,9 +21,9 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Common.Forms.Properties;
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsGroupProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsGroupProperties.cs	(.../WaveHeightCalculationsGroupProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsGroupProperties.cs	(.../WaveHeightCalculationsGroupProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,8 +23,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs	(.../WaveHeightCalculationsProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs	(.../WaveHeightCalculationsProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -22,8 +22,8 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightHydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightHydraulicBoundaryLocationProperties.cs	(.../WaveHeightHydraulicBoundaryLocationProperties.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightHydraulicBoundaryLocationProperties.cs	(.../WaveHeightHydraulicBoundaryLocationProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Gui.Attributes;
-using Core.Common.Gui.Converters;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
+using Core.Gui.Converters;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj
===================================================================
diff -u -r653147ae92ff1a7759f7683afe28de029ae7a0be -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj	(.../Riskeer.Common.Forms.csproj)	(revision 653147ae92ff1a7759f7683afe28de029ae7a0be)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj	(.../Riskeer.Common.Forms.csproj)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -15,7 +15,6 @@
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Geometry\Core.Common.Geometry.csproj" />
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart\Core.Components.Chart.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj" />
@@ -27,6 +26,7 @@
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.PointedTree\Core.Components.PointedTree.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Stack.Forms\Core.Components.Stack.Forms.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Stack\Core.Components.Stack.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Gui\src\Core.Gui\Core.Gui.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj" />
     <ProjectReference Include="..\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs	(.../RiskeerContextMenuBuilder.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Helpers;
-using Core.Common.Gui.Plugin;
+using Core.Gui.ContextMenu;
+using Core.Gui.Helpers;
+using Core.Gui.Plugin;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs	(.../RiskeerContextMenuItemFactory.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -25,9 +25,9 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Helpers;
 using Core.Common.Util.Extensions;
+using Core.Gui.ContextMenu;
+using Core.Gui.Helpers;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.FailureMechanism;
Index: Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/ForeshoreProfileEditor.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/ForeshoreProfileEditor.cs	(.../ForeshoreProfileEditor.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/ForeshoreProfileEditor.cs	(.../ForeshoreProfileEditor.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -23,7 +23,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Geometry;
-using Core.Common.Gui.UITypeEditors;
+using Core.Gui.UITypeEditors;
 using Riskeer.Common.Data.DikeProfiles;
 using CoreCommonControlsResources = Core.Common.Controls.Properties.Resources;
 
Index: Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/HydraulicBoundaryLocationEditor.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/HydraulicBoundaryLocationEditor.cs	(.../HydraulicBoundaryLocationEditor.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/HydraulicBoundaryLocationEditor.cs	(.../HydraulicBoundaryLocationEditor.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,7 +21,7 @@
 
 using System.Collections.Generic;
 using System.ComponentModel;
-using Core.Common.Gui.UITypeEditors;
+using Core.Gui.UITypeEditors;
 using Riskeer.Common.Forms.PresentationObjects;
 
 namespace Riskeer.Common.Forms.UITypeEditors
Index: Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasForeshoreProfileProperty.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasForeshoreProfileProperty.cs	(.../IHasForeshoreProfileProperty.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasForeshoreProfileProperty.cs	(.../IHasForeshoreProfileProperty.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data.DikeProfiles;
 
 namespace Riskeer.Common.Forms.UITypeEditors
Index: Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasHydraulicBoundaryLocationProperty.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasHydraulicBoundaryLocationProperty.cs	(.../IHasHydraulicBoundaryLocationProperty.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasHydraulicBoundaryLocationProperty.cs	(.../IHasHydraulicBoundaryLocationProperty.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Forms.PresentationObjects;
 
 namespace Riskeer.Common.Forms.UITypeEditors
Index: Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasStructureProperty.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasStructureProperty.cs	(.../IHasStructureProperty.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/IHasStructureProperty.cs	(.../IHasStructureProperty.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.PropertyBag;
 using Riskeer.Common.Data;
 
 namespace Riskeer.Common.Forms.UITypeEditors
Index: Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/StructureEditor.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/StructureEditor.cs	(.../StructureEditor.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UITypeEditors/StructureEditor.cs	(.../StructureEditor.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -21,7 +21,7 @@
 
 using System.Collections.Generic;
 using System.ComponentModel;
-using Core.Common.Gui.UITypeEditors;
+using Core.Gui.UITypeEditors;
 using Riskeer.Common.Data;
 
 namespace Riskeer.Common.Forms.UITypeEditors
Index: Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs	(.../RiskeerUpdateInfoFactory.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs	(.../RiskeerUpdateInfoFactory.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Gui.Plugin;
+using Core.Gui.Plugin;
 using Core.Common.Util;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.PresentationObjects;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -32,7 +32,7 @@
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.Controls;
 using Riskeer.Common.Forms.Properties;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 
 namespace Riskeer.Common.Forms.Views
 {
@@ -224,7 +224,7 @@
 
         private void InitializeFailureMechanismAssemblyResultPanel()
         {
-            infoIcon.BackgroundImage = CoreCommonGuiResources.information;
+            infoIcon.BackgroundImage = CoreGuiResources.information;
             toolTip.SetToolTip(infoIcon, Resources.FailureMechanismResultView_InfoToolTip);
 
             FailureMechanismAssemblyResultControl = new TAssemblyResultControl();
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.Designer.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ref9f41ef150aee02d286c53de24660a19d948e02
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.Designer.cs	(.../LocationCalculationsView.Designer.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.Designer.cs	(.../LocationCalculationsView.Designer.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
@@ -125,7 +125,7 @@
             // 
             this.CalculateForSelectedButtonErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
             this.CalculateForSelectedButtonErrorProvider.ContainerControl = this;
-            this.CalculateForSelectedButtonErrorProvider.Icon = Core.Common.Gui.Properties.Resources.warning;
+            this.CalculateForSelectedButtonErrorProvider.Icon = Core.Gui.Properties.Resources.warning;
             // 
             // splitContainer
             //