Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismProperties.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismProperties.cs	(.../WaveImpactAsphaltCoverFailureMechanismProperties.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismProperties.cs	(.../WaveImpactAsphaltCoverFailureMechanismProperties.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -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.AssessmentSection;
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.Properties;
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -21,9 +21,9 @@
 
 using System.ComponentModel;
 using System.Linq;
-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.Revetment.Forms.PropertyClasses;
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.Properties;
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Riskeer.WaveImpactAsphaltCover.Forms.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Riskeer.WaveImpactAsphaltCover.Forms.csproj	(.../Riskeer.WaveImpactAsphaltCover.Forms.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Riskeer.WaveImpactAsphaltCover.Forms.csproj	(.../Riskeer.WaveImpactAsphaltCover.Forms.csproj)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -12,20 +12,20 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.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.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.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="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Forms\Riskeer.Revetment.Forms.csproj"/>
-    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.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="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Forms\Riskeer.Revetment.Forms.csproj" />
+    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj" />
   </ItemGroup>
 <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/Riskeer.WaveImpactAsphaltCover.Plugin.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/Riskeer.WaveImpactAsphaltCover.Plugin.csproj	(.../Riskeer.WaveImpactAsphaltCover.Plugin.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/Riskeer.WaveImpactAsphaltCover.Plugin.csproj	(.../Riskeer.WaveImpactAsphaltCover.Plugin.csproj)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -12,27 +12,27 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <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.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.Forms\Core.Components.Chart.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Plugin\Riskeer.Common.Plugin.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Forms\Riskeer.Revetment.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.IO\Riskeer.Revetment.IO.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Service\Riskeer.Revetment.Service.csproj"/>
-     <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj"/>
-    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Forms\Riskeer.WaveImpactAsphaltCover.Forms.csproj"/>
-    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.IO\Riskeer.WaveImpactAsphaltCover.IO.csproj"/>
-    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Service\Riskeer.WaveImpactAsphaltCover.Service.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <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.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Gui\src\Core.Gui\Core.Gui.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Plugin\Riskeer.Common.Plugin.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Forms\Riskeer.Revetment.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.IO\Riskeer.Revetment.IO.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Service\Riskeer.Revetment.Service.csproj" />
+     <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj" />
+    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Forms\Riskeer.WaveImpactAsphaltCover.Forms.csproj" />
+    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.IO\Riskeer.WaveImpactAsphaltCover.IO.csproj" />
+    <ProjectReference Include="..\Riskeer.WaveImpactAsphaltCover.Service\Riskeer.WaveImpactAsphaltCover.Service.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -25,11 +25,11 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Forms.ProgressDialog;
-using Core.Common.Gui.Helpers;
-using Core.Common.Gui.Plugin;
 using Core.Common.Util;
+using Core.Gui.ContextMenu;
+using Core.Gui.Forms.ProgressDialog;
+using Core.Gui.Helpers;
+using Core.Gui.Plugin;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Contribution;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -24,6 +24,7 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
+using Core.Gui.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -20,10 +20,10 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
-using Core.Common.TestUtil;
 using Core.Common.Util;
+using Core.Gui.Converters;
+using Core.Gui.PropertyBag;
+using Core.Gui.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj	(.../Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj	(.../Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -15,27 +15,28 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.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\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.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="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
-    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Forms\Riskeer.Revetment.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\Revetment\test\Riskeer.Revetment.Data.TestUtil\Riskeer.Revetment.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\src\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj"/>
-    <ProjectReference Include="..\..\src\Riskeer.WaveImpactAsphaltCover.Forms\Riskeer.WaveImpactAsphaltCover.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Gui\src\Core.Gui\Core.Gui.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Gui\test\Core.Gui.TestUtil\Core.Gui.TestUtil.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="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Data\Riskeer.Revetment.Data.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\src\Riskeer.Revetment.Forms\Riskeer.Revetment.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Revetment\test\Riskeer.Revetment.Data.TestUtil\Riskeer.Revetment.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.WaveImpactAsphaltCover.Forms\Riskeer.WaveImpactAsphaltCover.Forms.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit">
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,18 +22,18 @@
 using System;
 using System.Linq;
 using Core.Common.Base.IO;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Revetment.IO.Configurations;
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -79,7 +79,7 @@
             Assert.IsNotNull(info.CreateFileExporter);
             Assert.IsNotNull(info.IsEnabled);
             Assert.AreEqual("Algemeen", info.Category);
-            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
+            TestHelper.AssertImagesAreEqual(CoreGuiResources.ExportIcon, info.Image);
             Assert.IsNotNull(info.GetExportPath);
         }
 
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -21,10 +21,10 @@
 
 using System.Linq;
 using Core.Common.Base.IO;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
@@ -33,7 +33,7 @@
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Riskeer.WaveImpactAsphaltCover.IO.Exporters;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -79,7 +79,7 @@
             Assert.IsNotNull(info.CreateFileExporter);
             Assert.IsNotNull(info.IsEnabled);
             Assert.AreEqual("Algemeen", info.Category);
-            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
+            TestHelper.AssertImagesAreEqual(CoreGuiResources.ExportIcon, info.Image);
             Assert.IsNotNull(info.GetExportPath);
         }
 
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -21,18 +21,18 @@
 
 using System.Linq;
 using Core.Common.Base.IO;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Revetment.IO.Configurations;
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -78,7 +78,7 @@
             Assert.IsNotNull(info.CreateFileExporter);
             Assert.IsNotNull(info.IsEnabled);
             Assert.AreEqual("Algemeen", info.Category);
-            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
+            TestHelper.AssertImagesAreEqual(CoreGuiResources.ExportIcon, info.Image);
             Assert.IsNotNull(info.GetExportPath);
         }
 
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -21,10 +21,10 @@
 
 using System.Linq;
 using Core.Common.Base.IO;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
@@ -33,7 +33,7 @@
 using Riskeer.Revetment.IO.WaveConditions;
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -79,7 +79,7 @@
             Assert.IsNotNull(info.CreateFileExporter);
             Assert.IsNotNull(info.IsEnabled);
             Assert.AreEqual("Algemeen", info.Category);
-            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
+            TestHelper.AssertImagesAreEqual(CoreGuiResources.ExportIcon, info.Image);
             Assert.IsNotNull(info.GetExportPath);
         }
 
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ImportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ImportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ImportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,9 +22,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Base.IO;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using Core.Common.Util;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Gui.Plugin;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.Plugin;
+using Core.Gui.PropertyBag;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertyInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Gui.Plugin;
-using Core.Common.Gui.PropertyBag;
+using Core.Gui.Plugin;
+using Core.Gui.PropertyBag;
 using NUnit.Framework;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.DikeProfiles;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -18,13 +18,13 @@
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
     <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.Gui\Core.Common.Gui.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart\Core.Components.Chart.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Gui\src\Core.Gui\Core.Gui.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Gui\test\Core.Gui.TestUtil\Core.Gui.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj" />
     <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj" />
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs	(.../EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs	(.../EmptyWaveImpactAsphaltCoverOutputTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,9 +22,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -27,12 +27,12 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.Commands;
-using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Commands;
+using Core.Gui.ContextMenu;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,9 +22,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Forms.PresentationObjects;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -28,12 +28,12 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.Commands;
-using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Commands;
+using Core.Gui.ContextMenu;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -28,13 +28,13 @@
 using Core.Common.Base.Data;
 using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.Commands;
-using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Plugin;
-using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Commands;
+using Core.Gui.ContextMenu;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Plugin;
+using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -52,7 +52,7 @@
 using Riskeer.WaveImpactAsphaltCover.Data;
 using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos
 {
@@ -502,11 +502,11 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuImportConfigurationIndex,
                                                                   "&Importeren...",
                                                                   "Importeer de gegevens vanuit een bestand.",
-                                                                  CoreCommonGuiResources.ImportIcon);
+                                                                  CoreGuiResources.ImportIcon);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExportConfigurationIndex,
                                                                   "&Exporteren...",
                                                                   "Exporteer de gegevens naar een bestand.",
-                                                                  CoreCommonGuiResources.ExportIcon);
+                                                                  CoreGuiResources.ExportIcon);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddGenerateCalculationsIndex,
                                                                   "Genereer &berekeningen...",
@@ -523,7 +523,7 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenIndexRootGroup,
                                                                   "Ma&p leegmaken...",
                                                                   "Er zijn geen onderliggende elementen om te verwijderen.",
-                                                                  CoreCommonGuiResources.DeleteChildrenIcon,
+                                                                  CoreGuiResources.DeleteChildrenIcon,
                                                                   false);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
                                                                   "Alles &valideren",
