diff --git a/.idea/.idea.MaterialModernWPF/.idea/.name b/.idea/.idea.MaterialModernWPF/.idea/.name
new file mode 100644
index 0000000..aebbaf0
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/.name
@@ -0,0 +1 @@
+MaterialModernWPF
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/.idea/contentModel.xml b/.idea/.idea.MaterialModernWPF/.idea/contentModel.xml
new file mode 100644
index 0000000..11d19d4
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/contentModel.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelStore">
+    <e p="C:\Users\Holger\.Rider2019.3\system\extResources" t="IncludeRecursive" />
+    <e p="C:\Users\Holger\.Rider2019.3\system\resharper-host\local\Transient\ReSharperHost\v193\SolutionCaches\_MaterialModernWPF.1989627200.00" t="ExcludeRecursive" />
+    <e p="C:\Users\Holger\.Rider2019.3\system\rust_expanded_macros\hUbvpVeY\expansions" t="IncludeRecursive" />
+    <e p="C:\Users\Holger\Desktop\MaterialModernGUI" t="IncludeFlat">
+      <e p="MaterialModernWPF.sln" t="IncludeFlat" />
+      <e p="packages" t="ExcludeRecursive" />
+      <e p="src" t="IncludeRecursive">
+        <e p="airballoon.ico" t="Include" />
+        <e p="App.xaml" t="Include" />
+        <e p="App.xaml.cs" t="Include" />
+        <e p="AssemblyInfo.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="Constants.cs" t="Include" />
+        <e p="MaterialModernWPF.csproj" t="IncludeRecursive" />
+        <e p="MaterialWindow.cs" t="Include" />
+        <e p="Module" t="Include">
+          <e p="MainModule.cs" t="Include" />
+          <e p="MainView.xaml" t="Include" />
+          <e p="MainView.xaml.cs" t="Include" />
+          <e p="MainViewModel.cs" t="Include" />
+        </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.1" t="Include">
+              <e p="App.g.cs" t="Include" />
+              <e p="GeneratedInternalTypeHelper.g.cs" t="Include" />
+              <e p="MaterialModernWPF.AssemblyInfo.cs" t="Include" />
+              <e p="Module" t="Include">
+                <e p="MainView.g.cs" t="Include" />
+              </e>
+              <e p="Service" t="Include">
+                <e p="DetailedGeometryView.g.cs" t="Include" />
+              </e>
+              <e p="View" t="Include">
+                <e p="InfoDialog.g.cs" t="Include" />
+                <e p="Shell.g.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
+        <e p="Service" t="Include">
+          <e p="AdditionalMoments.cs" t="Include" />
+          <e p="CalculationPackage.cs" t="Include" />
+          <e p="CalculationPackageContainer.cs" t="Include" />
+          <e p="CalculationPackageSelectionChangedEvent.cs" t="Include" />
+          <e p="DetailedGeometryPackage.cs" t="Include" />
+          <e p="DetailedGeometryView.xaml" t="Include" />
+          <e p="DetailedGeometryView.xaml.cs" t="Include" />
+        </e>
+        <e p="View" t="Include">
+          <e p="InfoDialog.xaml" t="Include" />
+          <e p="InfoDialog.xaml.cs" t="Include" />
+          <e p="Shell.xaml" t="Include" />
+          <e p="Shell.xaml.cs" t="Include" />
+          <e p="ShellViewModel.cs" t="Include" />
+        </e>
+      </e>
+    </e>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/.idea/encodings.xml b/.idea/.idea.MaterialModernWPF/.idea/encodings.xml
new file mode 100644
index 0000000..df87cf9
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/.idea/indexLayout.xml b/.idea/.idea.MaterialModernWPF/.idea/indexLayout.xml
new file mode 100644
index 0000000..27ba142
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelUserStore">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/.idea/modules.xml b/.idea/.idea.MaterialModernWPF/.idea/modules.xml
new file mode 100644
index 0000000..ce2a3f5
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.MaterialModernWPF/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.MaterialModernWPF/riderModule.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/.idea/projectSettingsUpdater.xml b/.idea/.idea.MaterialModernWPF/.idea/projectSettingsUpdater.xml
new file mode 100644
index 0000000..7515e76
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="1" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/.idea/workspace.xml b/.idea/.idea.MaterialModernWPF/.idea/workspace.xml
new file mode 100644
index 0000000..21d4a9d
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/.idea/workspace.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="afdb8c5f-0c1c-426f-9861-38dc92ee07c3" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/View/Shell.xaml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/Module/MainView.xaml" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/View/Shell.xaml" />
+        <option value="$PROJECT_DIR$/src/Module/MainView.xaml" />
+      </list>
+    </option>
+  </component>
+  <component name="MacroExpansionManager">
+    <option name="directoryName" value="hUbvpVeY" />
+  </component>
+  <component name="ProjectId" id="1UUTC19BsryZKBElW2znHhrhDpS" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
+  </component>
+  <component name="RunManager">
+    <configuration name="MaterialModernWPF" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/src/MaterialModernWPF.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="DotNetCore" />
+      <option name="PROJECT_TFM" value="" />
+      <method v="2">
+        <option name="Build" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="afdb8c5f-0c1c-426f-9861-38dc92ee07c3" name="Default Changelist" comment="" />
+      <created>1575410043658</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1575410043658</updated>
+      <workItem from="1575410047320" duration="169000" />
+      <workItem from="1575410375342" duration="108000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="450" y="152" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1575410166767">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="450" y="152" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1536.824@0.0.1536.824" timestamp="1575410166767" />
+    <state width="1493" height="211" key="GridCell.Tab.0.bottom" timestamp="1575410483502">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="211" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
+    <state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1575410483502">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="211" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
+    <state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1575410483502">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="211" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
+    <state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1575410483502">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="211" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
+    <state x="281" y="58" key="SettingsEditor" timestamp="1575410433417">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="281" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1575410433417" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.MaterialModernWPF/riderModule.iml b/.idea/.idea.MaterialModernWPF/riderModule.iml
new file mode 100644
index 0000000..1a4e0d9
--- /dev/null
+++ b/.idea/.idea.MaterialModernWPF/riderModule.iml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RIDER_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/MaterialModernWPF.sln b/MaterialModernWPF.sln
index 95adae0..d62cf7b 100644
--- a/MaterialModernWPF.sln
+++ b/MaterialModernWPF.sln
@@ -1,22 +1,34 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialModernWPF", "MaterialModernWPF\MaterialModernWPF.csproj", "{4B3C4999-EB49-47A7-AB1A-6237CCAF559C}"
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialModernWPF", "src\MaterialModernWPF.csproj", "{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4B3C4999-EB49-47A7-AB1A-6237CCAF559C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B3C4999-EB49-47A7-AB1A-6237CCAF559C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B3C4999-EB49-47A7-AB1A-6237CCAF559C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B3C4999-EB49-47A7-AB1A-6237CCAF559C}.Release|Any CPU.Build.0 = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Debug|x64.Build.0 = Debug|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Debug|x86.Build.0 = Debug|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Release|x64.ActiveCfg = Release|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Release|x64.Build.0 = Release|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Release|x86.ActiveCfg = Release|Any CPU
+		{BCC07EB5-F4E9-4D66-B68E-C4D126CD567E}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
 EndGlobal
