diff --git a/Demos/SimpleDemo/SimpleDemo.Core/ViewModels/MainViewModel.cs b/Demos/SimpleDemo/SimpleDemo.Core/ViewModels/MainViewModel.cs
index 4cea9580..2c75830b 100644
--- a/Demos/SimpleDemo/SimpleDemo.Core/ViewModels/MainViewModel.cs
+++ b/Demos/SimpleDemo/SimpleDemo.Core/ViewModels/MainViewModel.cs
@@ -18,5 +18,11 @@ public MainViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigati
         }
 
         public ICommand TipCalcCommand => new MvxCommand(() => NavigationService.Navigate<TipViewModel>());
+
+        public ICommand SettingsCommand => new MvxCommand(() =>
+        {
+            IMesSettingsManager settingsManager = Mvx.IoCProvider.Resolve<IMesSettingsManager>();
+            NavigationService.Navigate(settingsManager);
+        });
     }
 }
diff --git a/Demos/SimpleDemo/SimpleDemo.WPF/Views/MainView.xaml b/Demos/SimpleDemo/SimpleDemo.WPF/Views/MainView.xaml
index 8293a4ca..24e99504 100644
--- a/Demos/SimpleDemo/SimpleDemo.WPF/Views/MainView.xaml
+++ b/Demos/SimpleDemo/SimpleDemo.WPF/Views/MainView.xaml
@@ -11,9 +11,15 @@
     d:DesignHeight="450" d:DesignWidth="800">
     <DockPanel>
         <StackPanel DockPanel.Dock="Top" Orientation="Vertical">
-            <Button Content="TipCalc" Command="{Binding TipCalcCommand}" />
-            <!--<ContentControl cal:View.Model="{Binding MainMenu}" />-->
-            <!--<ContentControl cal:View.Model="{Binding ToolBars}" />-->
+            <Menu>
+                <MenuItem Header="Samples">
+                    <MenuItem Header="TipCalc" Command="{Binding TipCalcCommand}" />
+                    <MenuItem Header="Settings" Command="{Binding SettingsCommand}" />
+                </MenuItem>
+            </Menu>
+            <ToolBar>
+                <Button Content="TipCalc" Command="{Binding TipCalcCommand}" />
+            </ToolBar>
         </StackPanel>
 
         <!--<ContentControl DockPanel.Dock="Bottom" cal:View.Model="{Binding StatusBar}" IsTabStop="False" />-->