@@ -543,17 +543,17 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCollapseAllIndexRootGroup,
                                                                   "Alles i&nklappen",
                                                                   "Klap dit element en alle onderliggende elementen in.",
-                                                                  CoreCommonGuiResources.CollapseAllIcon,
+                                                                  CoreGuiResources.CollapseAllIcon,
                                                                   false);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExpandAllIndexRootGroup,
                                                                   "Alles ui&tklappen",
                                                                   "Klap dit element en alle onderliggende elementen uit.",
-                                                                  CoreCommonGuiResources.ExpandAllIcon,
+                                                                  CoreGuiResources.ExpandAllIcon,
                                                                   false);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuPropertiesIndexRootGroup,
                                                                   "Ei&genschappen",
                                                                   "Toon de eigenschappen in het Eigenschappenpaneel.",
-                                                                  CoreCommonGuiResources.PropertiesHS,
+                                                                  CoreGuiResources.PropertiesHS,
                                                                   false);
                 }
             }
@@ -611,11 +611,11 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuImportConfigurationIndex,
                                                                   "&Importeren...",
                                                                   "Importeer de gegevens vanuit een bestand.",
-                                                                  CoreCommonGuiResources.ImportIcon);
+                                                                  CoreGuiResources.ImportIcon);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExportConfigurationIndex,
                                                                   "&Exporteren...",
                                                                   "Exporteer de gegevens naar een bestand.",