diff --git a/MaterialModernWPF/App.config b/MaterialModernWPF/App.config
deleted file mode 100644
index 0df9a3c..0000000
--- a/MaterialModernWPF/App.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Prism" publicKeyToken="40ee6c3a2184dc59" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.396" newVersion="7.0.0.396" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/MaterialModernWPF/MaterialModernWPF.csproj b/MaterialModernWPF/MaterialModernWPF.csproj
deleted file mode 100644
index 4586c7e..0000000
--- a/MaterialModernWPF/MaterialModernWPF.csproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4B3C4999-EB49-47A7-AB1A-6237CCAF559C}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MaterialModernWPF</RootNamespace>
-    <AssemblyName>MaterialModernWPF</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>airballoon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
-    </Reference>
-    <Reference Include="DryIoc, Version=2.12.10.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DryIoc.dll.2.12.10\lib\net45\DryIoc.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.1.1101, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="ModernWpf.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c99d0cfbea7491ef, processorArchitecture=MSIL">
-      <HintPath>..\packages\ModernWpf.Core.2.0.0-beta01\lib\net40-Client\ModernWpf.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Prism, Version=7.1.0.172, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>..\packages\Prism.Core.7.1.0.172-pre\lib\net45\Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Prism.DryIoc.Wpf, Version=7.1.0.172, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Prism.DryIoc.7.1.0.172-pre\lib\net45\Prism.DryIoc.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="Prism.Wpf, Version=7.1.0.172, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>..\packages\Prism.Wpf.7.1.0.172-pre\lib\net45\Prism.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Constants.cs" />
-    <Compile Include="Module\MainModule.cs" />
-    <Compile Include="Module\MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Module\MainViewModel.cs" />
-    <Compile Include="Service\CalculationPackage.cs" />
-    <Compile Include="Service\CalculationPackageContainer.cs" />
-    <Compile Include="Service\CalculationPackageSelectionChangedEvent.cs" />
-    <Compile Include="Service\AdditionalMoments.cs" />
-    <Compile Include="Service\DetailedGeometryPackage.cs" />
-    <Compile Include="Service\DetailedGeometryView.xaml.cs">
-      <DependentUpon>DetailedGeometryView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\InfoDialog.xaml.cs">
-      <DependentUpon>InfoDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\Shell.xaml.cs">
-      <DependentUpon>Shell.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="View\ShellViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="airballoon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Module\MainView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Service\DetailedGeometryView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\InfoDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\Shell.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MaterialModernWPF/MaterialModernWPF.csproj.DotSettings b/MaterialModernWPF/MaterialModernWPF.csproj.DotSettings
deleted file mode 100644
index 195c460..0000000
--- a/MaterialModernWPF/MaterialModernWPF.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/MaterialModernWPF/Properties/AssemblyInfo.cs b/MaterialModernWPF/Properties/AssemblyInfo.cs
deleted file mode 100644
index ad9cb45..0000000
--- a/MaterialModernWPF/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("MaterialModernWPF")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MaterialModernWPF")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten.  Wenn Sie auf einen Typ in dieser Assembly von 
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-//Um mit dem Erstellen lokalisierbarer Anwendungen zu beginnen, legen Sie 
-//<UICulture>ImCodeVerwendeteKultur</UICulture> in der .csproj-Datei
-//in einer <PropertyGroup> fest.  Wenn Sie in den Quelldateien beispielsweise Deutsch
-//(Deutschland) verwenden, legen Sie <UICulture> auf \"de-DE\" fest.  Heben Sie dann die Auskommentierung
-//des nachstehenden NeutralResourceLanguage-Attributs auf.  Aktualisieren Sie "en-US" in der nachstehenden Zeile,
-//sodass es mit der UICulture-Einstellung in der Projektdatei übereinstimmt.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher
-                                     //(wird verwendet, wenn eine Ressource auf der Seite
-                                     // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.)
-    ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs
-                                              //(wird verwendet, wenn eine Ressource auf der Seite, in der Anwendung oder einem 
-                                              // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.)
-)]
-
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MaterialModernWPF/Properties/Resources.Designer.cs b/MaterialModernWPF/Properties/Resources.Designer.cs
deleted file mode 100644
index 12f1d00..0000000
--- a/MaterialModernWPF/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
-//
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MaterialModernWPF.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    /// </summary>
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MaterialModernWPF.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/MaterialModernWPF/Properties/Resources.resx b/MaterialModernWPF/Properties/Resources.resx
deleted file mode 100644
index af7dbeb..0000000
--- a/MaterialModernWPF/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/MaterialModernWPF/Properties/Settings.Designer.cs b/MaterialModernWPF/Properties/Settings.Designer.cs
deleted file mode 100644
index c229fa8..0000000
--- a/MaterialModernWPF/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
-//
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MaterialModernWPF.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/MaterialModernWPF/Properties/Settings.settings b/MaterialModernWPF/Properties/Settings.settings
deleted file mode 100644
index 033d7a5..0000000
--- a/MaterialModernWPF/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/MaterialModernWPF/packages.config b/MaterialModernWPF/packages.config
deleted file mode 100644
index d70d698..0000000
--- a/MaterialModernWPF/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
-  <package id="DryIoc.dll" version="2.12.10" targetFramework="net461" />
-  <package id="MaterialDesignColors" version="1.1.3" targetFramework="net452" />
-  <package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net461" />
-  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net461" developmentDependency="true" />
-  <package id="ModernWpf.Core" version="2.0.0-beta01" targetFramework="net461" />
-  <package id="Prism.Core" version="7.1.0.172-pre" targetFramework="net461" />
-  <package id="Prism.DryIoc" version="7.1.0.172-pre" targetFramework="net461" />
-  <package id="Prism.Wpf" version="7.1.0.172-pre" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/MaterialModernWPF/App.xaml b/src/App.xaml
similarity index 51%
rename from MaterialModernWPF/App.xaml
rename to src/App.xaml
index 6cb4758..eddcb74 100644
--- a/MaterialModernWPF/App.xaml
+++ b/src/App.xaml
@@ -2,15 +2,13 @@
     x:Class="MaterialModernWPF.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:prism="http://prismlibrary.com/">