diff --git a/Modules/MinoriEditorShell/Commands/IMesCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/IMesCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/IMesCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/IMesCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Commands/IMesCommandRerouter.cs b/Modules/MinoriEditorShell.Command/Commands/IMesCommandRerouter.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/IMesCommandRerouter.cs
rename to Modules/MinoriEditorShell.Command/Commands/IMesCommandRerouter.cs
diff --git a/Modules/MinoriEditorShell/Commands/IMesCommandRouter.cs b/Modules/MinoriEditorShell.Command/Commands/IMesCommandRouter.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/IMesCommandRouter.cs
rename to Modules/MinoriEditorShell.Command/Commands/IMesCommandRouter.cs
diff --git a/Modules/MinoriEditorShell/Commands/IMesCommandUiItem.cs b/Modules/MinoriEditorShell.Command/Commands/IMesCommandUiItem.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/IMesCommandUiItem.cs
rename to Modules/MinoriEditorShell.Command/Commands/IMesCommandUiItem.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCloseFileCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesCloseFileCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCloseFileCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCloseFileCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCloseFileCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/MesCloseFileCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCloseFileCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCloseFileCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommand.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommand.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommand.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommand.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommandDefinitionAttribute.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommandDefinitionAttribute.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommandDefinitionAttribute.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommandDefinitionAttribute.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommandDefinitionBase.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommandDefinitionBase.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommandDefinitionBase.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommandDefinitionBase.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommandHandlerAttribute.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommandHandlerAttribute.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommandHandlerAttribute.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommandHandlerAttribute.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommandHandlerWrapper.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommandHandlerWrapper.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommandHandlerWrapper.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommandHandlerWrapper.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesCommandListDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesCommandListDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesCommandListDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesCommandListDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesNewFileCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/MesNewFileCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesNewFileCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesNewFileCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesNewFileCommandListDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesNewFileCommandListDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesNewFileCommandListDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesNewFileCommandListDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesOpenSettingsCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesOpenSettingsCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesOpenSettingsCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesOpenSettingsCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesOpenSettingsCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/MesOpenSettingsCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesOpenSettingsCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesOpenSettingsCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesSaveFileAsCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesSaveFileAsCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesSaveFileAsCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesSaveFileAsCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesSwitchToDocumentCommandListDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesSwitchToDocumentCommandListDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesSwitchToDocumentCommandListDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesSwitchToDocumentCommandListDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesSwitchToDocumentListCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/MesSwitchToDocumentListCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesSwitchToDocumentListCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesSwitchToDocumentListCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesViewHistoryCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesViewHistoryCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesViewHistoryCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesViewHistoryCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesViewHistoryCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/MesViewHistoryCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesViewHistoryCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesViewHistoryCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesViewToolboxCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Commands/MesViewToolboxCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesViewToolboxCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesViewToolboxCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Commands/MesViewToolboxCommandHandler.cs b/Modules/MinoriEditorShell.Command/Commands/MesViewToolboxCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Commands/MesViewToolboxCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Commands/MesViewToolboxCommandHandler.cs
diff --git a/Modules/MinoriEditorShell.Command/MinoriEditorShell.Command.csproj b/Modules/MinoriEditorShell.Command/MinoriEditorShell.Command.csproj
new file mode 100644
index 00000000..c99f6ebd
--- /dev/null
+++ b/Modules/MinoriEditorShell.Command/MinoriEditorShell.Command.csproj
@@ -0,0 +1,105 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+        <Description>
+            MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell.
+            It uses AvalonDock and has an MVVM architecture based on MvvmCross.
+        </Description>
+        <Copyright>Copyright 2019</Copyright>
+        <PackageProjectUrl>https://github.com/TorisanKitsune/MinoriEditorShell</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/TorisanKitsune/MinoriEditorShell</RepositoryUrl>
+        <PackageIconUrl></PackageIconUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>.net40 WPF MvvmCross AvalonDock Visual Studio IDE Shell</PackageTags>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Authors>Mark Kromis</Authors>
+        <Company>Mark Kromis</Company>
+        <PackageLicenseExpression></PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Remove="Platforms\**\*.cs" />
+        <None Include="Platforms\**\*" />
+        <None Remove="Platforms\Wpf\Themes\MesThemeBase.cs" />
+
+        <PackageReference Include="MvvmCross" Version="6.4.1" />
+        <PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.4.1" />
+        <PackageReference Include="GitVersionTask" Version="5.0.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="MvvmCross.Plugin.ResxLocalization" Version="6.4.1" />
+        <PackageReference Include="System.ComponentModel.Composition" Version="4.6.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+        <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+        <Compile Include="Platforms\NetStandard\**\*.cs" />
+
+        <PackageReference Include="System.ComponentModel" Version="4.3.0" />
+        <!--<PackageReference Include="System.ComponentModel.Composition" Version="4.6.0" />-->
+        <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
+        <Page Include="Platforms\Wpf\**\*.xaml">
+            <Generator>MSBuild:Compile</Generator>
+        </Page>
+        <Compile Include="Platforms\Wpf\**\*.cs" />
+
+        <PackageReference Include="Dirkster.AvalonDock" Version="3.6.0" />
+        <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="3.6.0" />
+        <PackageReference Include="MahApps.Metro" Version="1.6.5" />
+        <PackageReference Include="MvvmCross.Platforms.Wpf" Version="6.4.1" />
+        <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+
+        <Reference Include="PresentationCore" />
+        <Reference Include="PresentationFramework" />
+        <!--<Reference Include="System.ComponentModel.Composition" />-->
+        <Reference Include="System.Drawing" />
+        <Reference Include="System.Xaml" />
+        <Reference Include="WindowsBase" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\MinoriEditorShell\MinoriEditorShell.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="Properties\Settings.settings">
+            <Generator>SettingsSingleFileGenerator</Generator>
+            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+        </None>
+        <Compile Update="Properties\Settings.Designer.cs">
+            <DesignTimeSharedInput>True</DesignTimeSharedInput>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <EmbeddedResource Update="Properties\Resources.de.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.ko.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>PublicResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.ru.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.zh-Hans.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+    </ItemGroup>
+</Project>
diff --git a/Modules/MinoriEditorShell/Models/MesMenuItemBase.cs b/Modules/MinoriEditorShell.Command/Models/MesMenuItemBase.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesMenuItemBase.cs
rename to Modules/MinoriEditorShell.Command/Models/MesMenuItemBase.cs
diff --git a/Modules/MinoriEditorShell/Models/MesMenuItemSeparator.cs b/Modules/MinoriEditorShell.Command/Models/MesMenuItemSeparator.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesMenuItemSeparator.cs
rename to Modules/MinoriEditorShell.Command/Models/MesMenuItemSeparator.cs
diff --git a/Modules/MinoriEditorShell/Models/MesMenuModel.cs b/Modules/MinoriEditorShell.Command/Models/MesMenuModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesMenuModel.cs
rename to Modules/MinoriEditorShell.Command/Models/MesMenuModel.cs
diff --git a/Modules/MinoriEditorShell/Models/MesStandardMenuItem.cs b/Modules/MinoriEditorShell.Command/Models/MesStandardMenuItem.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesStandardMenuItem.cs
rename to Modules/MinoriEditorShell.Command/Models/MesStandardMenuItem.cs
diff --git a/Modules/MinoriEditorShell/Models/MesToolBarItemBase.cs b/Modules/MinoriEditorShell.Command/Models/MesToolBarItemBase.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesToolBarItemBase.cs
rename to Modules/MinoriEditorShell.Command/Models/MesToolBarItemBase.cs
diff --git a/Modules/MinoriEditorShell/Models/MesToolBarItemSeparator.cs b/Modules/MinoriEditorShell.Command/Models/MesToolBarItemSeparator.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesToolBarItemSeparator.cs
rename to Modules/MinoriEditorShell.Command/Models/MesToolBarItemSeparator.cs
diff --git a/Modules/MinoriEditorShell/Models/MesToolBarModel.cs b/Modules/MinoriEditorShell.Command/Models/MesToolBarModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesToolBarModel.cs
rename to Modules/MinoriEditorShell.Command/Models/MesToolBarModel.cs
diff --git a/Modules/MinoriEditorShell/Models/MesToolboxItem.cs b/Modules/MinoriEditorShell.Command/Models/MesToolboxItem.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Models/MesToolboxItem.cs
rename to Modules/MinoriEditorShell.Command/Models/MesToolboxItem.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Behaviors/MesMenuBehavior.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Behaviors/MesMenuBehavior.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Behaviors/MesMenuBehavior.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Behaviors/MesMenuBehavior.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/IMesCommandKeyGestureService.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/IMesCommandKeyGestureService.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/IMesCommandKeyGestureService.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/IMesCommandKeyGestureService.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesCommandKeyGestureService.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesCommandKeyGestureService.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesCommandKeyGestureService.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesCommandKeyGestureService.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesCommandKeyboardShortcut.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesCommandKeyboardShortcut.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesCommandKeyboardShortcut.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesCommandKeyboardShortcut.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesCommandRouter.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesCommandRouter.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesCommandRouter.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesCommandRouter.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesExcludeCommandKeyboardShortcut.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesExcludeCommandKeyboardShortcut.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesExcludeCommandKeyboardShortcut.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesExcludeCommandKeyboardShortcut.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesExitCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesExitCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesExitCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesExitCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesExitCommandHandler.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesExitCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesExitCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesExitCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesOpenFileCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesOpenFileCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesOpenFileCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesOpenFileCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesOpenFileCommandHandler.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesOpenFileCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesOpenFileCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesOpenFileCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesRedoCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesRedoCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesRedoCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesRedoCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesSaveAllFilesCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesSaveAllFilesCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesSaveAllFilesCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesSaveAllFilesCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesSaveAllFilesCommandHandler.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesSaveAllFilesCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesSaveAllFilesCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesSaveAllFilesCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesSaveFileCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesSaveFileCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesSaveFileCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesSaveFileCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesShellMenuDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesShellMenuDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesShellMenuDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesShellMenuDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesTargetableCommand.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesTargetableCommand.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesTargetableCommand.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesTargetableCommand.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesToolBarDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesToolBarDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesToolBarDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesToolBarDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesUndoCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesUndoCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesUndoCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesUndoCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesViewFullscreenCommandDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesViewFullscreenCommandDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesViewFullscreenCommandDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesViewFullscreenCommandDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesViewFullscreenCommandHandler.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesViewFullscreenCommandHandler.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Commands/MesViewFullscreenCommandHandler.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Commands/MesViewFullscreenCommandHandler.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesMainToolBar.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesMainToolBar.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesMainToolBar.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesMainToolBar.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesMenuEx.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesMenuEx.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesMenuEx.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesMenuEx.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesMenuItemEx.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesMenuItemEx.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesMenuItemEx.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesMenuItemEx.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesToolBarBase.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesToolBarBase.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesToolBarBase.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesToolBarBase.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesToolBarTrayContainer.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesToolBarTrayContainer.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesToolBarTrayContainer.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesToolBarTrayContainer.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesToolPaneToolBar.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesToolPaneToolBar.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Controls/MesToolPaneToolBar.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Controls/MesToolPaneToolBar.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Design/MesDesignTimeToolboxViewModel.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Design/MesDesignTimeToolboxViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Design/MesDesignTimeToolboxViewModel.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Design/MesDesignTimeToolboxViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesExcludeMenuDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesExcludeMenuDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesExcludeMenuDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesExcludeMenuDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemGroupDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemGroupDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemGroupDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesExcludeMenuItemGroupDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuBarDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuBarDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuBarDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuBarDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuDefinitionsCollection.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuDefinitionsCollection.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuDefinitionsCollection.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuDefinitionsCollection.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuItemGroupDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuItemGroupDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuItemGroupDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuItemGroupDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuToolBoxDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuToolBoxDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuToolBoxDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuToolBoxDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuUndoDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuUndoDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesMenuUndoDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesMenuUndoDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesSettingsMenuDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesSettingsMenuDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesSettingsMenuDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesSettingsMenuDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesToolBarDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesToolBarDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesToolBarDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesToolBarDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesUndoToolBarDefinitions.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesUndoToolBarDefinitions.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/MenuDefinitions/MesUndoToolBarDefinitions.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/MenuDefinitions/MesUndoToolBarDefinitions.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesCommandMenuItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesCommandMenuItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesCommandMenuItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesCommandMenuItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesMenuDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesMenuDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesMenuDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesMenuDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesMenuDefinitionBase.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesMenuDefinitionBase.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesMenuDefinitionBase.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesMenuDefinitionBase.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesTextMenuItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesTextMenuItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Menus/MesTextMenuItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Menus/MesTextMenuItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Models/MesCommandMenuItem.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Models/MesCommandMenuItem.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Models/MesCommandMenuItem.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Models/MesCommandMenuItem.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Models/MesCommandToolBarItem.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Models/MesCommandToolBarItem.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Models/MesCommandToolBarItem.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Models/MesCommandToolBarItem.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Models/MesTextMenuItem.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Models/MesTextMenuItem.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Models/MesTextMenuItem.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Models/MesTextMenuItem.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Results/MesOpenDocumentResult.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Results/MesOpenDocumentResult.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Results/MesOpenDocumentResult.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Results/MesOpenDocumentResult.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesCommandService.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesCommandService.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesCommandService.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesCommandService.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesMenuBuilder.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesMenuBuilder.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesMenuBuilder.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesMenuBuilder.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesToolBarBuilder.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesToolBarBuilder.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesToolBarBuilder.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesToolBarBuilder.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesToolBarView.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesToolBarView.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/IMesToolBarView.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/IMesToolBarView.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/MesCommandService.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/MesCommandService.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/MesCommandService.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/MesCommandService.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/MesMenuBuilder.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/MesMenuBuilder.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/MesMenuBuilder.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/MesMenuBuilder.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Services/MesToolBarBuilder.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/MesToolBarBuilder.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Services/MesToolBarBuilder.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Services/MesToolBarBuilder.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesCommandToolBarItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesCommandToolBarItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesCommandToolBarItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesCommandToolBarItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesExcludeToolBarDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesExcludeToolBarDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesExcludeToolBarDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesExcludeToolBarDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesExcludeToolBarItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesExcludeToolBarItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesExcludeToolBarItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesExcludeToolBarItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesExcludeToolBarItemGroupDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesExcludeToolBarItemGroupDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesExcludeToolBarItemGroupDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesExcludeToolBarItemGroupDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesToolBarDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesToolBarDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesToolBarDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesToolBarDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesToolBarItemDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesToolBarItemDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesToolBarItemDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesToolBarItemDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesToolBarItemGroupDefinition.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesToolBarItemGroupDefinition.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ToolBars/MesToolBarItemGroupDefinition.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ToolBars/MesToolBarItemGroupDefinition.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesMainMenuViewModel.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesMainMenuViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesMainMenuViewModel.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesMainMenuViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesToolBarsViewModel.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesToolBarsViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesToolBarsViewModel.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesToolBarsViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesToolboxItemViewModel.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesToolboxItemViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesToolboxItemViewModel.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesToolboxItemViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesToolboxViewModel.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesToolboxViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesToolboxViewModel.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/ViewModels/MesToolboxViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuSettingsView.xaml.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuView.xaml b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuView.xaml
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuView.xaml
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuView.xaml
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuView.xaml.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuView.xaml.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesMainMenuView.xaml.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesMainMenuView.xaml.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolBarsView.xaml b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolBarsView.xaml
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolBarsView.xaml
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolBarsView.xaml
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolBarsView.xaml.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolBarsView.xaml.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolBarsView.xaml.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolBarsView.xaml.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolboxView.xaml b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolboxView.xaml
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolboxView.xaml
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolboxView.xaml
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolboxView.xaml.cs b/Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolboxView.xaml.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesToolboxView.xaml.cs
rename to Modules/MinoriEditorShell.Command/Platforms/Wpf/Views/MesToolboxView.xaml.cs
diff --git a/Modules/MinoriEditorShell/Resources/Icons/FullScreen.png b/Modules/MinoriEditorShell.Command/Resources/Icons/FullScreen.png
similarity index 100%
rename from Modules/MinoriEditorShell/Resources/Icons/FullScreen.png
rename to Modules/MinoriEditorShell.Command/Resources/Icons/FullScreen.png
diff --git a/Modules/MinoriEditorShell/Resources/Icons/Open.png b/Modules/MinoriEditorShell.Command/Resources/Icons/Open.png
similarity index 100%
rename from Modules/MinoriEditorShell/Resources/Icons/Open.png
rename to Modules/MinoriEditorShell.Command/Resources/Icons/Open.png
diff --git a/Modules/MinoriEditorShell/Resources/Icons/Save.png b/Modules/MinoriEditorShell.Command/Resources/Icons/Save.png
similarity index 100%
rename from Modules/MinoriEditorShell/Resources/Icons/Save.png
rename to Modules/MinoriEditorShell.Command/Resources/Icons/Save.png
diff --git a/Modules/MinoriEditorShell/Resources/Icons/SaveAll.png b/Modules/MinoriEditorShell.Command/Resources/Icons/SaveAll.png
similarity index 100%
rename from Modules/MinoriEditorShell/Resources/Icons/SaveAll.png
rename to Modules/MinoriEditorShell.Command/Resources/Icons/SaveAll.png
diff --git a/Modules/MinoriEditorShell/Services/IMesMenu.cs b/Modules/MinoriEditorShell.Command/Services/IMesMenu.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesMenu.cs
rename to Modules/MinoriEditorShell.Command/Services/IMesMenu.cs
diff --git a/Modules/MinoriEditorShell/Services/IMesToolBar.cs b/Modules/MinoriEditorShell.Command/Services/IMesToolBar.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesToolBar.cs
rename to Modules/MinoriEditorShell.Command/Services/IMesToolBar.cs
diff --git a/Modules/MinoriEditorShell/Services/IMesToolBars.cs b/Modules/MinoriEditorShell.Command/Services/IMesToolBars.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesToolBars.cs
rename to Modules/MinoriEditorShell.Command/Services/IMesToolBars.cs
diff --git a/Modules/MinoriEditorShell/Services/IMesToolbox.cs b/Modules/MinoriEditorShell.Command/Services/IMesToolbox.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesToolbox.cs
rename to Modules/MinoriEditorShell.Command/Services/IMesToolbox.cs
diff --git a/Modules/MinoriEditorShell/Services/IMesToolboxService.cs b/Modules/MinoriEditorShell.Command/Services/IMesToolboxService.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesToolboxService.cs
rename to Modules/MinoriEditorShell.Command/Services/IMesToolboxService.cs
diff --git a/Modules/MinoriEditorShell/Services/MesToolboxDragDrop.cs b/Modules/MinoriEditorShell.Command/Services/MesToolboxDragDrop.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/MesToolboxDragDrop.cs
rename to Modules/MinoriEditorShell.Command/Services/MesToolboxDragDrop.cs
diff --git a/Modules/MinoriEditorShell/Services/MesToolboxItemAttribute.cs b/Modules/MinoriEditorShell.Command/Services/MesToolboxItemAttribute.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/MesToolboxItemAttribute.cs
rename to Modules/MinoriEditorShell.Command/Services/MesToolboxItemAttribute.cs
diff --git a/Modules/MinoriEditorShell/Services/MesToolboxService.cs b/Modules/MinoriEditorShell.Command/Services/MesToolboxService.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/MesToolboxService.cs
rename to Modules/MinoriEditorShell.Command/Services/MesToolboxService.cs
diff --git a/Modules/MinoriEditorShell/ViewModels/MesMainMenuSettingsViewModel.cs b/Modules/MinoriEditorShell.Command/ViewModels/MesMainMenuSettingsViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/ViewModels/MesMainMenuSettingsViewModel.cs
rename to Modules/MinoriEditorShell.Command/ViewModels/MesMainMenuSettingsViewModel.cs
diff --git a/Modules/MinoriEditorShell/app.config b/Modules/MinoriEditorShell.Command/app.config
similarity index 100%
rename from Modules/MinoriEditorShell/app.config
rename to Modules/MinoriEditorShell.Command/app.config
diff --git a/Modules/MinoriEditorShell.History/MinoriEditorShell.History.csproj b/Modules/MinoriEditorShell.History/MinoriEditorShell.History.csproj
new file mode 100644
index 00000000..c6cb2eed
--- /dev/null
+++ b/Modules/MinoriEditorShell.History/MinoriEditorShell.History.csproj
@@ -0,0 +1,101 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+        <Description>
+            MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell.
+            It uses AvalonDock and has an MVVM architecture based on MvvmCross.
+        </Description>
+        <Copyright>Copyright 2019</Copyright>
+        <PackageProjectUrl>https://github.com/TorisanKitsune/MinoriEditorShell</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/TorisanKitsune/MinoriEditorShell</RepositoryUrl>
+        <PackageIconUrl></PackageIconUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>.net40 WPF MvvmCross AvalonDock Visual Studio IDE Shell</PackageTags>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Authors>Mark Kromis</Authors>
+        <Company>Mark Kromis</Company>
+        <PackageLicenseExpression></PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Remove="Platforms\**\*.cs" />
+        <None Include="Platforms\**\*" />
+        <None Remove="Platforms\Wpf\Themes\MesThemeBase.cs" />
+
+        <PackageReference Include="MvvmCross" Version="6.4.1" />
+        <PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.4.1" />
+        <PackageReference Include="GitVersionTask" Version="5.0.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="MvvmCross.Plugin.ResxLocalization" Version="6.4.1" />
+        <PackageReference Include="System.ComponentModel.Composition" Version="4.6.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+        <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+        <Compile Include="Platforms\NetStandard\**\*.cs" />
+
+        <PackageReference Include="System.ComponentModel" Version="4.3.0" />
+        <!--<PackageReference Include="System.ComponentModel.Composition" Version="4.6.0" />-->
+        <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
+        <Page Include="Platforms\Wpf\**\*.xaml">
+            <Generator>MSBuild:Compile</Generator>
+        </Page>
+        <Compile Include="Platforms\Wpf\**\*.cs" />
+
+        <PackageReference Include="Dirkster.AvalonDock" Version="3.6.0" />
+        <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="3.6.0" />
+        <PackageReference Include="MahApps.Metro" Version="1.6.5" />
+        <PackageReference Include="MvvmCross.Platforms.Wpf" Version="6.4.1" />
+        <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+
+        <Reference Include="PresentationCore" />
+        <Reference Include="PresentationFramework" />
+        <!--<Reference Include="System.ComponentModel.Composition" />-->
+        <Reference Include="System.Drawing" />
+        <Reference Include="System.Xaml" />
+        <Reference Include="WindowsBase" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="Properties\Settings.settings">
+            <Generator>SettingsSingleFileGenerator</Generator>
+            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+        </None>
+        <Compile Update="Properties\Settings.Designer.cs">
+            <DesignTimeSharedInput>True</DesignTimeSharedInput>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <EmbeddedResource Update="Properties\Resources.de.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.ko.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>PublicResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.ru.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.zh-Hans.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+    </ItemGroup>
+</Project>
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Design/MesDesignTimeHistoryViewModel.cs b/Modules/MinoriEditorShell.History/Platforms/Wpf/Design/MesDesignTimeHistoryViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Design/MesDesignTimeHistoryViewModel.cs
rename to Modules/MinoriEditorShell.History/Platforms/Wpf/Design/MesDesignTimeHistoryViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesHistoryViewModel.cs b/Modules/MinoriEditorShell.History/Platforms/Wpf/ViewModels/MesHistoryViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/ViewModels/MesHistoryViewModel.cs
rename to Modules/MinoriEditorShell.History/Platforms/Wpf/ViewModels/MesHistoryViewModel.cs
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesHistoryView.xaml b/Modules/MinoriEditorShell.History/Platforms/Wpf/Views/MesHistoryView.xaml
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesHistoryView.xaml
rename to Modules/MinoriEditorShell.History/Platforms/Wpf/Views/MesHistoryView.xaml
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesHistoryView.xaml.cs b/Modules/MinoriEditorShell.History/Platforms/Wpf/Views/MesHistoryView.xaml.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Views/MesHistoryView.xaml.cs
rename to Modules/MinoriEditorShell.History/Platforms/Wpf/Views/MesHistoryView.xaml.cs
diff --git a/Modules/MinoriEditorShell/Resources/Icons/Redo.png b/Modules/MinoriEditorShell.History/Resources/Icons/Redo.png
similarity index 100%
rename from Modules/MinoriEditorShell/Resources/Icons/Redo.png
rename to Modules/MinoriEditorShell.History/Resources/Icons/Redo.png
diff --git a/Modules/MinoriEditorShell/Resources/Icons/Undo.png b/Modules/MinoriEditorShell.History/Resources/Icons/Undo.png
similarity index 100%
rename from Modules/MinoriEditorShell/Resources/Icons/Undo.png
rename to Modules/MinoriEditorShell.History/Resources/Icons/Undo.png
diff --git a/Modules/MinoriEditorShell/Services/IMesHistoryTool.cs b/Modules/MinoriEditorShell.History/Services/IMesHistoryTool.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesHistoryTool.cs
rename to Modules/MinoriEditorShell.History/Services/IMesHistoryTool.cs
diff --git a/Modules/MinoriEditorShell/Services/IMesUndoRedoManager.cs b/Modules/MinoriEditorShell.History/Services/IMesUndoRedoManager.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesUndoRedoManager.cs
rename to Modules/MinoriEditorShell.History/Services/IMesUndoRedoManager.cs
diff --git a/Modules/MinoriEditorShell/Services/IMesUndoableAction.cs b/Modules/MinoriEditorShell.History/Services/IMesUndoableAction.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/IMesUndoableAction.cs
rename to Modules/MinoriEditorShell.History/Services/IMesUndoableAction.cs
diff --git a/Modules/MinoriEditorShell/Services/MesUndoRedoManager.cs b/Modules/MinoriEditorShell.History/Services/MesUndoRedoManager.cs
similarity index 100%
rename from Modules/MinoriEditorShell/Services/MesUndoRedoManager.cs
rename to Modules/MinoriEditorShell.History/Services/MesUndoRedoManager.cs
diff --git a/Modules/MinoriEditorShell/ViewModels/MesHistoryItemType.cs b/Modules/MinoriEditorShell.History/ViewModels/MesHistoryItemType.cs
similarity index 100%
rename from Modules/MinoriEditorShell/ViewModels/MesHistoryItemType.cs
rename to Modules/MinoriEditorShell.History/ViewModels/MesHistoryItemType.cs
diff --git a/Modules/MinoriEditorShell/ViewModels/MesHistoryItemViewModel.cs b/Modules/MinoriEditorShell.History/ViewModels/MesHistoryItemViewModel.cs
similarity index 100%
rename from Modules/MinoriEditorShell/ViewModels/MesHistoryItemViewModel.cs
rename to Modules/MinoriEditorShell.History/ViewModels/MesHistoryItemViewModel.cs
diff --git a/Modules/MinoriEditorShell.Ribbon/Platforms/Wpf/Views/MesRibbonWindow.cs b/Modules/MinoriEditorShell.Ribbon/Platforms/Wpf/Views/MesRibbonWindow.cs
index 9fcb1468..2fb7f5d4 100644
--- a/Modules/MinoriEditorShell.Ribbon/Platforms/Wpf/Views/MesRibbonWindow.cs
+++ b/Modules/MinoriEditorShell.Ribbon/Platforms/Wpf/Views/MesRibbonWindow.cs
@@ -13,7 +13,7 @@
 
 namespace MinoriEditorShell.Ribbon.Platforms.Wpf.Views
 {
-    public class MesRibbonWindow : MesWindow, IMvxWindow, IMvxWpfView, IRibbonWindow, IDisposable
+    public class MesRibbonWindow : MesWindow, IMvxWindow, IMvxWpfView, IRibbonWindow
     {
         #region TitelBar
         /// <summary>
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Core/MesWpfSetup.cs b/Modules/MinoriEditorShell/Platforms/Wpf/Core/MesWpfSetup.cs
index e092b84c..61798d70 100644
--- a/Modules/MinoriEditorShell/Platforms/Wpf/Core/MesWpfSetup.cs
+++ b/Modules/MinoriEditorShell/Platforms/Wpf/Core/MesWpfSetup.cs
@@ -55,7 +55,8 @@ protected override IDictionary<Type, Type> InitializeLookupDictionary()
             IMvxViewsContainer container = Mvx.IoCProvider.Resolve<IMvxViewsContainer>();
             if (container != null)
             {
-                container.Add<MesMainMenuSettingsViewModel, MesMainMenuSettingsView>();
+#warning MesMainMenuSettingsView
+                //container.Add<MesMainMenuSettingsViewModel, MesMainMenuSettingsView>();
                 container.Add<MesSettingsViewModel, MesSettingsView>();
             }
 
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesWindow.cs b/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesWindow.cs
index a87be9a1..ee991fb4 100644
--- a/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesWindow.cs
+++ b/Modules/MinoriEditorShell/Platforms/Wpf/Views/MesWindow.cs
@@ -12,7 +12,7 @@
 
 namespace MinoriEditorShell.Platforms.Wpf.Views
 {
-    public class MesWindow : MetroWindow, IMesWindow, IMvxWindow, IMvxWpfView, IDisposable
+    public class MesWindow : MetroWindow, IMesWindow, IMvxWindow, IMvxWpfView
     {
         private IMvxViewModel _viewModel;
         private IMvxBindingContext _bindingContext;
@@ -71,6 +71,12 @@ private void MesWindow_Initialized(Object sender, EventArgs e)
 
                 // Init mes setup
                 Mvx.IoCProvider.Resolve<IMesThemeManager>();
+
+#warning fix style
+                //WindowCloseButtonStyle = Application.Current.Resources.MergedDictionaries
+                //WindowCloseButtonStyle = "{DynamicResource MetroWindowButtonStyle}"
+                //WindowMinButtonStyle = "{DynamicResource MetroWindowButtonStyle}"
+                //WindowMaxButtonStyle = "{DynamicResource MetroWindowButtonStyle}"
             }
         }
 
@@ -91,31 +97,9 @@ private void MesWindow_Loaded(Object sender, RoutedEventArgs e)
             ViewModel?.ViewAppearing();
             ViewModel?.ViewAppeared();
         }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        ~MesWindow()
-        {
-            Dispose(false);
-        }
-
-        protected virtual void Dispose(Boolean disposing)
-        {
-            if (disposing)
-            {
-                Unloaded -= MesWindow_Unloaded;
-                Loaded -= MesWindow_Loaded;
-            }
-        }
     }
 
