Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -r4b9e28a28b8004dc9dfca896c32e2a21c10a2405 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 4b9e28a28b8004dc9dfca896c32e2a21c10a2405)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -33,13 +33,13 @@
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Forms;
-using Core.Common.Gui;
-using Core.Common.Gui.Appenders;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Helpers;
-using Core.Common.Gui.Settings;
 using Core.Common.Util;
 using Core.Common.Util.Settings;
+using Core.Gui;
+using Core.Gui.Appenders;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Helpers;
+using Core.Gui.Settings;
 using Core.Plugins.Chart;
 using Core.Plugins.CommonTools;
 using Core.Plugins.Map;
@@ -60,7 +60,7 @@
 using Riskeer.StabilityStoneCover.Plugin;
 using Riskeer.Storage.Core;
 using Riskeer.WaveImpactAsphaltCover.Plugin;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using CoreGuiResources = Core.Gui.Properties.Resources;
 using MessageBox = System.Windows.MessageBox;
 
 namespace Application.Riskeer
@@ -97,7 +97,7 @@
             SetLanguage();
 
             string userDisplay = UserDisplay();
-            log.Info(string.Format(CoreCommonGuiResources.App_Starting_Riskeer_version_0_by_user_0,
+            log.Info(string.Format(CoreGuiResources.App_Starting_Riskeer_version_0_by_user_0,
                                    SettingsHelper.Instance.ApplicationVersion,
                                    userDisplay));
         }
@@ -115,7 +115,7 @@
             WaitForPreviousInstanceToExit();
             if (IsNotFirstInstance())
             {
-                MessageBox.Show(CoreCommonGuiResources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Riskeer_Please_close_the_other_instance_first);
+                MessageBox.Show(CoreGuiResources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Riskeer_Please_close_the_other_instance_first);
                 Shutdown(1);
                 return;
             }
@@ -184,7 +184,7 @@
 
         private void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            Exception exception = e.ExceptionObject as Exception ?? new Exception(CoreCommonGuiResources.App_Unhandled_exception);
+            Exception exception = e.ExceptionObject as Exception ?? new Exception(CoreGuiResources.App_Unhandled_exception);
 
             HandleExceptionOnMainThread(exception);
         }
@@ -211,7 +211,7 @@
 
         private void HandleException(Exception exception)
         {
-            log.Error(CoreCommonGuiResources.App_Unhandled_exception, exception);
+            log.Error(CoreGuiResources.App_Unhandled_exception, exception);
 
             if (gui?.MainWindow != null)
             {
Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj
===================================================================
diff -u -r4b9e28a28b8004dc9dfca896c32e2a21c10a2405 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 4b9e28a28b8004dc9dfca896c32e2a21c10a2405)
+++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -28,8 +28,8 @@
   <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\Gui\src\Core.Gui\Core.Gui.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Plugins\src\Core.Plugins.Chart\Core.Plugins.Chart.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Plugins\src\Core.Plugins.CommonTools\Core.Plugins.CommonTools.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Plugins\src\Core.Plugins.Map\Core.Plugins.Map.csproj" />
Index: Application/Riskeer/src/Application.Riskeer/LogConfigurator.cs
===================================================================
diff -u -r427a91f1ad8c50f579bfec0318dea50732ecec30 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/src/Application.Riskeer/LogConfigurator.cs	(.../LogConfigurator.cs)	(revision 427a91f1ad8c50f579bfec0318dea50732ecec30)
+++ Application/Riskeer/src/Application.Riskeer/LogConfigurator.cs	(.../LogConfigurator.cs)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -21,8 +21,8 @@
 
 using System;
 using System.IO;
-using Core.Common.Gui.Forms.MessageWindow;
 using Core.Common.Util.Settings;
+using Core.Gui.Forms.MessageWindow;
 using log4net;
 using log4net.Appender;
 using log4net.Core;
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj
===================================================================
diff -u -ra564e4c5a94e25d402a800fc102fefb68b20bc68 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj	(.../Application.Riskeer.Integration.Test.csproj)	(revision a564e4c5a94e25d402a800fc102fefb68b20bc68)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj	(.../Application.Riskeer.Integration.Test.csproj)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -17,8 +17,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj" />
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.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="..\..\..\..\Migration\Core\src\Migration.Core.Storage\Migration.Core.Storage.csproj" />
     <ProjectReference Include="..\..\..\..\Migration\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj" />
     <ProjectReference Include="..\..\..\..\Riskeer\Common\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj" />
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs
===================================================================
diff -u -ra7506eae0fd72828f3f4941aa62b8ab3ae048948 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs	(.../StorageMigrationIntegrationTest.cs)	(revision a7506eae0fd72828f3f4941aa62b8ab3ae048948)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs	(.../StorageMigrationIntegrationTest.cs)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -22,11 +22,12 @@
 using System;
 using System.IO;
 using System.Threading;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Helpers;
-using Core.Common.Gui.Settings;
 using Core.Common.TestUtil;
+using Core.Gui;
+using Core.Gui.Forms.MainWindow;
+using Core.Gui.Helpers;
+using Core.Gui.Settings;
+using Core.Gui.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.Common.Util;
@@ -64,7 +65,7 @@
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings()))
             {
                 gui.Plugins.Add(new TestPlugin());
-                
+
                 // When
                 gui.Run(targetFilePath);
 
@@ -105,7 +106,7 @@
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings()))
             {
                 gui.Plugins.Add(new TestPlugin());
-                
+
                 // When
                 gui.Run(sourceFilePath);
 
@@ -140,7 +141,7 @@
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings()))
             {
                 gui.Plugins.Add(new TestPlugin());
-                
+
                 // When
                 gui.Run(sourceFilePath);
 
Index: Application/Riskeer/test/Application.Riskeer.Test/Application.Riskeer.Test.csproj
===================================================================
diff -u -r48814d5ba84cbc9db0d6b1b835e603da18d36357 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/test/Application.Riskeer.Test/Application.Riskeer.Test.csproj	(.../Application.Riskeer.Test.csproj)	(revision 48814d5ba84cbc9db0d6b1b835e603da18d36357)
+++ Application/Riskeer/test/Application.Riskeer.Test/Application.Riskeer.Test.csproj	(.../Application.Riskeer.Test.csproj)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -17,6 +17,7 @@
   <ItemGroup>
     <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\Gui\src\Core.Gui\Core.Gui.csproj" />
     <ProjectReference Include="..\..\..\..\Riskeer\Integration\src\Riskeer.Integration.Forms\Riskeer.Integration.Forms.csproj" />
     <ProjectReference Include="..\..\src\Application.Riskeer\Application.Riskeer.csproj" />
   </ItemGroup>
Index: Application/Riskeer/test/Application.Riskeer.Test/LogConfiguratorTest.cs
===================================================================
diff -u -r427a91f1ad8c50f579bfec0318dea50732ecec30 -rf907ea63cbb78d5f91e41102448f5247bfa0459f
--- Application/Riskeer/test/Application.Riskeer.Test/LogConfiguratorTest.cs	(.../LogConfiguratorTest.cs)	(revision 427a91f1ad8c50f579bfec0318dea50732ecec30)
+++ Application/Riskeer/test/Application.Riskeer.Test/LogConfiguratorTest.cs	(.../LogConfiguratorTest.cs)	(revision f907ea63cbb78d5f91e41102448f5247bfa0459f)
@@ -19,7 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Core.Common.Gui.Forms.MessageWindow;
+using Core.Gui.Forms.MessageWindow;
 using log4net;
 using log4net.Appender;
 using log4net.Core;