+    xmlns:prism="http://prismlibrary.com/"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!--  Material Design  -->
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
+                <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
         </ResourceDictionary>
diff --git a/MaterialModernWPF/App.xaml.cs b/src/App.xaml.cs
similarity index 100%
rename from MaterialModernWPF/App.xaml.cs
rename to src/App.xaml.cs
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
new file mode 100644
index 0000000..2211234
--- /dev/null
+++ b/src/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly:ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/MaterialModernWPF/Constants.cs b/src/Constants.cs
similarity index 100%
rename from MaterialModernWPF/Constants.cs
rename to src/Constants.cs
diff --git a/src/MaterialModernWPF.csproj b/src/MaterialModernWPF.csproj
new file mode 100644
index 0000000..fbb8761
--- /dev/null
+++ b/src/MaterialModernWPF.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MaterialDesignColors" Version="1.2.1-ci828" />
+    <PackageReference Include="MaterialDesignThemes" Version="3.0.0-ci828" />
+    <PackageReference Include="Prism.DryIoc" Version="7.2.0.1422" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/MaterialWindow.cs b/src/MaterialWindow.cs
new file mode 100644
index 0000000..09a066a
--- /dev/null
+++ b/src/MaterialWindow.cs
@@ -0,0 +1,6 @@
+namespace MaterialModernWPF
+{
+    public class MaterialWindow
+    {
+    }
+}
\ No newline at end of file
diff --git a/MaterialModernWPF/Module/MainModule.cs b/src/Module/MainModule.cs
similarity index 100%
rename from MaterialModernWPF/Module/MainModule.cs
rename to src/Module/MainModule.cs
diff --git a/MaterialModernWPF/Module/MainView.xaml b/src/Module/MainView.xaml
similarity index 100%
rename from MaterialModernWPF/Module/MainView.xaml
rename to src/Module/MainView.xaml
diff --git a/MaterialModernWPF/Module/MainView.xaml.cs b/src/Module/MainView.xaml.cs
similarity index 100%
rename from MaterialModernWPF/Module/MainView.xaml.cs
rename to src/Module/MainView.xaml.cs
diff --git a/MaterialModernWPF/Module/MainViewModel.cs b/src/Module/MainViewModel.cs
similarity index 100%
rename from MaterialModernWPF/Module/MainViewModel.cs
rename to src/Module/MainViewModel.cs
diff --git a/MaterialModernWPF/Service/AdditionalMoments.cs b/src/Service/AdditionalMoments.cs
similarity index 100%
rename from MaterialModernWPF/Service/AdditionalMoments.cs
rename to src/Service/AdditionalMoments.cs
diff --git a/MaterialModernWPF/Service/CalculationPackage.cs b/src/Service/CalculationPackage.cs
similarity index 100%
rename from MaterialModernWPF/Service/CalculationPackage.cs
rename to src/Service/CalculationPackage.cs
diff --git a/MaterialModernWPF/Service/CalculationPackageContainer.cs b/src/Service/CalculationPackageContainer.cs
similarity index 100%
rename from MaterialModernWPF/Service/CalculationPackageContainer.cs
rename to src/Service/CalculationPackageContainer.cs
diff --git a/MaterialModernWPF/Service/CalculationPackageSelectionChangedEvent.cs b/src/Service/CalculationPackageSelectionChangedEvent.cs
similarity index 100%
rename from MaterialModernWPF/Service/CalculationPackageSelectionChangedEvent.cs
rename to src/Service/CalculationPackageSelectionChangedEvent.cs
diff --git a/MaterialModernWPF/Service/DetailedGeometryPackage.cs b/src/Service/DetailedGeometryPackage.cs
similarity index 100%
rename from MaterialModernWPF/Service/DetailedGeometryPackage.cs
rename to src/Service/DetailedGeometryPackage.cs
diff --git a/MaterialModernWPF/Service/DetailedGeometryView.xaml b/src/Service/DetailedGeometryView.xaml
similarity index 100%
rename from MaterialModernWPF/Service/DetailedGeometryView.xaml
rename to src/Service/DetailedGeometryView.xaml
diff --git a/MaterialModernWPF/Service/DetailedGeometryView.xaml.cs b/src/Service/DetailedGeometryView.xaml.cs
similarity index 100%
rename from MaterialModernWPF/Service/DetailedGeometryView.xaml.cs
rename to src/Service/DetailedGeometryView.xaml.cs
diff --git a/MaterialModernWPF/View/InfoDialog.xaml b/src/View/InfoDialog.xaml
similarity index 100%
rename from MaterialModernWPF/View/InfoDialog.xaml
rename to src/View/InfoDialog.xaml
diff --git a/MaterialModernWPF/View/InfoDialog.xaml.cs b/src/View/InfoDialog.xaml.cs
similarity index 100%
rename from MaterialModernWPF/View/InfoDialog.xaml.cs
rename to src/View/InfoDialog.xaml.cs
diff --git a/MaterialModernWPF/View/Shell.xaml b/src/View/Shell.xaml
similarity index 92%
rename from MaterialModernWPF/View/Shell.xaml
rename to src/View/Shell.xaml
index add8554..12b366c 100644
--- a/MaterialModernWPF/View/Shell.xaml
+++ b/src/View/Shell.xaml
@@ -5,7 +5,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:modern="http://modernwpf"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:root="clr-namespace:MaterialModernWPF"
     xmlns:view="clr-namespace:MaterialModernWPF.View"