-                                                                  CoreCommonGuiResources.ExportIcon);
+                                                                  CoreGuiResources.ExportIcon);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddGenerateCalculationsIndex,
                                                                   "Genereer &berekeningen...",
@@ -633,7 +633,7 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenIndexRootGroup,
                                                                   "Ma&p leegmaken...",
                                                                   "Er zijn geen onderliggende elementen om te verwijderen.",
-                                                                  CoreCommonGuiResources.DeleteChildrenIcon,
+                                                                  CoreGuiResources.DeleteChildrenIcon,
                                                                   false);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
                                                                   "Alles &valideren",
@@ -653,17 +653,17 @@
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuExpandAllIndexRootGroup,
                                                                   "Alles ui&tklappen",
                                                                   "Klap dit element en alle onderliggende elementen uit.",
-                                                                  CoreCommonGuiResources.ExpandAllIcon,
+                                                                  CoreGuiResources.ExpandAllIcon,
                                                                   false);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCollapseAllIndexRootGroup,
                                                                   "Alles i&nklappen",
                                                                   "Klap dit element en alle onderliggende elementen in.",
-                                                                  CoreCommonGuiResources.CollapseAllIcon,
+                                                                  CoreGuiResources.CollapseAllIcon,
                                                                   false);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuPropertiesIndexRootGroup,
                                                                   "Ei&genschappen",
                                                                   "Toon de eigenschappen in het Eigenschappenpaneel.",
-                                                                  CoreCommonGuiResources.PropertiesHS,
+                                                                  CoreGuiResources.PropertiesHS,
                                                                   false);
                 }
             }
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,9 +22,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Forms.Properties;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,9 +22,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.ContextMenu;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Revetment.Data;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/UpdateInfos/WaveImpactAsphaltCoverFailureMechanismSectionsContextUpdateInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/UpdateInfos/WaveImpactAsphaltCoverFailureMechanismSectionsContextUpdateInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionsContextUpdateInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/UpdateInfos/WaveImpactAsphaltCoverFailureMechanismSectionsContextUpdateInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionsContextUpdateInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,9 +22,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Base.IO;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using Core.Common.Util;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -23,8 +23,8 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.Views;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,8 +22,8 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -23,9 +23,9 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using Core.Components.Chart.Data;
+using Core.Gui.Plugin;
 using NUnit.Framework;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r15bbdb6c8323e423753fe68fe05b2bae7dd2156f
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 15bbdb6c8323e423753fe68fe05b2bae7dd2156f)
@@ -22,10 +22,10 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Plugin;
-using Core.Common.Gui.TestUtil;
+using Core.Gui;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Plugin;
+using Core.Gui.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Data.Calculation;