diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Controls/PresentationSlideControl.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/Presentation/Controls/PresentationSlideControl.cs
similarity index 96%
rename from Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Controls/PresentationSlideControl.cs
rename to Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/Presentation/Controls/PresentationSlideControl.cs
index 4c0b95b0..c768d9ed 100644
--- a/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Controls/PresentationSlideControl.cs
+++ b/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/Presentation/Controls/PresentationSlideControl.cs
@@ -25,7 +25,7 @@ using MBS.Framework.UserInterface.Drawing;
 using MBS.Framework.UserInterface.Input.Mouse;
 using UniversalEditor.Plugins.Designer.UserInterface.Editors.Designer.Controls;
 
-namespace UniversalEditor.Plugins.Office.UserInterface.Controls
+namespace UniversalEditor.Plugins.Office.UserInterface.Editors.Presentation.Controls
 {
 	public class PresentationSlideControl : DesignerControl
 	{
diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/PresentationEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/Presentation/PresentationEditor.cs
similarity index 93%
rename from Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/PresentationEditor.cs
rename to Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/Presentation/PresentationEditor.cs
index c08ae271..3a8a28cc 100644
--- a/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/PresentationEditor.cs
+++ b/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/Editors/Presentation/PresentationEditor.cs
@@ -23,10 +23,10 @@ using System;
 using MBS.Framework.UserInterface;
 using MBS.Framework.UserInterface.Layouts;
 using UniversalEditor.Plugins.Office.ObjectModels.Presentation;
-using UniversalEditor.Plugins.Office.UserInterface.Controls;
+using UniversalEditor.Plugins.Office.UserInterface.Editors.Presentation.Controls;
 using UniversalEditor.UserInterface;
 
-namespace UniversalEditor.Plugins.Office.UserInterface.Editors
+namespace UniversalEditor.Plugins.Office.UserInterface.Editors.Presentation
 {
 	public class PresentationEditor : Editor
 	{
diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/UniversalEditor.Plugins.Office.UserInterface.csproj b/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/UniversalEditor.Plugins.Office.UserInterface.csproj
index 9f23a40e..e8b458e9 100644
--- a/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/UniversalEditor.Plugins.Office.UserInterface.csproj
+++ b/Plugins.UserInterface/UniversalEditor.Plugins.Office.UserInterface/UniversalEditor.Plugins.Office.UserInterface.csproj
@@ -32,12 +32,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Editors\PresentationEditor.cs" />
-    <Compile Include="Controls\PresentationSlideControl.cs" />
+    <Compile Include="Editors\Presentation\PresentationEditor.cs" />
+    <Compile Include="Editors\Presentation\Controls\PresentationSlideControl.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Editors\" />
-    <Folder Include="Controls\" />
+    <Folder Include="Editors\Presentation\" />
+    <Folder Include="Editors\Presentation\Controls\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\UniversalEditor.UserInterface\UniversalEditor.UserInterface.csproj">