diff --git a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/ICustomDocumentTitleProvider.cs b/RainmeterStudio.Core/Editor/Features/ICustomDocumentTitleProvider.cs
similarity index 74%
rename from RainmeterStudio.Core/Documents/DocumentEditorFeatures/ICustomDocumentTitleProvider.cs
rename to RainmeterStudio.Core/Editor/Features/ICustomDocumentTitleProvider.cs
index 3d742db8..9b51bc0f 100644
--- a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/ICustomDocumentTitleProvider.cs
+++ b/RainmeterStudio.Core/Editor/Features/ICustomDocumentTitleProvider.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace RainmeterStudio.Core.Documents.DocumentEditorFeatures
+namespace RainmeterStudio.Core.Editor.Features
 {
     public interface ICustomDocumentTitleProvider
     {
diff --git a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/ISelectionPropertiesProvider.cs b/RainmeterStudio.Core/Editor/Features/ISelectionPropertiesProvider.cs
similarity index 80%
rename from RainmeterStudio.Core/Documents/DocumentEditorFeatures/ISelectionPropertiesProvider.cs
rename to RainmeterStudio.Core/Editor/Features/ISelectionPropertiesProvider.cs
index 6acb1453..218f0afb 100644
--- a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/ISelectionPropertiesProvider.cs
+++ b/RainmeterStudio.Core/Editor/Features/ISelectionPropertiesProvider.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using RainmeterStudio.Core.Model;
 
-namespace RainmeterStudio.Core.Documents.DocumentEditorFeatures
+namespace RainmeterStudio.Core.Editor.Features
 {
     interface ISelectionPropertiesProvider
     {
diff --git a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/IToolboxProvider.cs b/RainmeterStudio.Core/Editor/Features/IToolboxProvider.cs
similarity index 78%
rename from RainmeterStudio.Core/Documents/DocumentEditorFeatures/IToolboxProvider.cs
rename to RainmeterStudio.Core/Editor/Features/IToolboxProvider.cs
index 9b88a87c..aed75dee 100644
--- a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/IToolboxProvider.cs
+++ b/RainmeterStudio.Core/Editor/Features/IToolboxProvider.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace RainmeterStudio.Core.Documents.DocumentEditorFeatures
+namespace RainmeterStudio.Core.Editor.Features
 {
     public interface IToolboxProvider
     {
diff --git a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/IUndoSupport.cs b/RainmeterStudio.Core/Editor/Features/IUndoSupport.cs
similarity index 67%
rename from RainmeterStudio.Core/Documents/DocumentEditorFeatures/IUndoSupport.cs
rename to RainmeterStudio.Core/Editor/Features/IUndoSupport.cs
index 3a2cab60..27d22665 100644
--- a/RainmeterStudio.Core/Documents/DocumentEditorFeatures/IUndoSupport.cs
+++ b/RainmeterStudio.Core/Editor/Features/IUndoSupport.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace RainmeterStudio.Core.Documents.DocumentEditorFeatures
+namespace RainmeterStudio.Core.Editor.Features
 {
     public interface IUndoSupport
     {
diff --git a/RainmeterStudio.Core/Documents/IDocumentEditor.cs b/RainmeterStudio.Core/Editor/IDocumentEditor.cs
similarity index 89%
rename from RainmeterStudio.Core/Documents/IDocumentEditor.cs
rename to RainmeterStudio.Core/Editor/IDocumentEditor.cs
index f4f33cfc..e0e88a15 100644
--- a/RainmeterStudio.Core/Documents/IDocumentEditor.cs
+++ b/RainmeterStudio.Core/Editor/IDocumentEditor.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using RainmeterStudio.Core.Model;
 
-namespace RainmeterStudio.Core.Documents
+namespace RainmeterStudio.Core.Editor
 {
     /// <summary>
     /// A document editor
diff --git a/RainmeterStudio.Core/Documents/IDocumentEditorFactory.cs b/RainmeterStudio.Core/Editor/IDocumentEditorFactory.cs
similarity index 91%
rename from RainmeterStudio.Core/Documents/IDocumentEditorFactory.cs
rename to RainmeterStudio.Core/Editor/IDocumentEditorFactory.cs
index 514c97e2..d0ec1463 100644
--- a/RainmeterStudio.Core/Documents/IDocumentEditorFactory.cs
+++ b/RainmeterStudio.Core/Editor/IDocumentEditorFactory.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using RainmeterStudio.Core.Model;
 
-namespace RainmeterStudio.Core.Documents
+namespace RainmeterStudio.Core.Editor
 {
     public interface IDocumentEditorFactory
     {
diff --git a/RainmeterStudio.Core/Model/Events/DocumentOpenedEventArgs.cs b/RainmeterStudio.Core/Model/Events/DocumentOpenedEventArgs.cs
index f5519e7b..8457e659 100644
--- a/RainmeterStudio.Core/Model/Events/DocumentOpenedEventArgs.cs
+++ b/RainmeterStudio.Core/Model/Events/DocumentOpenedEventArgs.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 
 namespace RainmeterStudio.Core.Model.Events
 {
diff --git a/RainmeterStudio.Core/RainmeterStudio.Core.csproj b/RainmeterStudio.Core/RainmeterStudio.Core.csproj
index 3f37e179..a6b531e0 100644
--- a/RainmeterStudio.Core/RainmeterStudio.Core.csproj
+++ b/RainmeterStudio.Core/RainmeterStudio.Core.csproj
@@ -50,13 +50,13 @@
     <Compile Include="Model\IProjectTemplate.cs" />
     <Compile Include="RainmeterStudioPluginAttribute.cs" />
     <Compile Include="PluginExportAttribute.cs" />
-    <Compile Include="Documents\DocumentEditorFeatures\ICustomDocumentTitleProvider.cs" />
-    <Compile Include="Documents\DocumentEditorFeatures\ISelectionPropertiesProvider.cs" />
-    <Compile Include="Documents\DocumentEditorFeatures\IToolboxProvider.cs" />
-    <Compile Include="Documents\DocumentEditorFeatures\IUndoSupport.cs" />
+    <Compile Include="Editor\Features\ICustomDocumentTitleProvider.cs" />
+    <Compile Include="Editor\Features\ISelectionPropertiesProvider.cs" />
+    <Compile Include="Editor\Features\IToolboxProvider.cs" />
+    <Compile Include="Editor\Features\IUndoSupport.cs" />
     <Compile Include="Model\IDocumentTemplate.cs" />
-    <Compile Include="Documents\IDocumentEditor.cs" />
-    <Compile Include="Documents\IDocumentEditorFactory.cs" />
+    <Compile Include="Editor\IDocumentEditor.cs" />
+    <Compile Include="Editor\IDocumentEditorFactory.cs" />
     <Compile Include="Storage\IDocumentStorage.cs" />
     <Compile Include="Model\Events\DocumentOpenedEventArgs.cs" />
     <Compile Include="Model\IDocument.cs" />
diff --git a/RainmeterStudio.SkinDesigner/SkinDesigner.cs b/RainmeterStudio.SkinDesigner/SkinDesigner.cs
index f7194dd0..9d4131f6 100644
--- a/RainmeterStudio.SkinDesigner/SkinDesigner.cs
+++ b/RainmeterStudio.SkinDesigner/SkinDesigner.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Windows;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
-using RainmeterStudio.Core.Documents.DocumentEditorFeatures;
+using RainmeterStudio.Core.Editor.Features;
 
 namespace RainmeterStudio.SkinDesignerPlugin
 {
diff --git a/RainmeterStudio.SkinDesigner/SkinDesignerFactory.cs b/RainmeterStudio.SkinDesigner/SkinDesignerFactory.cs
index 7770bacc..267f7a1c 100644
--- a/RainmeterStudio.SkinDesigner/SkinDesignerFactory.cs
+++ b/RainmeterStudio.SkinDesigner/SkinDesignerFactory.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using RainmeterStudio.Core;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.SkinDesignerPlugin
diff --git a/RainmeterStudio.SkinDesigner/SkinDocumentTemplate.cs b/RainmeterStudio.SkinDesigner/SkinDocumentTemplate.cs
index 58ccc7ef..c3501cd2 100644
--- a/RainmeterStudio.SkinDesigner/SkinDocumentTemplate.cs
+++ b/RainmeterStudio.SkinDesigner/SkinDocumentTemplate.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using RainmeterStudio.Core;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.SkinDesignerPlugin
diff --git a/RainmeterStudio.TextEditor/TextDocumentTemplate.cs b/RainmeterStudio.TextEditor/TextDocumentTemplate.cs
index 37917af3..cfd9c951 100644
--- a/RainmeterStudio.TextEditor/TextDocumentTemplate.cs
+++ b/RainmeterStudio.TextEditor/TextDocumentTemplate.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using RainmeterStudio.Core;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.TextEditorPlugin
diff --git a/RainmeterStudio.TextEditor/TextEditor.cs b/RainmeterStudio.TextEditor/TextEditor.cs
index 1835fbe6..81704675 100644
--- a/RainmeterStudio.TextEditor/TextEditor.cs
+++ b/RainmeterStudio.TextEditor/TextEditor.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.TextEditorPlugin
diff --git a/RainmeterStudio.TextEditor/TextEditorFactory.cs b/RainmeterStudio.TextEditor/TextEditorFactory.cs
index 2fad25de..aca76656 100644
--- a/RainmeterStudio.TextEditor/TextEditorFactory.cs
+++ b/RainmeterStudio.TextEditor/TextEditorFactory.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using RainmeterStudio.Core;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.TextEditorPlugin
diff --git a/RainmeterStudio/Business/DocumentManager.cs b/RainmeterStudio/Business/DocumentManager.cs
index 7408cf0e..401d3f53 100644
--- a/RainmeterStudio/Business/DocumentManager.cs
+++ b/RainmeterStudio/Business/DocumentManager.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 using RainmeterStudio.Core.Model.Events;
 using RainmeterStudio.Core.Storage;
diff --git a/RainmeterStudio/Business/PluginManager.cs b/RainmeterStudio/Business/PluginManager.cs
index 981f49f6..d23859b2 100644
--- a/RainmeterStudio/Business/PluginManager.cs
+++ b/RainmeterStudio/Business/PluginManager.cs
@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Resources;
 using System.Text;
 using RainmeterStudio.Core;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Utils;
 using RainmeterStudio.Resources;
 
diff --git a/RainmeterStudio/Editor/ProjectEditor/ProjectEditorFactory.cs b/RainmeterStudio/Editor/ProjectEditor/ProjectEditorFactory.cs
index 28747b11..1b5bda36 100644
--- a/RainmeterStudio/Editor/ProjectEditor/ProjectEditorFactory.cs
+++ b/RainmeterStudio/Editor/ProjectEditor/ProjectEditorFactory.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using RainmeterStudio.Core;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.Editor.ProjectEditor
diff --git a/RainmeterStudio/Editor/ProjectEditor/ProjectEditorUI.xaml.cs b/RainmeterStudio/Editor/ProjectEditor/ProjectEditorUI.xaml.cs
index 7eadc16a..3a236e83 100644
--- a/RainmeterStudio/Editor/ProjectEditor/ProjectEditorUI.xaml.cs
+++ b/RainmeterStudio/Editor/ProjectEditor/ProjectEditorUI.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 
 namespace RainmeterStudio.Editor.ProjectEditor
diff --git a/RainmeterStudio/MainClass.cs b/RainmeterStudio/MainClass.cs
index fc6897e9..50a4fb37 100644
--- a/RainmeterStudio/MainClass.cs
+++ b/RainmeterStudio/MainClass.cs
@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text;
 using System.Windows;
 using RainmeterStudio.Business;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 using RainmeterStudio.Core.Storage;
 using RainmeterStudio.Editor.ProjectEditor;
diff --git a/RainmeterStudio/RainmeterStudio.csproj b/RainmeterStudio/RainmeterStudio.csproj
index cc42d387..6bde3587 100644
--- a/RainmeterStudio/RainmeterStudio.csproj
+++ b/RainmeterStudio/RainmeterStudio.csproj
@@ -99,6 +99,7 @@
     <Compile Include="Editor\ProjectEditor\ProjectStorage.cs" />
     <Compile Include="UI\Command.cs" />
     <Compile Include="UI\Controller\IconProvider.cs" />
+    <Compile Include="UI\Controller\IContextMenuProvider.cs" />
     <Compile Include="UI\Controller\ProjectController.cs" />
     <Compile Include="Business\SettingsProvider.cs" />
     <Compile Include="UI\Dialogs\CloseUnsavedDialog.xaml.cs">
diff --git a/RainmeterStudio/UI/Controller/DocumentController.cs b/RainmeterStudio/UI/Controller/DocumentController.cs
index 252ecb14..14fab78b 100644
--- a/RainmeterStudio/UI/Controller/DocumentController.cs
+++ b/RainmeterStudio/UI/Controller/DocumentController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows;
 using System.Linq;
 using RainmeterStudio.Business;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model.Events;
 using RainmeterStudio.UI.Dialogs;
 using RainmeterStudio.UI.ViewModel;
diff --git a/RainmeterStudio/UI/Dialogs/CreateProjectDialog.xaml.cs b/RainmeterStudio/UI/Dialogs/CreateProjectDialog.xaml.cs
index 9d9cc748..4a8304e6 100644
--- a/RainmeterStudio/UI/Dialogs/CreateProjectDialog.xaml.cs
+++ b/RainmeterStudio/UI/Dialogs/CreateProjectDialog.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Microsoft.Win32;
 using RainmeterStudio.Business;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 using RainmeterStudio.Core.Utils;
 using RainmeterStudio.Properties;
diff --git a/RainmeterStudio/UI/MainWindow.xaml.cs b/RainmeterStudio/UI/MainWindow.xaml.cs
index 834b3fa4..7c577af8 100644
--- a/RainmeterStudio/UI/MainWindow.xaml.cs
+++ b/RainmeterStudio/UI/MainWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using RainmeterStudio.Business;
-using RainmeterStudio.Core.Documents;
+using RainmeterStudio.Core.Editor;
 using RainmeterStudio.Core.Model;
 using RainmeterStudio.Core.Model.Events;
 using RainmeterStudio.UI.Controller;