Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -rc0d27d013180f7c062deb22400091807cbab2445 -rdffc53e4523fe836a7a08270b3968ba4c993276f
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision c0d27d013180f7c062deb22400091807cbab2445)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision dffc53e4523fe836a7a08270b3968ba4c993276f)
@@ -21,14 +21,13 @@
 
 namespace Core.Common.Gui
 {
-    public class GuiCommandHandler : IGuiCommandHandler, IStorageCommands, IObserver
+    public class GuiCommandHandler : IGuiCommandHandler, IObserver
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(GuiCommandHandler));
 
         private readonly GuiImportHandler guiImportHandler;
         private readonly GuiExportHandler guiExportHandler;
         private readonly IGui gui;
-        private readonly StorageCommandHandler storageCommandHandler;
 
         public GuiCommandHandler(IGui gui)
         {
@@ -39,63 +38,8 @@
 
             guiImportHandler = CreateGuiImportHandler();
             guiExportHandler = CreateGuiExportHandler();
-            storageCommandHandler = new StorageCommandHandler(this, gui);
         }
 
-        #region Implementation: IStorageCommands
-
-        public void CreateNewProject()
-        {
-            storageCommandHandler.CreateNewProject();
-        }
-
-        /// <summary>
-        /// Opens a new <see cref="OpenFileDialog"/> where a file can be selected to open.
-        /// </summary>
-        /// <returns><c>true</c> if an existing <see cref="Project"/> has been loaded, <c>false</c> otherwise.</returns>
-        public bool OpenExistingProject()
-        {
-            return storageCommandHandler.OpenExistingProject();
-        }
-
-        /// <summary>
-        /// Loads a <see cref="Project"/>, based upon <paramref name="filePath"/>.
-        /// </summary>
-        /// <param name="filePath">Location of the storage file.</param>
-        /// <returns><c>true</c> if an existing <see cref="Project"/> has been loaded, <c>false</c> otherwise.</returns>
-        public bool OpenExistingProject(string filePath)
-        {
-            return storageCommandHandler.OpenExistingProject(filePath);
-        }
-
-        /// <summary>
-        /// Close current project (if any) and related views.
-        /// </summary>
-        public void CloseProject()
-        {
-            storageCommandHandler.CloseProject();
-        }
-
-        /// <summary>
-        /// Saves the current <see cref="Project"/> to the selected storage file.
-        /// </summary>
-        /// <returns>Returns if the save was succesful.</returns>
-        public bool SaveProjectAs()
-        {
-            return storageCommandHandler.SaveProjectAs();
-        }
-
-        /// <summary>
-        /// Saves the current <see cref="Project"/> to the defined storage file.
-        /// </summary>
-        /// <returns>Returns if the save was succesful.</returns>
-        public bool SaveProject()
-        {
-            return storageCommandHandler.SaveProject();
-        }
-
-        #endregion
-
         public object GetDataOfActiveView()
         {
             return gui.DocumentViews.ActiveView != null ? gui.DocumentViews.ActiveView.Data : null;
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -rc0d27d013180f7c062deb22400091807cbab2445 -rdffc53e4523fe836a7a08270b3968ba4c993276f
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision c0d27d013180f7c062deb22400091807cbab2445)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision dffc53e4523fe836a7a08270b3968ba4c993276f)
@@ -69,6 +69,7 @@
         private bool userSettingsDirty;
         private ApplicationSettingsBase userSettings;
         private GuiCommandHandler guiCommandHandler;
+        private StorageCommandHandler storageCommandHandler;
 
         public RingtoetsGui(ApplicationCore applicationCore = null, GuiCoreSettings fixedSettings = null)
         {
@@ -91,6 +92,7 @@
             UserSettings = Settings.Default;
 
             guiCommandHandler = new GuiCommandHandler(this);
+            storageCommandHandler = new StorageCommandHandler(guiCommandHandler, this);
 
             WindowsApplication.EnableVisualStyles();
 
@@ -189,7 +191,7 @@
         {
             get
             {
-                return guiCommandHandler;
+                return storageCommandHandler;
             }
         }