diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a0f0424..ea62dcc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,8 +7,7 @@ trigger:
   batch: true
   branches:
     include:
-    - develop
-    - release/*
+    - master
     - feature/*
     exclude:
     - gh-pages
@@ -32,24 +31,17 @@ stages:
         versionSpec: '5.5.1'
 
     - task: UseDotNet@2
-      displayName: 'Use .NET Core sdk 3.1.6'
+      displayName: 'Use .NET Core sdk 5.0'
       inputs:
         packageType: sdk
-        version: 3.1.302
+        version: 5.0.100
 
-    - task: NuGetCommand@2
-      displayName: NuGet restore
+    - task: DotNetCoreCLI@2
+      displayName: Build
       inputs:
-        command: 'restore'
-        restoreSolution: '$(solution)'
-        feedsToUse: config
-
-    - task: MSBuild@1
-      displayName: Build and package
-      inputs:
-        solution: '$(solution)'
-        platform: $(buildPlatform)
-        configuration: $(buildConfiguration)
+        command: build
+        projects: '$(solution)'
+        arguments: '--configuration $(buildConfiguration) /p:Platform="$(buildPlatform)"'
 
     - task: CopyFiles@2
       displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)'
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 849d6d3..1b33b4c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,12 +22,6 @@ Source code and extensive sample application available at http://www.hardcodet.n
     <tags>NotifyIcon WPF Tray Notify ToolTip Popup Balloon Toast</tags>
   </PropertyGroup>
 
-  <PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
-    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
-  </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
@@ -46,6 +40,13 @@ Source code and extensive sample application available at http://www.hardcodet.n
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <Choose>
     <When Condition=" '$(IsSampleProject)' != 'true' ">
       <PropertyGroup>
@@ -61,10 +62,6 @@ Source code and extensive sample application available at http://www.hardcodet.n
       </PropertyGroup>
 
       <ItemGroup>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
         <None Include="$(SolutionDir)\icon.png" Pack="true" PackagePath="\"/>
       </ItemGroup>
diff --git a/src/Sample Project/App.xaml b/src/NotifyIconWpf.Sample.ShowCases/App.xaml
similarity index 86%
rename from src/Sample Project/App.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/App.xaml
index 318ca54..e464665 100644
--- a/src/Sample Project/App.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Samples.App"
+<Application x:Class="NotifyIconWpf.Sample.ShowCases.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="Main.xaml">
diff --git a/src/Sample Project/App.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/App.xaml.cs
similarity index 79%
rename from src/Sample Project/App.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/App.xaml.cs
index 9b6d915..89722a2 100644
--- a/src/Sample Project/App.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/App.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/src/Sample Project/Commands/CloseWindowCommand.cs b/src/NotifyIconWpf.Sample.ShowCases/Commands/CloseWindowCommand.cs
similarity index 91%
rename from src/Sample Project/Commands/CloseWindowCommand.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Commands/CloseWindowCommand.cs
index 00930e8..bba39a5 100644
--- a/src/Sample Project/Commands/CloseWindowCommand.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Commands/CloseWindowCommand.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Samples.Commands
+namespace NotifyIconWpf.Sample.ShowCases.Commands
 {
     /// <summary>
     /// Closes the current window.
diff --git a/src/Sample Project/Commands/CommandBase.cs b/src/NotifyIconWpf.Sample.ShowCases/Commands/CommandBase.cs
similarity index 99%
rename from src/Sample Project/Commands/CommandBase.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Commands/CommandBase.cs
index 040a21b..666b1d6 100644
--- a/src/Sample Project/Commands/CommandBase.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Commands/CommandBase.cs
@@ -6,7 +6,7 @@ using System.Windows.Markup;
 using System.Windows.Media;
 using Hardcodet.Wpf.TaskbarNotification;
 
-namespace Samples.Commands
+namespace NotifyIconWpf.Sample.ShowCases.Commands
 {
     /// <summary>
     /// Basic implementation of the <see cref="ICommand"/>
diff --git a/src/Sample Project/Commands/HideSampleWindowCommand.cs b/src/NotifyIconWpf.Sample.ShowCases/Commands/HideSampleWindowCommand.cs
similarity index 91%
rename from src/Sample Project/Commands/HideSampleWindowCommand.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Commands/HideSampleWindowCommand.cs
index 0e5be4e..239ef0a 100644
--- a/src/Sample Project/Commands/HideSampleWindowCommand.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Commands/HideSampleWindowCommand.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Samples.Commands
+namespace NotifyIconWpf.Sample.ShowCases.Commands
 {
     /// <summary>
     /// Hides the main window.
diff --git a/src/Sample Project/Commands/ShowSampleWindowCommand.cs b/src/NotifyIconWpf.Sample.ShowCases/Commands/ShowSampleWindowCommand.cs
similarity index 91%
rename from src/Sample Project/Commands/ShowSampleWindowCommand.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Commands/ShowSampleWindowCommand.cs
index f954968..5ff656e 100644
--- a/src/Sample Project/Commands/ShowSampleWindowCommand.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Commands/ShowSampleWindowCommand.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Samples.Commands
+namespace NotifyIconWpf.Sample.ShowCases.Commands
 {
     /// <summary>
     /// Shows the main window.
diff --git a/src/Sample Project/Icons/Bulb.ico b/src/NotifyIconWpf.Sample.ShowCases/Icons/Bulb.ico
similarity index 100%
rename from src/Sample Project/Icons/Bulb.ico
rename to src/NotifyIconWpf.Sample.ShowCases/Icons/Bulb.ico
diff --git a/src/Sample Project/Icons/Computers.ico b/src/NotifyIconWpf.Sample.ShowCases/Icons/Computers.ico
similarity index 100%
rename from src/Sample Project/Icons/Computers.ico
rename to src/NotifyIconWpf.Sample.ShowCases/Icons/Computers.ico
diff --git a/src/Sample Project/Icons/Error.ico b/src/NotifyIconWpf.Sample.ShowCases/Icons/Error.ico
similarity index 100%
rename from src/Sample Project/Icons/Error.ico
rename to src/NotifyIconWpf.Sample.ShowCases/Icons/Error.ico
diff --git a/src/Sample Project/Icons/Inactive.ico b/src/NotifyIconWpf.Sample.ShowCases/Icons/Inactive.ico
similarity index 100%
rename from src/Sample Project/Icons/Inactive.ico
rename to src/NotifyIconWpf.Sample.ShowCases/Icons/Inactive.ico
diff --git a/src/Sample Project/Icons/NetDrives.ico b/src/NotifyIconWpf.Sample.ShowCases/Icons/NetDrives.ico
similarity index 100%
rename from src/Sample Project/Icons/NetDrives.ico
rename to src/NotifyIconWpf.Sample.ShowCases/Icons/NetDrives.ico
diff --git a/src/Sample Project/Images/Add.png b/src/NotifyIconWpf.Sample.ShowCases/Images/Add.png
similarity index 100%
rename from src/Sample Project/Images/Add.png
rename to src/NotifyIconWpf.Sample.ShowCases/Images/Add.png
diff --git a/src/Sample Project/Images/Close.png b/src/NotifyIconWpf.Sample.ShowCases/Images/Close.png
similarity index 100%
rename from src/Sample Project/Images/Close.png
rename to src/NotifyIconWpf.Sample.ShowCases/Images/Close.png
diff --git a/src/Sample Project/Images/Info.png b/src/NotifyIconWpf.Sample.ShowCases/Images/Info.png
similarity index 100%
rename from src/Sample Project/Images/Info.png
rename to src/NotifyIconWpf.Sample.ShowCases/Images/Info.png
diff --git a/src/Sample Project/Images/Logo.png b/src/NotifyIconWpf.Sample.ShowCases/Images/Logo.png
similarity index 100%
rename from src/Sample Project/Images/Logo.png
rename to src/NotifyIconWpf.Sample.ShowCases/Images/Logo.png
diff --git a/src/Sample Project/Images/Preferences.png b/src/NotifyIconWpf.Sample.ShowCases/Images/Preferences.png
similarity index 100%
rename from src/Sample Project/Images/Preferences.png
rename to src/NotifyIconWpf.Sample.ShowCases/Images/Preferences.png
diff --git a/src/Sample Project/Images/Remove.png b/src/NotifyIconWpf.Sample.ShowCases/Images/Remove.png
similarity index 100%
rename from src/Sample Project/Images/Remove.png
rename to src/NotifyIconWpf.Sample.ShowCases/Images/Remove.png
diff --git a/src/Sample Project/Main.xaml b/src/NotifyIconWpf.Sample.ShowCases/Main.xaml
similarity index 88%
rename from src/Sample Project/Main.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Main.xaml
index 38e32fc..d2ef1a2 100644
--- a/src/Sample Project/Main.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Main.xaml
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Samples.Main"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Main"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Title="NotifyIcon Samples"
@@ -30,7 +30,7 @@
             FontSize="14"
             FontStyle="Italic"
             FontWeight="Bold"
-            TextWrapping="Wrap" Text="WPF NotifyIcon 1.0.6 - Samples"/>
+            TextWrapping="Wrap" Text="{Binding Path=SampleTitle}"/>
         <Button
             HorizontalAlignment="Left"
             Margin="10,133,0,0"
@@ -38,8 +38,8 @@
             Width="164"
             Height="27"
             Content="NotifyIcon Declaration"
-            x:Name="btnDeclaration"
-            Click="btnDeclaration_Click" />
+            x:Name="BtnDeclaration"
+            Click="BtnDeclaration_Click" />
         <TextBlock
             HorizontalAlignment="Left"
             Margin="10,50,0,0"
@@ -67,8 +67,8 @@
             Content="ToolTips - Inline Declaration"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnInlineToolTip"
-            Click="btnInlineToolTip_Click" />
+            x:Name="BtnInlineToolTip"
+            Click="BtnInlineToolTip_Click" />
         <Button
             HorizontalAlignment="Left"
             Margin="10,244,0,0"
@@ -76,8 +76,8 @@
             Content="Popups"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnPopups"
-            Click="btnPopups_Click" />
+            x:Name="BtnPopups"
+            Click="BtnPopups_Click" />
         <Button
             HorizontalAlignment="Left"
             Margin="10,281,0,0"
@@ -85,8 +85,8 @@
             Content="Context Menus"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnContextMenus"
-            Click="btnContextMenus_Click" />
+            x:Name="BtnContextMenus"
+            Click="BtnContextMenus_Click" />
         <Button
             HorizontalAlignment="Left"
             Margin="10,318,0,0"
@@ -94,8 +94,8 @@
             Content="Balloon Tips"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnBalloons"
-            Click="btnBalloons_Click" />
+            x:Name="BtnBalloons"
+            Click="BtnBalloons_Click" />
         <Button
             HorizontalAlignment="Left"
             Margin="10,355,0,0"
@@ -103,8 +103,8 @@
             Content="Commands"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnCommands"
-            Click="btnCommands_Click" />
+            x:Name="BtnCommands"
+            Click="BtnCommands_Click" />
         <Button
             HorizontalAlignment="Left"
             Margin="10,207,0,0"
@@ -112,8 +112,8 @@
             Content="ToolTip User Control"
             Height="27"
             VerticalAlignment="Top"
-            x:Name="btnToolTipControl"
-            Click="btnToolTipControl_Click" />
+            x:Name="BtnToolTipControl"
+            Click="BtnToolTipControl_Click" />
         <TextBlock
             Margin="255.31,50,0,0"
             VerticalAlignment="Top"
@@ -136,8 +136,8 @@
             VerticalAlignment="Top"
             Height="27"
             Content="Open Sample Window"
-            x:Name="btnMainSample"
-            Click="btnMainSample_Click"
+            x:Name="BtnMainSample"
+            Click="BtnMainSample_Click"
             Width="164"
             HorizontalAlignment="Left" />
         <Path
@@ -207,8 +207,8 @@
             Content="Events"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnEvents"
-            Click="btnEvents_Click" Width="164" HorizontalAlignment="Left" />
+            x:Name="BtnEvents"
+            Click="BtnEvents_Click" Width="164" HorizontalAlignment="Left" />
         <Button
             HorizontalAlignment="Left"
             Margin="10,392,0,0"
@@ -216,8 +216,8 @@
             Content="Data Binding"
             VerticalAlignment="Top"
             Height="27"
-            x:Name="btnDataBinding"
-            Click="btnDataBinding_Click" />
+            x:Name="BtnDataBinding"
+            Click="BtnDataBinding_Click" />
         <Button
         	HorizontalAlignment="Left"
         	Margin="10,429,0,0"
@@ -225,8 +225,8 @@
         	Content="MVVM"
         	VerticalAlignment="Top"
         	Height="27"
-        	x:Name="btnMvvm"
-        	Click="btnMvvm_Click" />
+        	x:Name="BtnMvvm"
+        	Click="BtnMvvm_Click" />
         <Image Margin="562.24,-19,-41.24,440" Source="Images/Logo.png" Stretch="Fill" RenderTransformOrigin="0.5,0.5" Opacity="0.235">
         	<Image.RenderTransform>
         		<TransformGroup>
diff --git a/src/Sample Project/Main.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Main.xaml.cs
similarity index 52%
rename from src/Sample Project/Main.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Main.xaml.cs
index a58ae06..68d9bdc 100644
--- a/src/Sample Project/Main.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Main.xaml.cs
@@ -1,16 +1,11 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
+using System.Reflection;
 using System.Windows;
-using Samples.Tutorials;
-using Samples.Tutorials.Balloons;
-using Samples.Tutorials.Commands;
-using Samples.Tutorials.ContextMenus;
-using Samples.Tutorials.DataBinding;
-using Samples.Tutorials.Events;
-using Samples.Tutorials.MvvmSample;
-using Samples.Tutorials.Popups;
-using Samples.Tutorials.ToolTips;
+using NotifyIconWpf.Sample.ShowCases.Showcase;
+using NotifyIconWpf.Sample.ShowCases.Tutorials;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases
 {
     /// <summary>
     /// Interaction logic for Main.xaml
@@ -20,9 +15,9 @@ namespace Samples
         public Main()
         {
             InitializeComponent();
+            DataContext = this;
         }
 
-
         /// <summary>
         /// Sets <see cref="Window.WindowStartupLocation"/> and
         /// <see cref="Window.Owner"/> properties of a dialog that
@@ -36,58 +31,79 @@ namespace Samples
             window.ShowDialog();
         }
 
-        private void btnDeclaration_Click(object sender, RoutedEventArgs e)
+        private static string Version
+        {
+            get
+            {
+                var executingAssembly = Assembly.GetExecutingAssembly();
+
+                // Use assembly version
+                string version = executingAssembly.GetName().Version.ToString();
+
+                // Use AssemblyFileVersion if available
+                var assemblyFileVersionAttribute = executingAssembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
+                if (!string.IsNullOrEmpty(assemblyFileVersionAttribute?.Version))
+                {
+                    var assemblyFileVersion = new Version(assemblyFileVersionAttribute.Version);
+                    version = assemblyFileVersion.ToString(3);
+                }
+
+                return version.Replace("+", " - ");
+            }
+        }
+        public string SampleTitle { get; } = $"WPF NotifyIcon {Version} - Samples";
+
+        private void BtnDeclaration_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new SimpleWindowWithNotifyIcon());
         }
 
-
-        private void btnInlineToolTip_Click(object sender, RoutedEventArgs e)
+        private void BtnInlineToolTip_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new InlineToolTipWindow());
         }
 
-        private void btnToolTipControl_Click(object sender, RoutedEventArgs e)
+        private void BtnToolTipControl_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new UserControlToolTipWindow());
         }
 
-        private void btnPopups_Click(object sender, RoutedEventArgs e)
+        private void BtnPopups_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new InlinePopupWindow());
         }
 
-        private void btnContextMenus_Click(object sender, RoutedEventArgs e)
+        private void BtnContextMenus_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new InlineContextMenuWindow());
         }
 
-        private void btnBalloons_Click(object sender, RoutedEventArgs e)
+        private void BtnBalloons_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new BalloonSampleWindow());
         }
 
-        private void btnCommands_Click(object sender, RoutedEventArgs e)
+        private void BtnCommands_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new CommandWindow());
         }
 
-        private void btnEvents_Click(object sender, RoutedEventArgs e)
+        private void BtnEvents_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new EventVisualizerWindow());
         }
 
-        private void btnDataBinding_Click(object sender, RoutedEventArgs e)
+        private void BtnDataBinding_Click(object sender, RoutedEventArgs e)
         {
             ShowDialog(new DataBoundToolTipWindow());
         }
 		
-		private void btnMvvm_Click(object sender, RoutedEventArgs e)
+		private void BtnMvvm_Click(object sender, RoutedEventArgs e)
 		{
 			ShowDialog(new MvvmSampleWindow());
 		}
 
-        private void btnMainSample_Click(object sender, RoutedEventArgs e)
+        private void BtnMainSample_Click(object sender, RoutedEventArgs e)
         {
             var sampleWindow = new ShowcaseWindow
             {
diff --git a/src/Sample Project/Sample Project.csproj b/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj
similarity index 68%
rename from src/Sample Project/Sample Project.csproj
rename to src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj
index e46ca69..080a032 100644
--- a/src/Sample Project/Sample Project.csproj	
+++ b/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
-    <RootNamespace>Samples</RootNamespace>
-    <AssemblyTitle>Sample Project</AssemblyTitle>
-    <Product>Sample Project</Product>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+	<ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System.Xaml" />
diff --git a/src/Sample Project/Properties/AssemblyInfo.cs b/src/NotifyIconWpf.Sample.ShowCases/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Sample Project/Properties/AssemblyInfo.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Properties/AssemblyInfo.cs
diff --git a/src/Sample Project/Properties/Resources.Designer.cs b/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Sample Project/Properties/Resources.Designer.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.Designer.cs
diff --git a/src/Sample Project/Properties/Resources.resx b/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.resx
similarity index 100%
rename from src/Sample Project/Properties/Resources.resx
rename to src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.resx
diff --git a/src/Sample Project/Properties/Settings.Designer.cs b/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.Designer.cs
similarity index 100%
rename from src/Sample Project/Properties/Settings.Designer.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.Designer.cs
diff --git a/src/Sample Project/Properties/Settings.settings b/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.settings
similarity index 100%
rename from src/Sample Project/Properties/Settings.settings
rename to src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.settings
diff --git a/src/Sample Project/Showcase/FancyBalloon.xaml b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyBalloon.xaml
similarity index 98%
rename from src/Sample Project/Showcase/FancyBalloon.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyBalloon.xaml
index b5781ea..2ca6b86 100644
--- a/src/Sample Project/Showcase/FancyBalloon.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyBalloon.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Samples.FancyBalloon"
+<UserControl x:Class="NotifyIconWpf.Sample.ShowCases.Showcase.FancyBalloon"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Showcase/FancyBalloon.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyBalloon.xaml.cs
similarity index 98%
rename from src/Sample Project/Showcase/FancyBalloon.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyBalloon.xaml.cs
index b124b89..a5b9e94 100644
--- a/src/Sample Project/Showcase/FancyBalloon.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyBalloon.xaml.cs
@@ -5,7 +5,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using Hardcodet.Wpf.TaskbarNotification;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases.Showcase
 {
     /// <summary>
     /// Interaction logic for FancyBalloon.xaml
diff --git a/src/Sample Project/Showcase/FancyPopup.xaml b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyPopup.xaml
similarity index 98%
rename from src/Sample Project/Showcase/FancyPopup.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyPopup.xaml
index 9e0f531..d36de2e 100644
--- a/src/Sample Project/Showcase/FancyPopup.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyPopup.xaml
@@ -1,5 +1,5 @@
 <UserControl
-  x:Class="Samples.FancyPopup"
+  x:Class="NotifyIconWpf.Sample.ShowCases.Showcase.FancyPopup"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Showcase/FancyPopup.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyPopup.xaml.cs
similarity index 96%
rename from src/Sample Project/Showcase/FancyPopup.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyPopup.xaml.cs
index 32e99b2..38dc6ea 100644
--- a/src/Sample Project/Showcase/FancyPopup.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyPopup.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases.Showcase
 {
     /// <summary>
     /// Interaction logic for FancyPopup.xaml
diff --git a/src/Sample Project/Showcase/FancyToolTip.xaml b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyToolTip.xaml
similarity index 98%
rename from src/Sample Project/Showcase/FancyToolTip.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyToolTip.xaml
index 9392e7b..b333b7f 100644
--- a/src/Sample Project/Showcase/FancyToolTip.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyToolTip.xaml
@@ -5,7 +5,7 @@
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:tb="http://www.hardcodet.net/taskbar"
   mc:Ignorable="d"
-  x:Class="Samples.FancyToolTip"
+  x:Class="NotifyIconWpf.Sample.ShowCases.Showcase.FancyToolTip"
   x:Name="me"
   Width="285"
   Height="136">
diff --git a/src/Sample Project/Showcase/FancyToolTip.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyToolTip.xaml.cs
similarity index 95%
rename from src/Sample Project/Showcase/FancyToolTip.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyToolTip.xaml.cs
index b6fa3bb..e00b26e 100644
--- a/src/Sample Project/Showcase/FancyToolTip.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/FancyToolTip.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases.Showcase
 {
     /// <summary>
     /// Interaction logic for FancyToolTip.xaml
diff --git a/src/Sample Project/Showcase/NotifyIconResources.xaml b/src/NotifyIconWpf.Sample.ShowCases/Showcase/NotifyIconResources.xaml
similarity index 91%
rename from src/Sample Project/Showcase/NotifyIconResources.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/NotifyIconResources.xaml
index 46bf6be..3fee514 100644
--- a/src/Sample Project/Showcase/NotifyIconResources.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/NotifyIconResources.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Commands="clr-namespace:Samples.Commands"
-                    xmlns:tb="http://www.hardcodet.net/taskbar">
+                    xmlns:tb="http://www.hardcodet.net/taskbar"
+                    xmlns:commands="clr-namespace:NotifyIconWpf.Sample.ShowCases.Commands">
     <LinearGradientBrush x:Key="MenuBackground"
                          EndPoint="0.5,1"
                          StartPoint="0.5,0">
@@ -55,7 +55,7 @@
         </MenuItem>
 
         <MenuItem Header="Show Showcase Window"
-                  Command="{Commands:ShowSampleWindowCommand}"
+                  Command="{commands:ShowSampleWindowCommand}"
                   CommandParameter="{Binding}">
             <MenuItem.Icon>
                 <Image Width="16"
@@ -67,7 +67,7 @@
         <Separator />
 
         <MenuItem Header="Hide Showcase Window"
-                  Command="{Commands:HideSampleWindowCommand}"
+                  Command="{commands:HideSampleWindowCommand}"
                   CommandParameter="{Binding}">
             <MenuItem.Icon>
                 <Image Width="16"
diff --git a/src/Sample Project/Showcase/ShowcaseWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Showcase/ShowcaseWindow.xaml
similarity index 98%
rename from src/Sample Project/Showcase/ShowcaseWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/ShowcaseWindow.xaml
index 5e19f35..4289b90 100644
--- a/src/Sample Project/Showcase/ShowcaseWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/ShowcaseWindow.xaml
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Samples.ShowcaseWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Showcase.ShowcaseWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
@@ -11,7 +11,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     xmlns:local="clr-namespace:Samples"
-    xmlns:Commands="clr-namespace:Samples.Commands"
+    xmlns:commands="clr-namespace:NotifyIconWpf.Sample.ShowCases.Commands"
+    xmlns:showcase="clr-namespace:NotifyIconWpf.Sample.ShowCases.Showcase"
     MinWidth="750"
     MinHeight="800"
     ResizeMode="NoResize">
@@ -68,17 +69,17 @@
             Visibility="{Binding Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=iconVisibility, Mode=Default}"
             MenuActivation="{Binding Path=SelectedItem, ElementName=lstMenuTrigger, Mode=Default}"
             PopupActivation="{Binding Path=SelectedItem, ElementName=lstPopupTrigger, Mode=Default}"
-            DoubleClickCommand="{Commands:ShowSampleWindowCommand}"
+            DoubleClickCommand="{commands:ShowSampleWindowCommand}"
             DoubleClickCommandParameter="{Binding RelativeSource={RelativeSource Self}}">
 
             <tb:TaskbarIcon.TrayPopup>
                 <!-- the control will be put into a popup with an explicit DataContext -->
-                <local:FancyPopup />
+                <showcase:FancyPopup />
             </tb:TaskbarIcon.TrayPopup>
 
             <tb:TaskbarIcon.TrayToolTip>
                 <!-- the control will be put into a tooltip with an explicit DataContext -->
-                <local:FancyToolTip
+                <showcase:FancyToolTip
                     Opacity="0.85"
                     InfoText="{Binding Path=ToolTipText}" />
             </tb:TaskbarIcon.TrayToolTip>
diff --git a/src/Sample Project/Showcase/ShowcaseWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Showcase/ShowcaseWindow.xaml.cs
similarity index 98%
rename from src/Sample Project/Showcase/ShowcaseWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/ShowcaseWindow.xaml.cs
index 804e69e..e00c9f8 100644
--- a/src/Sample Project/Showcase/ShowcaseWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/ShowcaseWindow.xaml.cs
@@ -4,7 +4,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Navigation;
 using Hardcodet.Wpf.TaskbarNotification;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases.Showcase
 {
     /// <summary>
     /// Interaction logic for ShowcaseWindow.xaml
diff --git a/src/Sample Project/Showcase/WelcomeBalloon.xaml b/src/NotifyIconWpf.Sample.ShowCases/Showcase/WelcomeBalloon.xaml
similarity index 97%
rename from src/Sample Project/Showcase/WelcomeBalloon.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/WelcomeBalloon.xaml
index e0d33c2..31c3061 100644
--- a/src/Sample Project/Showcase/WelcomeBalloon.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/WelcomeBalloon.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Samples.WelcomeBalloon"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Showcase.WelcomeBalloon"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Showcase/WelcomeBalloon.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Showcase/WelcomeBalloon.xaml.cs
similarity index 84%
rename from src/Sample Project/Showcase/WelcomeBalloon.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Showcase/WelcomeBalloon.xaml.cs
index 23d7034..e8b0b02 100644
--- a/src/Sample Project/Showcase/WelcomeBalloon.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Showcase/WelcomeBalloon.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.ShowCases.Showcase
 {
     /// <summary>
     /// Interaction logic for WelcomeBalloon.xaml
diff --git a/src/Sample Project/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml
similarity index 100%
rename from src/Sample Project/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml
diff --git a/src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml
similarity index 88%
rename from src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml
index 22234fa..2796b53 100644
--- a/src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml	
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Samples.Tutorials.SimpleWindowWithNotifyIcon"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.SimpleWindowWithNotifyIcon"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs
index f6fc049..ac74778 100644
--- a/src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for SimpleWindowWithNotifyIcon.xaml
diff --git a/src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml
similarity index 94%
rename from src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml
index d7a0905..1a0a8c4 100644
--- a/src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml	
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Samples.Tutorials.ToolTips.InlineToolTipWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.InlineToolTipWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs
index 886de01..3c56bb8 100644
--- a/src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.ToolTips
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for Window1.xaml
diff --git a/src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/SimpleUserControl.xaml
similarity index 86%
rename from src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/SimpleUserControl.xaml
index 9af48b3..ddc5f64 100644
--- a/src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/SimpleUserControl.xaml	
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Samples.Tutorials.ToolTips.SimpleUserControl"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.SimpleUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
diff --git a/src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs
similarity index 84%
rename from src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs
index 0cc3bbf..8394fff 100644
--- a/src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Samples.Tutorials.ToolTips
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for SimpleUserControl.xaml
diff --git a/src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml
similarity index 78%
rename from src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml
index cac983b..aa65dd5 100644
--- a/src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml	
@@ -1,9 +1,9 @@
 <Window
-    x:Class="Samples.Tutorials.ToolTips.UserControlToolTipWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.UserControlToolTipWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
-    xmlns:local="clr-namespace:Samples.Tutorials.ToolTips"
+    xmlns:tutorials="clr-namespace:NotifyIconWpf.Sample.ShowCases.Tutorials"
     Height="300"
     Width="300">
     <Grid>
@@ -15,7 +15,7 @@
 
             <!-- assign user control as ToolTip -->
             <tb:TaskbarIcon.TrayToolTip>
-                <local:SimpleUserControl />
+                <tutorials:SimpleUserControl />
             </tb:TaskbarIcon.TrayToolTip>
 
         </tb:TaskbarIcon>
diff --git a/src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs
index 7f4cc6e..073b171 100644
--- a/src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.ToolTips
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for UserControlToolTipWindow.xaml
diff --git a/src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml
similarity index 92%
rename from src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml
index d67aca8..5937d57 100644
--- a/src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml	
@@ -1,9 +1,9 @@
 <Window
-    x:Class="Samples.Tutorials.Popups.InlinePopupWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.InlinePopupWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
-    xmlns:commands="clr-namespace:Samples.Commands"
+    xmlns:commands="clr-namespace:NotifyIconWpf.Sample.ShowCases.Commands"
     Height="300"
     Width="300">
     <Grid>
diff --git a/src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs
index 712dabc..6f7dbbf 100644
--- a/src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.Popups
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for InlinePopupWindow.xaml
diff --git a/src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml
similarity index 95%
rename from src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml
index 9cebe09..200a282 100644
--- a/src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml	
@@ -1,8 +1,8 @@
-<Window x:Class="Samples.Tutorials.ContextMenus.InlineContextMenuWindow"
+<Window x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.InlineContextMenuWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:tb="http://www.hardcodet.net/taskbar"
-        xmlns:commands="clr-namespace:Samples.Commands"
+        xmlns:commands="clr-namespace:NotifyIconWpf.Sample.ShowCases.Commands"
         Height="300"
         Width="300">
     <Grid>
diff --git a/src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs
similarity index 95%
rename from src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs
index 166b31e..ba0c74a 100644
--- a/src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.ContextMenus
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for InlineContextMenuWindow.xaml
diff --git a/src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/05 - Balloons/BalloonSampleWindow.xaml
similarity index 95%
rename from src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/05 - Balloons/BalloonSampleWindow.xaml
index de700d2..7c48096 100644
--- a/src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/05 - Balloons/BalloonSampleWindow.xaml	
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Samples.Tutorials.Balloons.BalloonSampleWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.BalloonSampleWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs
similarity index 93%
rename from src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs
index 63c855e..11172da 100644
--- a/src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs	
@@ -1,7 +1,8 @@
 using System.Windows;
 using System.Windows.Controls.Primitives;
+using NotifyIconWpf.Sample.ShowCases.Showcase;
 
-namespace Samples.Tutorials.Balloons
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for BalloonSampleWindow.xaml
diff --git a/src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/CommandWindow.xaml
similarity index 92%
rename from src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/CommandWindow.xaml
index 0c90dfd..459c2b1 100644
--- a/src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/CommandWindow.xaml	
@@ -1,19 +1,19 @@
 <Window
-    x:Class="Samples.Tutorials.Commands.CommandWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.CommandWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
-    xmlns:local="clr-namespace:Samples.Tutorials.Commands"
     Height="300"
     Width="300"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tutorials="clr-namespace:NotifyIconWpf.Sample.ShowCases.Tutorials"
     mc:Ignorable="d">
     <Grid>
 
         <!-- declare the command as a local resource -->
         <Grid.Resources>
-            <local:ShowMessageCommand
+            <tutorials:ShowMessageCommand
                 x:Key="MessageCommand" />
         </Grid.Resources>
 
diff --git a/src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/CommandWindow.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/CommandWindow.xaml.cs
index a7515a4..edc6e60 100644
--- a/src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/CommandWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.Commands
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for CommandWindow.xaml
diff --git a/src/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/ShowMessageCommand.cs
similarity index 90%
rename from src/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/ShowMessageCommand.cs
index 9ad382a..7aac104 100644
--- a/src/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/06 - Commands/ShowMessageCommand.cs	
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Samples.Tutorials.Commands
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// A simple command that displays the command parameter as
diff --git a/src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/07 - Events/EventVisualizerWindow.xaml
similarity index 99%
rename from src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/07 - Events/EventVisualizerWindow.xaml
index b179b3d..a51d64f 100644
--- a/src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/07 - Events/EventVisualizerWindow.xaml	
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Samples.Tutorials.Events.EventVisualizerWindow"
+    x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.EventVisualizerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs
index e8073bc..2bf61a0 100644
--- a/src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.Events
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for EventVisualizerWindow.xaml
diff --git a/src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml
similarity index 93%
rename from src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml
index 0f72e92..e864745 100644
--- a/src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml	
@@ -1,4 +1,4 @@
-<Window x:Class="Samples.Tutorials.DataBinding.DataBoundToolTipWindow"
+<Window x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.DataBoundToolTipWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:tb="http://www.hardcodet.net/taskbar"
@@ -9,7 +9,7 @@
         <!-- the ToolTipText property is bound to the TextBox below -->
         <tb:TaskbarIcon x:Name="MyNotifyIcon1"
                         IconSource="/Icons/Error.ico"
-                        ToolTipText="{Binding ElementName=txtToolTip, Path=Text}">
+                        ToolTipText="{Binding ElementName=TxtToolTip, Path=Text}">
 
             <!--
         The TextBlock bound to the ToolTipText property of the NotifyIcon
@@ -36,7 +36,7 @@
         <tb:TaskbarIcon x:Name="MyNotifyIcon2"
                         DataContext="WPF FTW "
                         IconSource="/Icons/Inactive.ico"
-                        ToolTipText="{Binding ElementName=txtToolTip, Path=Text}">
+                        ToolTipText="{Binding ElementName=TxtToolTip, Path=Text}">
 
             <tb:TaskbarIcon.TrayToolTip>
 
@@ -77,7 +77,7 @@
         <TextBox Margin="26,0,24,10"
                  Text="hello world"
                  TextWrapping="Wrap"
-                 x:Name="txtToolTip"
+                 x:Name="TxtToolTip"
                  Height="25"
                  VerticalAlignment="Bottom" />
         <TextBlock Margin="26,0,125,45"
diff --git a/src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs
similarity index 91%
rename from src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs
index bbe5d88..ecee69d 100644
--- a/src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.DataBinding
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for DataBoundToolTipWindow.xaml
diff --git a/src/Sample Project/Tutorials/09 - MVVM/Clock.png b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/Clock.png
similarity index 100%
rename from src/Sample Project/Tutorials/09 - MVVM/Clock.png
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/Clock.png
diff --git a/src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/ClockPopup.xaml
similarity index 93%
rename from src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/ClockPopup.xaml
index a8565b2..49cbcf9 100644
--- a/src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/ClockPopup.xaml	
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
-             x:Class="Samples.Tutorials.MvvmSample.ClockPopup"
+             x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.ClockPopup"
              x:Name="UserControl"
              Height="141"
              Width="304">
diff --git a/src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/ClockPopup.xaml.cs
similarity index 80%
rename from src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/ClockPopup.xaml.cs
index 4918c2b..c457a09 100644
--- a/src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/ClockPopup.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Samples.Tutorials.MvvmSample
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
 	/// <summary>
 	/// Interaction logic for ClockPopup.xaml
diff --git a/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleViewModel.cs
similarity index 95%
rename from src/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleViewModel.cs
index e3fc20a..3978a4f 100644
--- a/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleViewModel.cs	
@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Threading;
 
-namespace Samples.Tutorials.MvvmSample
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     public class MvvmSampleViewModel : INotifyPropertyChanged
     {
diff --git a/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleWindow.xaml
similarity index 83%
rename from src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleWindow.xaml
index d3d5bc5..b4c6f30 100644
--- a/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleWindow.xaml	
@@ -1,13 +1,13 @@
-<Window x:Class="Samples.Tutorials.MvvmSample.MvvmSampleWindow"
+<Window x:Class="NotifyIconWpf.Sample.ShowCases.Tutorials.MvvmSampleWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:local="clr-namespace:Samples.Tutorials.MvvmSample"
         xmlns:tb="http://www.hardcodet.net/taskbar"
+        xmlns:tutorials="clr-namespace:NotifyIconWpf.Sample.ShowCases.Tutorials"
         Title="MvvmSampleWindow"
         Height="300"
         Width="300">
     <Window.DataContext>
-        <local:MvvmSampleViewModel />
+        <tutorials:MvvmSampleViewModel />
     </Window.DataContext>
     <Grid>
 
@@ -20,7 +20,7 @@
                         ToolTipText="{Binding Timestamp}">
             <tb:TaskbarIcon.TrayPopup >
                 <!-- the popup, here a custom user control, will also get the DataContext of the NotifyIcon -->
-                <local:ClockPopup Opacity="0.8" />
+                <tutorials:ClockPopup Opacity="0.8" />
             </tb:TaskbarIcon.TrayPopup>
         </tb:TaskbarIcon>
         
diff --git a/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs
similarity index 84%
rename from src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs
index a756919..719e0b2 100644
--- a/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.ShowCases/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs	
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples.Tutorials.MvvmSample
+namespace NotifyIconWpf.Sample.ShowCases.Tutorials
 {
     /// <summary>
     /// Interaction logic for MvvmSampleWindow.xaml
diff --git a/src/NotifyIconWpf.Sample.ShowCases/app.config b/src/NotifyIconWpf.Sample.ShowCases/app.config
new file mode 100644
index 0000000..451442d
--- /dev/null
+++ b/src/NotifyIconWpf.Sample.ShowCases/app.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
+</configuration>
\ No newline at end of file
diff --git a/src/Sample Project/app.manifest b/src/NotifyIconWpf.Sample.ShowCases/app.manifest
similarity index 100%
rename from src/Sample Project/app.manifest
rename to src/NotifyIconWpf.Sample.ShowCases/app.manifest
diff --git a/src/Windowless Sample/App.xaml b/src/NotifyIconWpf.Sample.Windowless/App.xaml
similarity index 93%
rename from src/Windowless Sample/App.xaml
rename to src/NotifyIconWpf.Sample.Windowless/App.xaml
index 8c5e604..d91925d 100644
--- a/src/Windowless Sample/App.xaml	
+++ b/src/NotifyIconWpf.Sample.Windowless/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Windowless_Sample.App"
+<Application x:Class="NotifyIconWpf.Sample.Windowless.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              ShutdownMode="OnExplicitShutdown">
diff --git a/src/Windowless Sample/App.xaml.cs b/src/NotifyIconWpf.Sample.Windowless/App.xaml.cs
similarity index 94%
rename from src/Windowless Sample/App.xaml.cs
rename to src/NotifyIconWpf.Sample.Windowless/App.xaml.cs
index 8ecc907..ec6faa9 100644
--- a/src/Windowless Sample/App.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.Windowless/App.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using Hardcodet.Wpf.TaskbarNotification;
 
-namespace Windowless_Sample
+namespace NotifyIconWpf.Sample.Windowless
 {
     /// <summary>
     /// Simple application. Check the XAML for comments.
diff --git a/src/Windowless Sample/DelegateCommand.cs b/src/NotifyIconWpf.Sample.Windowless/DelegateCommand.cs
similarity index 94%
rename from src/Windowless Sample/DelegateCommand.cs
rename to src/NotifyIconWpf.Sample.Windowless/DelegateCommand.cs
index 16cd4d5..ec6e233 100644
--- a/src/Windowless Sample/DelegateCommand.cs	
+++ b/src/NotifyIconWpf.Sample.Windowless/DelegateCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Input;
 
-namespace Windowless_Sample
+namespace NotifyIconWpf.Sample.Windowless
 {
     /// <summary>
     /// Simplistic delegate command for the demo.
diff --git a/src/Windowless Sample/MainWindow.xaml b/src/NotifyIconWpf.Sample.Windowless/MainWindow.xaml
similarity index 83%
rename from src/Windowless Sample/MainWindow.xaml
rename to src/NotifyIconWpf.Sample.Windowless/MainWindow.xaml
index aad3b1e..cb2c619 100644
--- a/src/Windowless Sample/MainWindow.xaml	
+++ b/src/NotifyIconWpf.Sample.Windowless/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Windowless_Sample.MainWindow"
+<Window x:Class="NotifyIconWpf.Sample.Windowless.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="MainWindow" Height="350" Width="525">
diff --git a/src/Windowless Sample/MainWindow.xaml.cs b/src/NotifyIconWpf.Sample.Windowless/MainWindow.xaml.cs
similarity index 85%
rename from src/Windowless Sample/MainWindow.xaml.cs
rename to src/NotifyIconWpf.Sample.Windowless/MainWindow.xaml.cs
index 09c7058..7a35fc7 100644
--- a/src/Windowless Sample/MainWindow.xaml.cs	
+++ b/src/NotifyIconWpf.Sample.Windowless/MainWindow.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Windowless_Sample
+namespace NotifyIconWpf.Sample.Windowless
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/src/Windowless Sample/NotifyIconResources.xaml b/src/NotifyIconWpf.Sample.Windowless/NotifyIconResources.xaml
similarity index 93%
rename from src/Windowless Sample/NotifyIconResources.xaml
rename to src/NotifyIconWpf.Sample.Windowless/NotifyIconResources.xaml
index aa4c02d..c6915eb 100644
--- a/src/Windowless Sample/NotifyIconResources.xaml	
+++ b/src/NotifyIconWpf.Sample.Windowless/NotifyIconResources.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:tb="http://www.hardcodet.net/taskbar"
-                    xmlns:local="clr-namespace:Windowless_Sample">
+                    xmlns:local="clr-namespace:NotifyIconWpf.Sample.Windowless">
 
     <!-- The taskbar context menu - the first row is a dummy to show off simple data binding -->
     <!--
diff --git a/src/Windowless Sample/NotifyIconViewModel.cs b/src/NotifyIconWpf.Sample.Windowless/NotifyIconViewModel.cs
similarity index 97%
rename from src/Windowless Sample/NotifyIconViewModel.cs
rename to src/NotifyIconWpf.Sample.Windowless/NotifyIconViewModel.cs
index 22968b2..f629951 100644
--- a/src/Windowless Sample/NotifyIconViewModel.cs	
+++ b/src/NotifyIconWpf.Sample.Windowless/NotifyIconViewModel.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Windowless_Sample
+namespace NotifyIconWpf.Sample.Windowless
 {
     /// <summary>
     /// Provides bindable properties and commands for the NotifyIcon. In this sample, the
diff --git a/src/Windowless Sample/Windowless Sample.csproj b/src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj
similarity index 66%
rename from src/Windowless Sample/Windowless Sample.csproj
rename to src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj
index 4d63818..b69fab4 100644
--- a/src/Windowless Sample/Windowless Sample.csproj	
+++ b/src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net45;net472;netcoreapp3.1</TargetFrameworks>
-    <RootNamespace>Windowless_Sample</RootNamespace>
-    <AssemblyTitle>Windowless Sample</AssemblyTitle>
-    <Product>Windowless Sample</Product>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <TargetFrameworks>net45;net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+	<ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" PrivateAssets="All"/>
+  </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="Microsoft.CSharp" />
diff --git a/src/Windowless Sample/Properties/AssemblyInfo.cs b/src/NotifyIconWpf.Sample.Windowless/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Windowless Sample/Properties/AssemblyInfo.cs
rename to src/NotifyIconWpf.Sample.Windowless/Properties/AssemblyInfo.cs
diff --git a/src/Windowless Sample/Red.ico b/src/NotifyIconWpf.Sample.Windowless/Red.ico
similarity index 100%
rename from src/Windowless Sample/Red.ico
rename to src/NotifyIconWpf.Sample.Windowless/Red.ico
diff --git a/src/NotifyIconWpf.Sample.Windowless/app.config b/src/NotifyIconWpf.Sample.Windowless/app.config
new file mode 100644
index 0000000..451442d
--- /dev/null
+++ b/src/NotifyIconWpf.Sample.Windowless/app.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
+</configuration>
\ No newline at end of file
diff --git a/src/Windowless Sample/app.manifest b/src/NotifyIconWpf.Sample.Windowless/app.manifest
similarity index 100%
rename from src/Windowless Sample/app.manifest
rename to src/NotifyIconWpf.Sample.Windowless/app.manifest
diff --git a/src/WindowsFormsSample/FancyPopup.xaml b/src/NotifyIconWpf.Sample.WindowsForms/FancyPopup.xaml
similarity index 98%
rename from src/WindowsFormsSample/FancyPopup.xaml
rename to src/NotifyIconWpf.Sample.WindowsForms/FancyPopup.xaml
index a9d4893..a77ace8 100644
--- a/src/WindowsFormsSample/FancyPopup.xaml
+++ b/src/NotifyIconWpf.Sample.WindowsForms/FancyPopup.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Samples.FancyPopup"
+    x:Class="NotifyIconWpf.Sample.WindowsForms.FancyPopup"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:tb="http://www.hardcodet.net/taskbar"
diff --git a/src/WindowsFormsSample/FancyPopup.xaml.cs b/src/NotifyIconWpf.Sample.WindowsForms/FancyPopup.xaml.cs
similarity index 96%
rename from src/WindowsFormsSample/FancyPopup.xaml.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/FancyPopup.xaml.cs
index 55fbb4b..ebdbf8e 100644
--- a/src/WindowsFormsSample/FancyPopup.xaml.cs
+++ b/src/NotifyIconWpf.Sample.WindowsForms/FancyPopup.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Samples
+namespace NotifyIconWpf.Sample.WindowsForms
 {
     /// <summary>
     /// Interaction logic for FancyPopup.xaml
diff --git a/src/WindowsFormsSample/Form1.Designer.cs b/src/NotifyIconWpf.Sample.WindowsForms/Form1.Designer.cs
similarity index 97%
rename from src/WindowsFormsSample/Form1.Designer.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/Form1.Designer.cs
index 8eed7cb..46dc88e 100644
--- a/src/WindowsFormsSample/Form1.Designer.cs
+++ b/src/NotifyIconWpf.Sample.WindowsForms/Form1.Designer.cs
@@ -1,4 +1,4 @@
-namespace WindowsFormsSample
+namespace NotifyIconWpf.Sample.WindowsForms
 {
   partial class Form1
   {
diff --git a/src/WindowsFormsSample/Form1.cs b/src/NotifyIconWpf.Sample.WindowsForms/Form1.cs
similarity index 90%
rename from src/WindowsFormsSample/Form1.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/Form1.cs
index 1d30d71..c0850cb 100644
--- a/src/WindowsFormsSample/Form1.cs
+++ b/src/NotifyIconWpf.Sample.WindowsForms/Form1.cs
@@ -2,10 +2,9 @@
 using System.Windows;
 using System.Windows.Forms;
 using Hardcodet.Wpf.TaskbarNotification;
-using Samples;
-using WindowsFormsSample.Properties;
+using NotifyIconWpf.Sample.WindowsForms.Properties;
 
-namespace WindowsFormsSample
+namespace NotifyIconWpf.Sample.WindowsForms
 {
     public partial class Form1 : Form
     {
diff --git a/src/WindowsFormsSample/Form1.resx b/src/NotifyIconWpf.Sample.WindowsForms/Form1.resx
similarity index 100%
rename from src/WindowsFormsSample/Form1.resx
rename to src/NotifyIconWpf.Sample.WindowsForms/Form1.resx
diff --git a/src/WindowsFormsSample/Icon/Led.ico b/src/NotifyIconWpf.Sample.WindowsForms/Icon/Led.ico
similarity index 100%
rename from src/WindowsFormsSample/Icon/Led.ico
rename to src/NotifyIconWpf.Sample.WindowsForms/Icon/Led.ico
diff --git a/src/WindowsFormsSample/Images/Preferences.png b/src/NotifyIconWpf.Sample.WindowsForms/Images/Preferences.png
similarity index 100%
rename from src/WindowsFormsSample/Images/Preferences.png
rename to src/NotifyIconWpf.Sample.WindowsForms/Images/Preferences.png
diff --git a/src/WindowsFormsSample/WindowsFormsSample.csproj b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj
similarity index 84%
rename from src/WindowsFormsSample/WindowsFormsSample.csproj
rename to src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj
index e05627c..5d3c24e 100644
--- a/src/WindowsFormsSample/WindowsFormsSample.csproj
+++ b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
-    <StartupObject>WindowsFormsSample.Program</StartupObject>
-    <AssemblyTitle>WindowsFormsSample</AssemblyTitle>
-    <Product>WindowsFormsSample</Product>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+	<ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" PrivateAssets="All"/>
+  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/src/WindowsFormsSample/Program.cs b/src/NotifyIconWpf.Sample.WindowsForms/Program.cs
similarity index 90%
rename from src/WindowsFormsSample/Program.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/Program.cs
index 83a4358..1e5563e 100644
--- a/src/WindowsFormsSample/Program.cs
+++ b/src/NotifyIconWpf.Sample.WindowsForms/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace WindowsFormsSample
+namespace NotifyIconWpf.Sample.WindowsForms
 {
     internal static class Program
     {
diff --git a/src/WindowsFormsSample/Properties/AssemblyInfo.cs b/src/NotifyIconWpf.Sample.WindowsForms/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/WindowsFormsSample/Properties/AssemblyInfo.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/Properties/AssemblyInfo.cs
diff --git a/src/WindowsFormsSample/Properties/Resources.Designer.cs b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs
similarity index 97%
rename from src/WindowsFormsSample/Properties/Resources.Designer.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs
index ad67f05..b374121 100644
--- a/src/WindowsFormsSample/Properties/Resources.Designer.cs
+++ b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.Designer.cs
@@ -8,10 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WindowsFormsSample.Properties {
-    using System;
-    
-    
+namespace NotifyIconWpf.Sample.WindowsForms.Properties {
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
diff --git a/src/WindowsFormsSample/Properties/Resources.resx b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.resx
similarity index 100%
rename from src/WindowsFormsSample/Properties/Resources.resx
rename to src/NotifyIconWpf.Sample.WindowsForms/Properties/Resources.resx
diff --git a/src/WindowsFormsSample/Properties/Settings.Designer.cs b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.Designer.cs
similarity index 100%
rename from src/WindowsFormsSample/Properties/Settings.Designer.cs
rename to src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.Designer.cs
diff --git a/src/WindowsFormsSample/Properties/Settings.settings b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.settings
similarity index 100%
rename from src/WindowsFormsSample/Properties/Settings.settings
rename to src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.settings
diff --git a/src/NotifyIconWpf.Sample.WindowsForms/app.config b/src/NotifyIconWpf.Sample.WindowsForms/app.config
new file mode 100644
index 0000000..451442d
--- /dev/null
+++ b/src/NotifyIconWpf.Sample.WindowsForms/app.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
+</configuration>
\ No newline at end of file
diff --git a/src/WindowsFormsSample/app.manifest b/src/NotifyIconWpf.Sample.WindowsForms/app.manifest
similarity index 100%
rename from src/WindowsFormsSample/app.manifest
rename to src/NotifyIconWpf.Sample.WindowsForms/app.manifest
diff --git a/src/NotifyIconWpf.sln b/src/NotifyIconWpf.sln
index e7ea44b..4491c6d 100644
--- a/src/NotifyIconWpf.sln
+++ b/src/NotifyIconWpf.sln
@@ -14,11 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotifyIconWpf", "NotifyIconWpf\NotifyIconWpf.csproj", "{7AC63864-7638-41C4-969C-D3197EF2BED9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample Project", "Sample Project\Sample Project.csproj", "{71C74F29-F1C2-49C5-969F-C25AC4CDFCCC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotifyIconWpf.Sample.ShowCases", "NotifyIconWpf.Sample.ShowCases\NotifyIconWpf.Sample.ShowCases.csproj", "{71C74F29-F1C2-49C5-969F-C25AC4CDFCCC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsFormsSample", "WindowsFormsSample\WindowsFormsSample.csproj", "{F6DC0A6D-D1CE-4AD2-92ED-08FFF0AD4FA8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotifyIconWpf.Sample.WindowsForms", "NotifyIconWpf.Sample.WindowsForms\NotifyIconWpf.Sample.WindowsForms.csproj", "{F6DC0A6D-D1CE-4AD2-92ED-08FFF0AD4FA8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windowless Sample", "Windowless Sample\Windowless Sample.csproj", "{964EBFBE-A600-49B2-BDD8-422B46F1D544}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotifyIconWpf.Sample.Windowless", "NotifyIconWpf.Sample.Windowless\NotifyIconWpf.Sample.Windowless.csproj", "{964EBFBE-A600-49B2-BDD8-422B46F1D544}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/NotifyIconWpf/NotifyIconWpf.csproj b/src/NotifyIconWpf/NotifyIconWpf.csproj
index 1307fc6..ff566da 100644
--- a/src/NotifyIconWpf/NotifyIconWpf.csproj
+++ b/src/NotifyIconWpf/NotifyIconWpf.csproj
@@ -4,16 +4,9 @@
     <AssemblyName>Hardcodet.NotifyIcon.Wpf</AssemblyName>
     <AssemblyTitle>NotifyIcon for WPF</AssemblyTitle>
     <Product>NotifyIcon WPF</Product>
-    <TargetFrameworks>net45;net472;netcoreapp3.1</TargetFrameworks>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>NotifyIconWpf.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
+    <TargetFrameworks>net45;net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))">
-    <PackageReference Include="System.Resources.Extensions" Version="4.7.1" />
-  </ItemGroup>
-
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
diff --git a/src/global.json b/src/global.json
index db989f5..cbde930 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.100",
+    "version": "5.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }
diff --git a/src/version.json b/src/version.json
index 43f6007..2fa29c3 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0.9-preview",
+  "version": "1.0.9",
   "publicReleaseRefSpec": [
-    "^refs/heads/release/v\\d+\\.\\d+"
+    ".*/master$"
   ],
   "nugetPackageVersion": {
      "semVer": 2