@@ -14,25 +13,17 @@
     Width="920"
     Height="600"
     d:DataContext="{d:DesignInstance view:ShellViewModel}"
-    modern:UIHooks.AutoDpiScale="True"
     prism:ViewModelLocator.AutoWireViewModel="True"
-    Background="{DynamicResource MaterialDesignPaper}"
+    Background="{DynamicResource MaterialDesignLightBackground}"
     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
     ResizeMode="CanResizeWithGrip"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    TextElement.Foreground="{DynamicResource MaterialDesignLightForeground}"
     mc:Ignorable="d">
-    <modern:Chrome.Chrome>
-        <modern:Chrome ActiveBorderBrush="{StaticResource PrimaryHueDarkBrush}" />
-    </modern:Chrome.Chrome>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <modern:TitleBar
-            Grid.Row="0"
-            Background="{StaticResource PrimaryHueDarkBrush}"
-            ShowTitle="False" />
         <materialDesign:DialogHost Grid.Row="1" Identifier="RootDialog">
             <materialDesign:DialogHost.DialogContent>
                 <view:InfoDialog />
diff --git a/MaterialModernWPF/View/Shell.xaml.cs b/src/View/Shell.xaml.cs
similarity index 100%
rename from MaterialModernWPF/View/Shell.xaml.cs
rename to src/View/Shell.xaml.cs
diff --git a/MaterialModernWPF/View/ShellViewModel.cs b/src/View/ShellViewModel.cs
similarity index 100%
rename from MaterialModernWPF/View/ShellViewModel.cs
rename to src/View/ShellViewModel.cs
diff --git a/MaterialModernWPF/airballoon.ico b/src/airballoon.ico
similarity index 100%
rename from MaterialModernWPF/airballoon.ico
rename to src/airballoon.ico