-    public class MesWindow<TViewModel>
-        : MesWindow
-          , IMvxWpfView<TViewModel> where TViewModel : class, IMvxViewModel
+    public class MesWindow<TViewModel> : MesWindow, IMvxWpfView<TViewModel> where TViewModel : class, IMvxViewModel
     {
         public new TViewModel ViewModel
         {
diff --git a/Modules/MinoriEditorShell/Resources/Icons/Gemini-32.png b/Modules/MinoriEditorShell/Resources/Icons/Gemini-32.png
deleted file mode 100644
index bd7d1e0a..00000000
Binary files a/Modules/MinoriEditorShell/Resources/Icons/Gemini-32.png and /dev/null differ
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Results/MesShow.cs b/Modules/MinoriEditorShell/Results/MesShow.cs
similarity index 71%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Results/MesShow.cs
rename to Modules/MinoriEditorShell/Results/MesShow.cs
index 5845bad5..cfc956ac 100644
--- a/Modules/MinoriEditorShell/Platforms/Wpf/Results/MesShow.cs
+++ b/Modules/MinoriEditorShell/Results/MesShow.cs
@@ -7,7 +7,8 @@ namespace MinoriEditorShell.Platforms.Wpf.Results
 {
 	public static class MesShow
 	{
-        public static MesShowCommonDialogResult CommonDialog(CommonDialog commonDialog) => new MesShowCommonDialogResult(commonDialog);
+#warning fix common dialog
+        //public static MesShowCommonDialogResult CommonDialog(CommonDialog commonDialog) => new MesShowCommonDialogResult(commonDialog);
 
         public static MesShowToolResult<TTool> Tool<TTool>()
             where TTool : IMesTool => new MesShowToolResult<TTool>();
@@ -15,14 +16,14 @@ public static MesShowToolResult<TTool> Tool<TTool>()
         public static MesShowToolResult<TTool> Tool<TTool>(TTool tool)
             where TTool : IMesTool => new MesShowToolResult<TTool>(tool);
 
-        public static MesOpenDocumentResult Document(IMesDocument document) => new MesOpenDocumentResult(document);
+#warning IWindow
+#if false
+        //public static MesOpenDocumentResult Document(IMesDocument document) => new MesOpenDocumentResult(document);
 
-        public static MesOpenDocumentResult Document(String path) => new MesOpenDocumentResult(path);
+        //public static MesOpenDocumentResult Document(String path) => new MesOpenDocumentResult(path);
 
-        public static MesOpenDocumentResult Document<T>() where T : IMesDocument => new MesOpenDocumentResult(typeof(T));
+        //public static MesOpenDocumentResult Document<T>() where T : IMesDocument => new MesOpenDocumentResult(typeof(T));
 
-#warning IWindow
-#if false
         public static ShowWindowResult<TWindow> Window<TWindow>()
                 where TWindow : IWindow
         {
diff --git a/Modules/MinoriEditorShell/Platforms/Wpf/Results/MesShowCommonDialogResult.cs b/Modules/MinoriEditorShell/Results/MesShowCommonDialogResult.cs
similarity index 75%
rename from Modules/MinoriEditorShell/Platforms/Wpf/Results/MesShowCommonDialogResult.cs
rename to Modules/MinoriEditorShell/Results/MesShowCommonDialogResult.cs
index 58fef016..f7643f02 100644
--- a/Modules/MinoriEditorShell/Platforms/Wpf/Results/MesShowCommonDialogResult.cs
+++ b/Modules/MinoriEditorShell/Results/MesShowCommonDialogResult.cs
@@ -9,12 +9,13 @@ public class MesShowCommonDialogResult /*: IResult*/
 #warning ResultCompletionEventArgs
         public event EventHandler</*ResultCompletionEventArgs*/ Object> Completed;
 
-		private readonly CommonDialog _commonDialog;
+#warning fix commmon dialog
+        //private readonly CommonDialog _commonDialog;
 
-		public MesShowCommonDialogResult(CommonDialog commonDialog)
-		{
-			_commonDialog = commonDialog;
-		}
+  //      public MesShowCommonDialogResult(CommonDialog commonDialog)
+		//{
+		//	_commonDialog = commonDialog;
+		//}
 
 #warning CoroutineExecutionContext
         public void Execute(/*CoroutineExecutionContext*/Object context)
diff --git a/Modules/MinoriEditorShell/Services/IMesDocument.cs b/Modules/MinoriEditorShell/Services/IMesDocument.cs
index 6226c027..378850b4 100644
--- a/Modules/MinoriEditorShell/Services/IMesDocument.cs
+++ b/Modules/MinoriEditorShell/Services/IMesDocument.cs
@@ -7,7 +7,7 @@ public interface IMesDocument : IMesLayoutItem
 	{
         String DisplayName { get; }
         IMvxView View { get; set; }
-        IMesUndoRedoManager UndoRedoManager { get; }
+        //IMesUndoRedoManager UndoRedoManager { get; }
         Boolean CanClose { get; }
 	}
 }
diff --git a/Modules/MinoriEditorShell/Services/MesDocument.cs b/Modules/MinoriEditorShell/Services/MesDocument.cs
index 064c1e15..cbb6f48d 100644
--- a/Modules/MinoriEditorShell/Services/MesDocument.cs
+++ b/Modules/MinoriEditorShell/Services/MesDocument.cs
@@ -13,8 +13,8 @@ public abstract class MesDocument : MesLayoutItemBase, IMesDocument
         //ICommandHandler<SaveFileCommandDefinition>,
         //ICommandHandler<SaveFileAsCommandDefinition>
 	{
-	    private IMesUndoRedoManager _undoRedoManager;
-        public IMesUndoRedoManager UndoRedoManager => _undoRedoManager ?? (_undoRedoManager = new MesUndoRedoManager());
+	    //private IMesUndoRedoManager _undoRedoManager;
+        //public IMesUndoRedoManager UndoRedoManager => _undoRedoManager ?? (_undoRedoManager = new MesUndoRedoManager());
 
         /// <summary>
         /// Sets weather a document can be closed by close button
diff --git a/README.md b/README.md
index 3faf0bca..143a925d 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,12 @@ Dual-Licensed with either
 [![Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/blob/master/LICENCE.txt) or
 [![MS-PL](https://img.shields.io/badge/license-MsPL-blue.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/blob/master/LICENCE.txt)
 
+## Breaking Changes
+
+The goal is to minimize the main library into a more consice library. Thus the following changes will/have been made.
+* Command interface was moved to MinoriEditorShell.Command -- This is currently un-tested and no nuget yet.
+* Undo - Redo interface was moved to MinoriEditorShell.History -- This is currently un-tested and no nuget yet.
+
 ## What is this
 
 MinoriEditorShell is a IDE framework designed specifically for building multi document editor applications with MvvmCross. It builds on some excellent libraries: