Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -rf966263a1ac6353f155cb6304455f8050908a4b9 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision f966263a1ac6353f155cb6304455f8050908a4b9)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -97,8 +97,6 @@
     <Compile Include="IFileImporter.cs" />
     <Compile Include="IObservable.cs" />
     <Compile Include="IObserver.cs" />
-    <Compile Include="IProjectImporter.cs" />
-    <Compile Include="IProjectItemExporter.cs" />
     <Compile Include="Observable.cs" />
     <Compile Include="ObservableList.cs" />
     <Compile Include="Project.cs" />
Fisheye: Tag ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/IProjectImporter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/IProjectItemExporter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -110,16 +110,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to export file {0}. An error has occurred during clone with the following message: {1}.
-        /// </summary>
-        internal static string ProjectService_ExportProjectItemTo_Unable_to_export_file__0___An_error_has_occurred_during_clone_with_the_following_message___1_ {
-            get {
-                return ResourceManager.GetString("ProjectService_ExportProjectItemTo_Unable_to_export_file__0___An_error_has_occurr" +
-                        "ed_during_clone_with_the_following_message___1_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Project {0} saved.
         /// </summary>
         internal static string ProjectService_FireProjectSaved_Project__0__saved {
Index: Core/Common/src/Core.Common.Base/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Base/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -192,9 +192,6 @@
   <data name="ProjectService_Export_Unable_to_export_to_file__0___You_cannot_export_to_the_current_project_" xml:space="preserve">
     <value>NL Unable to export to file {0}. You cannot export to the current project.</value>
   </data>
-  <data name="ProjectService_ExportProjectItemTo_Unable_to_export_file__0___An_error_has_occurred_during_clone_with_the_following_message___1_" xml:space="preserve">
-    <value>NL Unable to export file {0}. An error has occurred during clone with the following message: {1}</value>
-  </data>
   <data name="ProjectService_FireProjectSaved_Project__0__saved" xml:space="preserve">
     <value>NL Project {0} saved</value>
   </data>
Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Base/Properties/Resources.resx	(.../Resources.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.resx	(.../Resources.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -210,7 +210,4 @@
   <data name="ProjectService_Export_Unable_to_export_to_file__0___You_cannot_export_to_the_current_project_" xml:space="preserve">
     <value>Unable to export to file {0}. You cannot export to the current project.</value>
   </data>
-  <data name="ProjectService_ExportProjectItemTo_Unable_to_export_file__0___An_error_has_occurred_during_clone_with_the_following_message___1_" xml:space="preserve">
-    <value>Unable to export file {0}. An error has occurred during clone with the following message: {1}</value>
-  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/RingtoetsApplication.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Base/RingtoetsApplication.cs	(.../RingtoetsApplication.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Base/RingtoetsApplication.cs	(.../RingtoetsApplication.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -455,13 +455,6 @@
 
             foreach (var fileImporter in Plugins.SelectMany(plugin => plugin.GetFileImporters()))
             {
-                var projectImporter = fileImporter as IProjectImporter;
-                if (projectImporter != null)
-                {
-                    // TODO: implement
-                    // projectImporter.ProjectService = ProjectService;
-                }
-
                 fileImporters.Add(fileImporter);
 
                 log.DebugFormat(Properties.Resources.RingtoetsApplication_RegisterImporters_Registering_importer__0_, fileImporter.Name);
@@ -474,13 +467,6 @@
 
             foreach (var fileExporter in Plugins.SelectMany(plugin => plugin.GetFileExporters()))
             {
-                var projectExporter = fileExporter as IProjectItemExporter;
-                if (projectExporter != null)
-                {
-                    // TODO: implement
-                    // projectExporter.ProjectService = ProjectService;
-                }
-
                 fileExporters.Add(fileExporter);
 
                 log.DebugFormat(Properties.Resources.RingtoetsApplication_RegisterExporters_Registering_exporter__0_, fileExporter.Name);
Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -rad6a41fea29f9f2160834d59d9511b8fb5d6c838 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision ad6a41fea29f9f2160834d59d9511b8fb5d6c838)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -224,7 +224,7 @@
 
         public object AddNewChildItem(object parent, IEnumerable<Type> childItemValueTypes)
         {
-            var selectDataDialog = CreateSelectionDialogWithProjectItems(GetSupportedDataItemInfosByValueTypes(parent, childItemValueTypes).ToList());
+            var selectDataDialog = CreateSelectionDialogWithItems(GetSupportedDataItemInfosByValueTypes(parent, childItemValueTypes).ToList());
 
             if (selectDataDialog.ShowDialog(gui.MainWindow as Form) == DialogResult.OK)
             {
@@ -233,36 +233,27 @@
             return null;
         }
 
-        public void AddNewProjectItem(object parent)
+        public void AddNewItem(object parent)
         {
             if (gui.Application.Project == null)
             {
-                Log.Error(Resources.GuiCommandHandler_AddNewProjectItem_There_needs_to_be_a_project_to_add_an_item);
+                Log.Error(Resources.GuiCommandHandler_AddNewItem_There_needs_to_be_a_project_to_add_an_item);
             }
 
-            var selectDataDialog = CreateSelectionDialogWithProjectItems(GetSupportedDataItemInfos(parent).ToList());
+            var selectDataDialog = CreateSelectionDialogWithItems(GetSupportedDataItemInfos(parent).ToList());
 
             if (selectDataDialog.ShowDialog(gui.MainWindow as Form) == DialogResult.OK)
             {
-                var newProjectItem = GetNewProjectItem(selectDataDialog, parent);
+                var newItem = GetNewItem(selectDataDialog, parent);
 
-                if (newProjectItem != null)
+                if (newItem != null)
                 {
-                    gui.Selection = newProjectItem;
+                    gui.Selection = newItem;
                     OpenViewForSelection();
                 }
             }
         }
 
-        /// <summary>
-        /// Adds item to project rootfolder.
-        /// </summary>
-        /// <param name="item"></param>
-        public void AddItemToProject(object item)
-        {
-            gui.Application.Project.Items.Add(item);
-        }
-
         public void ExportSelectedItem()
         {
             var selectedObject = gui.Selection;
@@ -395,7 +386,7 @@
             return GetSupportedDataItemInfos(parent).Where(dii => valueTypes.Contains(dii.ValueType));
         }
 
-        private SelectItemDialog CreateSelectionDialogWithProjectItems(IList<DataItemInfo> dataItemInfos)
+        private SelectItemDialog CreateSelectionDialogWithItems(IList<DataItemInfo> dataItemInfos)
         {
             var selectDataDialog = new SelectItemDialog();
 
@@ -412,7 +403,7 @@
             return selectDataDialog;
         }
 
-        private object GetNewProjectItem(SelectItemDialog selectDataDialog, object parent)
+        private object GetNewItem(SelectItemDialog selectDataDialog, object parent)
         {
             var newDataObject = GetNewDataObject(selectDataDialog, parent);
 
@@ -421,7 +412,7 @@
                 return null;
             }
 
-            AddProjectItemToProject(newDataObject);
+            AddItemToProject(newDataObject);
 
             return newDataObject;
         }
@@ -444,7 +435,7 @@
             return newDataObject;
         }
 
-        private void AddProjectItemToProject(object newItem)
+        public void AddItemToProject(object newItem)
         {
             gui.Application.Project.Items.Add(newItem);
             gui.Application.Project.NotifyObservers();
Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -r4c48f1a98dc77cdb66e4dc3ac80060713e6051a6 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision 4c48f1a98dc77cdb66e4dc3ac80060713e6051a6)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -60,7 +60,7 @@
         IList<GuiPlugin> Plugins { get; }
 
         /// <summary>
-        /// Suspends view removal on project item delete. Useful to avoid unnecessary checks (faster item removal).
+        /// Suspends view removal on item delete. Useful to avoid unnecessary checks (faster item removal).
         /// </summary>
         bool IsViewRemoveOnItemDeleteSuspended { get; set; }
 
Index: Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs
===================================================================
diff -u -rad6a41fea29f9f2160834d59d9511b8fb5d6c838 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs	(.../IGuiCommandHandler.cs)	(revision ad6a41fea29f9f2160834d59d9511b8fb5d6c838)
+++ Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs	(.../IGuiCommandHandler.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -69,7 +69,7 @@
         /// <param name="childItemTypes">The predicate which must evaluate to true for an item type to be included in the list</param>
         object AddNewChildItem(object parent, IEnumerable<Type> childItemTypes);
 
-        void AddNewProjectItem(object parent);
+        void AddNewItem(object parent);
 
         ///<summary>
         ///</summary>
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.18063
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -1075,29 +1075,29 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add model.
+        ///   Looks up a localized string similar to Cannot add an item to the selected container.
         /// </summary>
-        public static string GuiCommandHandler_AddNewModel_Add_model {
+        public static string GuiCommandHandler_AddNewItem_Cannot_add_an_item_to_the_selected_container {
             get {
-                return ResourceManager.GetString("GuiCommandHandler_AddNewModel_Add_model", resourceCulture);
+                return ResourceManager.GetString("GuiCommandHandler_AddNewItem_Cannot_add_an_item_to_the_selected_container", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add an item to the selected container.
+        ///   Looks up a localized string similar to There needs to be a project to add an item.
         /// </summary>
-        public static string GuiCommandHandler_AddNewProjectItem_Cannot_add_an_item_to_the_selected_container {
+        public static string GuiCommandHandler_AddNewItem_There_needs_to_be_a_project_to_add_an_item {
             get {
-                return ResourceManager.GetString("GuiCommandHandler_AddNewProjectItem_Cannot_add_an_item_to_the_selected_container", resourceCulture);
+                return ResourceManager.GetString("GuiCommandHandler_AddNewItem_There_needs_to_be_a_project_to_add_an_item", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There needs to be a project to add an item.
+        ///   Looks up a localized string similar to Add model.
         /// </summary>
-        public static string GuiCommandHandler_AddNewProjectItem_There_needs_to_be_a_project_to_add_an_item {
+        public static string GuiCommandHandler_AddNewModel_Add_model {
             get {
-                return ResourceManager.GetString("GuiCommandHandler_AddNewProjectItem_There_needs_to_be_a_project_to_add_an_item", resourceCulture);
+                return ResourceManager.GetString("GuiCommandHandler_AddNewModel_Add_model", resourceCulture);
             }
         }
         
@@ -1148,79 +1148,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No current selection found in the user interface to delete..
-        /// </summary>
-        public static string GuiCommandHandler_DeleteCurrentProjectItem_No_current_selection_found_in_the_user_interface_to_delete_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteCurrentProjectItem_No_current_selection_found_in_the_user" +
-                        "_interface_to_delete_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Delete {0}.
-        /// </summary>
-        public static string GuiCommandHandler_DeleteProjectItem_Delete__0_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteProjectItem_Delete__0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The composite model you are trying to delete contains models that are linked by other models: {0} after deletion these links will be lost. Do you wish to continue?.
-        /// </summary>
-        public static string GuiCommandHandler_DeleteProjectItem_The_composite_model_you_are_trying_to_delete_contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteProjectItem_The_composite_model_you_are_trying_to_delete_" +
-                        "contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_" +
-                        "will_be_lost__Do_you_wish_to_continue_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The folder you are trying to delete contains models that are linked by other models: {0} after deletion these links will be lost. Do you wish to continue?.
-        /// </summary>
-        public static string GuiCommandHandler_DeleteProjectItem_The_folder_you_are_trying_to_delete_contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteProjectItem_The_folder_you_are_trying_to_delete_contains_" +
-                        "models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_l" +
-                        "ost__Do_you_wish_to_continue_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The following model{0} depend{1} on this item:{2}.
-        /// </summary>
-        public static string GuiCommandHandler_DeleteProjectItem_The_following_model_0__depend_1__on_this_item__2_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteProjectItem_The_following_model_0__depend_1__on_this_item" +
-                        "__2_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The item you are trying to delete is linked by other items, after deletion these links will be lost. Do you wish to continue?.
-        /// </summary>
-        public static string GuiCommandHandler_DeleteProjectItem_The_item_you_are_trying_to_delete_is_linked_by_other_items__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteProjectItem_The_item_you_are_trying_to_delete_is_linked_b" +
-                        "y_other_items__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" +
-                        "", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The model you are trying to delete is linked by other models: {0} after deletion these links will be lost. Do you wish to continue?.
-        /// </summary>
-        public static string GuiCommandHandler_DeleteProjectItem_The_model_you_are_trying_to_delete_is_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_ {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_DeleteProjectItem_The_model_you_are_trying_to_delete_is_linked_" +
-                        "by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_con" +
-                        "tinue_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Unable to import on {0}..
         /// </summary>
         public static string GuiCommandHandler_ImportOn_Unable_to_import_on__0__ {
@@ -2234,125 +2161,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not cut / paste into child.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_child {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_child", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can not cut / paste into itself.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_itself {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_itself", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can not cut / paste into the same container without providing position.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_the_same_container_without_providing_position {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_the_same_contai" +
-                        "ner_without_providing_position", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Target paste container is null.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CanPasteInto_Target_paste_container_is_null {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CanPasteInto_Target_paste_container_is_null", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy item &quot;{0}&quot;.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_Copy_Copy_item___0__ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_Copy_Copy_item___0__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can not paste {0} into {1}, as an error occurred during copy: {2}.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CopyPaste_Can_not_paste__0__into__1___as_an_error_occurred_during_copy___2_ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CopyPaste_Can_not_paste__0__into__1___as_an_error_occ" +
-                        "urred_during_copy___2_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy item.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CopyPaste_Copy_item {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CopyPaste_Copy_item", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy of {0}.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CopyPaste_Copy_of__0_ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CopyPaste_Copy_of__0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Creating a copy of an item &quot;{0}&quot; in &quot;{1}&quot;.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CopyPaste_Creating_a_copy_of_an_item___0___in___1__ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CopyPaste_Creating_a_copy_of_an_item___0___in___1__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cut item &quot;{0}&quot;.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_Cut_Cut_item___0__ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_Cut_Cut_item___0__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Moving item &quot;{0}&quot; from &quot;{1}&quot; to &quot;{2}&quot; (position = {3}).
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CutPaste_ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CutPaste_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Moving {0}.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_CutPaste_Moving__0_ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_CutPaste_Moving__0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can not paste {0} into {1}.
-        /// </summary>
-        public static string ProjectItemCopyPasteHandler_Paste_Can_not_paste__0__into__1_ {
-            get {
-                return ResourceManager.GetString("ProjectItemCopyPasteHandler_Paste_Can_not_paste__0__into__1_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Properties.
         /// </summary>
         public static string Properties {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Gui/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -351,10 +351,10 @@
   <data name="GuiCommandHandler_AddNewModel_Add_model" xml:space="preserve">
     <value>NL Add model</value>
   </data>
-  <data name="GuiCommandHandler_AddNewProjectItem_Cannot_add_an_item_to_the_selected_container" xml:space="preserve">
+  <data name="GuiCommandHandler_AddNewItem_Cannot_add_an_item_to_the_selected_container" xml:space="preserve">
     <value>NL Cannot add an item to the selected container</value>
   </data>
-  <data name="GuiCommandHandler_AddNewProjectItem_There_needs_to_be_a_project_to_add_an_item" xml:space="preserve">
+  <data name="GuiCommandHandler_AddNewItem_There_needs_to_be_a_project_to_add_an_item" xml:space="preserve">
     <value>NL There needs to be a project to add an item</value>
   </data>
   <data name="GuiCommandHandler_CloseProject_Closing_project____" xml:space="preserve">
@@ -372,27 +372,6 @@
   <data name="GuiCommandHandler_CreateNewModelUsingDialog_Select_model____" xml:space="preserve">
     <value>NL Select model ...</value>
   </data>
-  <data name="GuiCommandHandler_DeleteCurrentProjectItem_No_current_selection_found_in_the_user_interface_to_delete_" xml:space="preserve">
-    <value>NL No current selection found in the user interface to delete.</value>
-  </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_Delete__0_" xml:space="preserve">
-    <value>NL Delete {0}</value>
-  </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_composite_model_you_are_trying_to_delete_contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>NL The composite model you are trying to delete contains models that are linked by other models: {0} after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_folder_you_are_trying_to_delete_contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>NL The folder you are trying to delete contains models that are linked by other models: {0} after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_following_model_0__depend_1__on_this_item__2_" xml:space="preserve">
-    <value>NL The following model{0} depend{1} on this item:{2}</value>
-  </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_item_you_are_trying_to_delete_is_linked_by_other_items__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>NL The item you are trying to delete is linked by other items, after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_model_you_are_trying_to_delete_is_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>NL The model you are trying to delete is linked by other models: {0} after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
   <data name="GuiCommandHandler_ImportOn_Unable_to_import_on__0__" xml:space="preserve">
     <value>NL Unable to import on {0}.</value>
   </data>
@@ -609,45 +588,6 @@
   <data name="PortableSettingsProvider_ThrowIfRoaming_Setting__0__is_roaming__This_is_not_supported" xml:space="preserve">
     <value>NL Setting {0} is roaming. This is not supported</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_child" xml:space="preserve">
-    <value>NL Can not cut / paste into child</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_itself" xml:space="preserve">
-    <value>NL Can not cut / paste into itself</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_the_same_container_without_providing_position" xml:space="preserve">
-    <value>NL Can not cut / paste into the same container without providing position</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Target_paste_container_is_null" xml:space="preserve">
-    <value>NL Target paste container is null</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_Copy_Copy_item___0__" xml:space="preserve">
-    <value>NL Copy item "{0}"</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Can_not_paste__0__into__1___as_an_error_occurred_during_copy___2_" xml:space="preserve">
-    <value>NL Can not paste {0} into {1}, as an error occurred during copy: {2}</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Copy_item" xml:space="preserve">
-    <value>NL Copy item</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Copy_of__0_" xml:space="preserve">
-    <value>NL Copy of {0}</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Creating_a_copy_of_an_item___0___in___1__" xml:space="preserve">
-    <value>NL Creating a copy of an item "{0}" in "{1}"</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_Cut_Cut_item___0__" xml:space="preserve">
-    <value>NL Cut item "{0}"</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CutPaste_" xml:space="preserve">
-    <value>NL Moving item "{0}" from "{1}" to "{2}" (position = {3})</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_CutPaste_Moving__0_" xml:space="preserve">
-    <value>NL Moving {0}</value>
-  </data>
-  <data name="ProjectItemCopyPasteHandler_Paste_Can_not_paste__0__into__1_" xml:space="preserve">
-    <value>NL Can not paste {0} into {1}</value>
-  </data>
   <data name="RichTextView_RichTextView_The_license_file__0__cannot_be_found_on_the_computer_" xml:space="preserve">
     <value>NL The license file {0} cannot be found on the computer.</value>
   </data>
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -151,9 +151,6 @@
   <data name="RelationshipsHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\RelationshipsHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CutPaste_" xml:space="preserve">
-    <value>Moving item "{0}" from "{1}" to "{2}" (position = {3})</value>
-  </data>
   <data name="Opening_new_wti_project_cancelled" xml:space="preserve">
     <value>Opening new WTI project cancelled.</value>
   </data>
@@ -176,9 +173,6 @@
     <value>======== EXCEPTION #{0}: ========
 {1}{2}</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_Copy_Copy_item___0__" xml:space="preserve">
-    <value>Copy item "{0}"</value>
-  </data>
   <data name="Edit_UndoHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Edit_UndoHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -194,9 +188,6 @@
   <data name="Ribbon_Command_New" xml:space="preserve">
     <value>New</value>
   </data>
-  <data name="GuiCommandHandler_DeleteCurrentProjectItem_No_current_selection_found_in_the_user_interface_to_delete_" xml:space="preserve">
-    <value>No current selection found in the user interface to delete.</value>
-  </data>
   <data name="MainWindowCommands_ShowPropertiesViewCommand_Text_Show_Properties__Shift___Alt____P_" xml:space="preserve">
     <value>Show Properties (Shift + Alt  + P)</value>
   </data>
@@ -245,10 +236,7 @@
   <data name="SearchDialog_BackgroundWorker1RunWorkerCompleted_The_search_has_been_cancelled" xml:space="preserve">
     <value>The search has been cancelled</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_child" xml:space="preserve">
-    <value>Can not cut / paste into child</value>
-  </data>
-  <data name="GuiCommandHandler_AddNewProjectItem_Cannot_add_an_item_to_the_selected_container" xml:space="preserve">
+  <data name="GuiCommandHandler_AddNewItem_Cannot_add_an_item_to_the_selected_container" xml:space="preserve">
     <value>Cannot add an item to the selected container</value>
   </data>
   <data name="Wti_project_file_filter" xml:space="preserve">
@@ -386,9 +374,6 @@
   <data name="chart_curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CutPaste_Moving__0_" xml:space="preserve">
-    <value>Moving {0}</value>
-  </data>
   <data name="GuiCommandHandler_StopSelectedModel_Can_t_stop_model__no_models_selected_" xml:space="preserve">
     <value>Can't stop model, no models selected.</value>
   </data>
@@ -413,9 +398,6 @@
   <data name="StopHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>../Resources/StopHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Target_paste_container_is_null" xml:space="preserve">
-    <value>Target paste container is null</value>
-  </data>
   <data name="Ribbon_Start_Page" xml:space="preserve">
     <value>Start Page</value>
   </data>
@@ -431,9 +413,6 @@
   <data name="GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file__opening_log_file_directory_instead_" xml:space="preserve">
     <value>Unable to open log file, opening log file directory instead.</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Copy_item" xml:space="preserve">
-    <value>Copy item</value>
-  </data>
   <data name="control_stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>../Resources/control_stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -455,9 +434,6 @@
   <data name="MainWindow_AddNewMruItem_Can_t_open_project" xml:space="preserve">
     <value>Can't open project</value>
   </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_folder_you_are_trying_to_delete_contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>The folder you are trying to delete contains models that are linked by other models: {0} after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
   <data name="DeleteHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>../Resources/DeleteHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -533,9 +509,6 @@
   <data name="SearchDialog_BackgroundWorker1DoWork__0__does_not_support_searching" xml:space="preserve">
     <value>{0} does not support searching</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Copy_of__0_" xml:space="preserve">
-    <value>Copy of {0}</value>
-  </data>
   <data name="Ribbon_TabItem_Recent_Projects" xml:space="preserve">
     <value>Recent Projects</value>
   </data>
@@ -650,9 +623,6 @@
   <data name="brick_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brick_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_composite_model_you_are_trying_to_delete_contains_models_that_are_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>The composite model you are trying to delete contains models that are linked by other models: {0} after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
   <data name="PasteHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\PasteHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -707,9 +677,6 @@
   <data name="GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_available_" xml:space="preserve">
     <value>No exporter for this item available.</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_itself" xml:space="preserve">
-    <value>Can not cut / paste into itself</value>
-  </data>
   <data name="MainWindowCommands_RunAllModelsCommand_Name_Run_All_Models" xml:space="preserve">
     <value>Run All Models</value>
   </data>
@@ -770,7 +737,7 @@
   <data name="ProgressDialog_SetButtonState_Cancel_all_activities" xml:space="preserve">
     <value>Cancel all activities</value>
   </data>
-  <data name="GuiCommandHandler_AddNewProjectItem_There_needs_to_be_a_project_to_add_an_item" xml:space="preserve">
+  <data name="GuiCommandHandler_AddNewItem_There_needs_to_be_a_project_to_add_an_item" xml:space="preserve">
     <value>There needs to be a project to add an item</value>
   </data>
   <data name="script" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -800,15 +767,9 @@
   <data name="RingtoetsGui_Run_Initializing_graphical_user_interface____" xml:space="preserve">
     <value>Initializing graphical user interface ...</value>
   </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_model_you_are_trying_to_delete_is_linked_by_other_models___0__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>The model you are trying to delete is linked by other models: {0} after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
   <data name="folder_feed" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_feed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_Cut_Cut_item___0__" xml:space="preserve">
-    <value>Cut item "{0}"</value>
-  </data>
   <data name="brick_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brick_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -956,9 +917,6 @@
   <data name="App_RunRingtoets_Starting_Ringtoets_Gui____" xml:space="preserve">
     <value>StartingRingtoets Gui ...</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Creating_a_copy_of_an_item___0___in___1__" xml:space="preserve">
-    <value>Creating a copy of an item "{0}" in "{1}"</value>
-  </data>
   <data name="Ribbon_Copy" xml:space="preserve">
     <value>Copy</value>
   </data>
@@ -971,9 +929,6 @@
   <data name="PropertyGrid_CreateObjectProperties_Could_not_create_object_properties_for_the_data" xml:space="preserve">
     <value>Could not create object properties for the data</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_Paste_Can_not_paste__0__into__1_" xml:space="preserve">
-    <value>Can not paste {0} into {1}</value>
-  </data>
   <data name="ViewList_ActivateView_Item_not_found_in_list_of_views" xml:space="preserve">
     <value>Item not found in list of views</value>
   </data>
@@ -995,9 +950,6 @@
   <data name="RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready_" xml:space="preserve">
     <value>Menus and toolbars are ready.</value>
   </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_item_you_are_trying_to_delete_is_linked_by_other_items__after_deletion_these_links_will_be_lost__Do_you_wish_to_continue_" xml:space="preserve">
-    <value>The item you are trying to delete is linked by other items, after deletion these links will be lost. Do you wish to continue?</value>
-  </data>
   <data name="OrgChartHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\OrgChartHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -1031,9 +983,6 @@
   <data name="cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_The_following_model_0__depend_1__on_this_item__2_" xml:space="preserve">
-    <value>The following model{0} depend{1} on this item:{2}</value>
-  </data>
   <data name="Ribbon_Feedback" xml:space="preserve">
     <value>Feedback</value>
   </data>
@@ -1100,9 +1049,6 @@
   <data name="folder_output" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_output.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GuiCommandHandler_DeleteProjectItem_Delete__0_" xml:space="preserve">
-    <value>Delete {0}</value>
-  </data>
   <data name="GuiCommandHandler_CloseProject_Project_closed" xml:space="preserve">
     <value>Project closed</value>
   </data>
@@ -1115,9 +1061,6 @@
   <data name="Ribbon_Recent" xml:space="preserve">
     <value>Recent</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CanPasteInto_Can_not_cut___paste_into_the_same_container_without_providing_position" xml:space="preserve">
-    <value>Can not cut / paste into the same container without providing position</value>
-  </data>
   <data name="GeneralOptionsControl_SetSettingsToNumberFormatControls_Unknown_numberFormat_for_user_settings" xml:space="preserve">
     <value>Unknown numberFormat for user settings</value>
   </data>
@@ -1202,9 +1145,6 @@
   <data name="FindProject" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\FindProject.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ProjectItemCopyPasteHandler_CopyPaste_Can_not_paste__0__into__1___as_an_error_occurred_during_copy___2_" xml:space="preserve">
-    <value>Can not paste {0} into {1}, as an error occurred during copy: {2}</value>
-  </data>
   <data name="icon_clear_all_messages" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_clear_all_messages.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
Index: Core/Common/uml/Core.Common.Base.UML/Core.cd
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Common/uml/Core.Common.Base.UML/Core.cd	(.../Core.cd)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/uml/Core.Common.Base.UML/Core.cd	(.../Core.cd)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -48,18 +48,6 @@
     <Position X="19.75" Y="0.5" Width="1.5" />
     <TypeIdentifier />
   </Interface>
-  <Interface Name="Core.Common.Base.IProjectItemExporter">
-    <Position X="19" Y="4.5" Width="3" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Base.IProjectImporter">
-    <Position X="15" Y="4.5" Width="2.5" />
-    <TypeIdentifier />
-  </Interface>
-  <Interface Name="Core.Common.Base.IProjectItem">
-    <Position X="2" Y="8.25" Width="3" />
-    <TypeIdentifier />
-  </Interface>
   <Interface Name="Core.Common.Base.Workflow.IActivity">
     <Position X="2.75" Y="11.25" Width="1.5" />
     <TypeIdentifier />
Index: Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -274,52 +274,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ringtoets Project Files.
-        /// </summary>
-        public static string ProjectImporter_FileFilter_Ringtoets_Project_Files {
-            get {
-                return ResourceManager.GetString("ProjectImporter_FileFilter_Ringtoets_Project_Files", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Project.
-        /// </summary>
-        public static string ProjectImporter_Name_Project {
-            get {
-                return ResourceManager.GetString("ProjectImporter_Name_Project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ProjectFolderExporter only supports export of IProjectItem based objects.
-        /// </summary>
-        public static string ProjectItemExporter_Export_ProjectFolderExporter_only_supports_export_of_IProjectItem_based_objects {
-            get {
-                return ResourceManager.GetString("ProjectItemExporter_Export_ProjectFolderExporter_only_supports_export_of_IProject" +
-                        "Item_based_objects", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ringtoets project files.
-        /// </summary>
-        public static string ProjectItemExporter_fileFilter_Ringtoets_project_files {
-            get {
-                return ResourceManager.GetString("ProjectItemExporter_fileFilter_Ringtoets_project_files", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Export to new project.
-        /// </summary>
-        public static string ProjectItemExporter_name_Export_to_new_project {
-            get {
-                return ResourceManager.GetString("ProjectItemExporter_name_Export_to_new_project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap textdocument {
Index: Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -186,15 +186,6 @@
   <data name="ProjectImporter_Name_Project" xml:space="preserve">
     <value>NL Project</value>
   </data>
-  <data name="ProjectItemExporter_Export_ProjectFolderExporter_only_supports_export_of_IProjectItem_based_objects" xml:space="preserve">
-    <value>NL ProjectFolderExporter only supports export of IProjectItem based objects</value>
-  </data>
-  <data name="ProjectItemExporter_fileFilter_Ringtoets_project_files" xml:space="preserve">
-    <value>NL Ringtoets project files</value>
-  </data>
-  <data name="ProjectItemExporter_name_Export_to_new_project" xml:space="preserve">
-    <value>NL Export to new project</value>
-  </data>
   <data name="TimeSeriesAttributes_SetToFunction_Setting_attributes_on_non_time_series_function_is_not_supported" xml:space="preserve">
     <value>NL Setting attributes on non-time series function is not supported</value>
   </data>
Index: Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx	(.../Resources.resx)	(revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx	(.../Resources.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -136,21 +136,6 @@
   <data name="CommonToolsApplicationPlugin_GetDataItemInfos_Text_Document" xml:space="preserve">
     <value>Text Document</value>
   </data>
-  <data name="ProjectItemExporter_name_Export_to_new_project" xml:space="preserve">
-    <value>Export to new project</value>
-  </data>
-  <data name="ProjectItemExporter_fileFilter_Ringtoets_project_files" xml:space="preserve">
-    <value>Ringtoets project files</value>
-  </data>
-  <data name="ProjectItemExporter_Export_ProjectFolderExporter_only_supports_export_of_IProjectItem_based_objects" xml:space="preserve">
-    <value>ProjectFolderExporter only supports export of IProjectItem based objects</value>
-  </data>
-  <data name="ProjectImporter_Name_Project" xml:space="preserve">
-    <value>Project</value>
-  </data>
-  <data name="ProjectImporter_FileFilter_Ringtoets_Project_Files" xml:space="preserve">
-    <value>Ringtoets Project Files</value>
-  </data>
   <data name="FileBasedRestartStateImporter_Name_Restart_State" xml:space="preserve">
     <value>Restart State</value>
   </data>
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs
===================================================================
diff -u -r4c48f1a98dc77cdb66e4dc3ac80060713e6051a6 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 4c48f1a98dc77cdb66e4dc3ac80060713e6051a6)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -193,7 +193,6 @@
 
             var tag = treeView.SelectedNode != null ? treeView.SelectedNode.Tag : null;
 
-            // triggers validate items for ribbon so this should be done after setting SelectedProjectItem
             gui.Selection = tag;
 
             selectingNode = false;
@@ -261,7 +260,7 @@
 
         private void buttonsAddNewDataClick(object sender, EventArgs e)
         {
-            gui.CommandHandler.AddNewProjectItem(gui.Selection);
+            gui.CommandHandler.AddNewItem(gui.Selection);
         }
 
         /// <summary>
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs
===================================================================
diff -u -rfb6f952991193be2c30995f3f8e60312c12dc052 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fb6f952991193be2c30995f3f8e60312c12dc052)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -918,7 +918,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can&apos;t find project item for view data: {0}.
+        ///   Looks up a localized string similar to Can&apos;t find item for view data: {0}.
         /// </summary>
         public static string ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data___0_ {
             get {
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.nl-NL.resx
===================================================================
diff -u -rfb6f952991193be2c30995f3f8e60312c12dc052 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision fb6f952991193be2c30995f3f8e60312c12dc052)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.nl-NL.resx	(.../Resources.nl-NL.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -154,7 +154,7 @@
     <value>NL &lt;empty&gt;</value>
   </data>
   <data name="ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data___0_" xml:space="preserve">
-    <value>NL Can't find project item for view data: {0}</value>
+    <value>NL Can't find item for view data: {0}</value>
   </data>
   <data name="ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item___0_" xml:space="preserve">
     <value>NL Can't find tree node for item: {0}</value>
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx
===================================================================
diff -u -rfb6f952991193be2c30995f3f8e60312c12dc052 -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx	(.../Resources.resx)	(revision fb6f952991193be2c30995f3f8e60312c12dc052)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx	(.../Resources.resx)	(revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc)
@@ -419,7 +419,7 @@
     <value>MainWindow must be visible when WaitUntilAllEventsAreProcessed is called on project tree view.</value>
   </data>
   <data name="ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data___0_" xml:space="preserve">
-    <value>Can't find project item for view data: {0}</value>
+    <value>Can't find item for view data: {0}</value>
   </data>
   <data name="ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item___0_" xml:space="preserve">
     <value>Can't find tree node for item: {0}</value>