Index: Application/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r6e613570fb69ad93ca5fe269e6f48c8f6ceb1bab -re6495e021f3cdb559c4506b3b5fd6668f6221308
--- Application/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 6e613570fb69ad93ca5fe269e6f48c8f6ceb1bab)
+++ Application/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision e6495e021f3cdb559c4506b3b5fd6668f6221308)
@@ -9,16 +9,15 @@
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Forms;
-using DelftTools.Controls.Swf;
-using DelftTools.Shell.Core.Workflow;
-using DelftTools.Shell.Gui.Forms;
-using DeltaShell.Core;
-using DeltaShell.Gui.Properties;
+using Core.Common.Base;
+using Core.Common.BaseDelftTools.Workflow;
+using Core.Common.Controls.Swf;
+using Core.Common.Gui.Forms;
 using log4net;
 using NDesk.Options;
 using MessageBox = System.Windows.MessageBox;
 
-namespace DeltaShell.Gui
+namespace Application.Ringtoets
 {
     /// <summary>
     /// Interaction logic for App.xaml
@@ -46,14 +45,14 @@
 
         static App()
         {
-            DeltaShellApplication.SetLanguageAndRegionalSettions(Settings.Default);
+            DeltaShellApplication.SetLanguageAndRegionalSettions(Ringtoets.Properties.Settings.Default);
 
-            log.Info(Gui.Properties.Resources.App_App_Starting_Delta_Shell____);
+            log.Info(Ringtoets.Properties.Resources.App_App_Starting_Delta_Shell____);
         }
 
         public static void RunDeltaShell(IMainWindow mainWindow)
         {
-            log.Info(Gui.Properties.Resources.App_RunDeltaShell_Starting_Delta_Shell_Gui____);
+            log.Info(Ringtoets.Properties.Resources.App_RunDeltaShell_Starting_Delta_Shell_Gui____);
 
             var loaderDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             var startupDirectory = Directory.GetCurrentDirectory();
@@ -94,7 +93,7 @@
                 }
                 else
                 {
-                    log.ErrorFormat(Gui.Properties.Resources.App_RunDeltaShell_Specified_project___0___was_not_found_, projectFilePath);
+                    log.ErrorFormat(Ringtoets.Properties.Resources.App_RunDeltaShell_Specified_project___0___was_not_found_, projectFilePath);
                 }
             }
 
@@ -104,7 +103,7 @@
                 {
                     if (gui.Application.Project == null)
                     {
-                        log.ErrorFormat(Gui.Properties.Resources.App_RunDeltaShell_No_project_found__load_project_first);
+                        log.ErrorFormat(Ringtoets.Properties.Resources.App_RunDeltaShell_No_project_found__load_project_first);
                         return;
                     }
 
@@ -116,19 +115,19 @@
                     if (activity == null)
                     {
                         log.ErrorFormat(
-                            Gui.Properties.Resources.App_RunDeltaShell_Activity___0___not_found_in_project__Typo__or_did_you_forget_to_load_a_project_,
+                            Ringtoets.Properties.Resources.App_RunDeltaShell_Activity___0___not_found_in_project__Typo__or_did_you_forget_to_load_a_project_,
                             runActivity);
                         return;
                     }
 
-                    log.InfoFormat(Gui.Properties.Resources.App_RunDeltaShell_Starting_activity___0__, runActivity);
+                    log.InfoFormat(Ringtoets.Properties.Resources.App_RunDeltaShell_Starting_activity___0__, runActivity);
                     gui.Application.RunActivity(activity);
-                    log.InfoFormat(Gui.Properties.Resources.App_RunDeltaShell_Activity___0___ended_with_status__1_, runActivity, activity.Status);
+                    log.InfoFormat(Ringtoets.Properties.Resources.App_RunDeltaShell_Activity___0___ended_with_status__1_, runActivity, activity.Status);
 
-                    log.InfoFormat(Gui.Properties.Resources.App_RunDeltaShell_Saving_project___0__, gui.Application.Project.Name);
+                    log.InfoFormat(Ringtoets.Properties.Resources.App_RunDeltaShell_Saving_project___0__, gui.Application.Project.Name);
                     gui.Application.SaveProject();
                     // Necessary for persisting the output of the activity run (e.g. netCDF files). 
-                    log.InfoFormat(Gui.Properties.Resources.App_RunDeltaShell_Saved_project___0__, gui.Application.Project.Name);
+                    log.InfoFormat(Ringtoets.Properties.Resources.App_RunDeltaShell_Saved_project___0__, gui.Application.Project.Name);
                 }
             };
 
@@ -169,7 +168,7 @@
                 {
                     if (!AcquireSingleInstancePerUserMutex())
                     {
-                        MessageBox.Show(Gui.Properties.Resources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_DeltaShell__Please_close_the_other_instance_first_);
+                        MessageBox.Show(Ringtoets.Properties.Resources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_DeltaShell__Please_close_the_other_instance_first_);
                         Shutdown(1);
                         return true; //done here
                     }
@@ -232,7 +231,7 @@
 
             if (exception == null)
             {
-                exception = new Exception(Gui.Properties.Resources.App_AppDomain_UnhandledException_Unknown_exception_);
+                exception = new Exception(Ringtoets.Properties.Resources.App_AppDomain_UnhandledException_Unknown_exception_);
             }
 
             HandleExceptionOnMainThread(exception, e.IsTerminating);
@@ -288,7 +287,7 @@
                 previousExceptionsCount++;
                 var s = previousExceptionsText;
                 previousExceptionsText =
-                    string.Format(Gui.Properties.Resources.App_HandleException_,
+                    string.Format(Ringtoets.Properties.Resources.App_HandleException_,
                                   previousExceptionsCount,
                                   dialog.ExceptionText,
                                   s);
@@ -336,13 +335,13 @@
                     }
                 },
                 {
-                    "r|run-activity=", Gui.Properties.Resources.App_ParseArguments_Run_activity_or_model_available_in_the_project_, v => runActivity = v
+                    "r|run-activity=", Ringtoets.Properties.Resources.App_ParseArguments_Run_activity_or_model_available_in_the_project_, v => runActivity = v
                 },
                 {
-                    "f|run-file=", Gui.Properties.Resources.App_ParseArguments_Run_script_from_file, v => runScriptFilePath = Path.GetFullPath(v)
+                    "f|run-file=", Ringtoets.Properties.Resources.App_ParseArguments_Run_script_from_file, v => runScriptFilePath = Path.GetFullPath(v)
                 },
                 {
-                    "c|run-command=", Gui.Properties.Resources.App_ParseArguments_Run_specified_command__Python__, v => runCommand = v
+                    "c|run-command=", Ringtoets.Properties.Resources.App_ParseArguments_Run_specified_command__Python__, v => runCommand = v
                 },
                 {
                     "p|project=", delegate(string projectPath) { projectFilePath = projectPath; }