diff --git a/Samples/.nuget/NuGet.Config b/Samples/.nuget/NuGet.Config
new file mode 100644
index 0000000..67f8ea0
--- /dev/null
+++ b/Samples/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
\ No newline at end of file
diff --git a/Samples/.nuget/NuGet.exe b/Samples/.nuget/NuGet.exe
new file mode 100644
index 0000000..9cba6ed
Binary files /dev/null and b/Samples/.nuget/NuGet.exe differ
diff --git a/Samples/.nuget/NuGet.targets b/Samples/.nuget/NuGet.targets
new file mode 100644
index 0000000..2c3545b
--- /dev/null
+++ b/Samples/.nuget/NuGet.targets
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+    </PropertyGroup>
+
+    <Choose>
+        <When Condition="Exists('$(PackagesProjectConfig)')">
+            <PropertyGroup>
+                <PackagesConfig>$(PackagesProjectConfig)</PackagesConfig>
+            </PropertyGroup>
+        </When>
+        <When Condition="Exists('packages.config')">
+            <PropertyGroup>
+                <PackagesConfig>packages.config</PackagesConfig>
+            </PropertyGroup>
+        </When>
+    </Choose>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)"
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml b/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml
index cc92fa2..5f99960 100644
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml
+++ b/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml
@@ -5,13 +5,14 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:redditapi="clr-namespace:Stylet.Samples.RedditBrowser.RedditApi"
              xmlns:s="http://github.com/canton7/Stylet"
+             xmlns:uc="clr-namespace:Stylet.Samples.RedditBrowser.UserControls"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <DockPanel>
         <Button DockPanel.Dock="Top" HorizontalAlignment="Left" Command="{s:Action GoBack}">Back</Button>
-        <s:StretchingTreeView ItemsSource="{Binding CommentCollection.Comments}" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-            <s:StretchingTreeView.Resources>
-                <Style TargetType="s:StretchingTreeViewItem">
+        <uc:StretchingTreeView ItemsSource="{Binding CommentCollection.Comments}" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+            <uc:StretchingTreeView.Resources>
+                <Style TargetType="uc:StretchingTreeViewItem">
                     <Setter Property="ToggleButtonVerticalAlignment" Value="Top"/>
                 </Style>
                 <HierarchicalDataTemplate DataType="{x:Type redditapi:Comment}" ItemsSource="{Binding Replies}">
@@ -20,7 +21,7 @@
                         <TextBlock Text="{Binding Body}" TextWrapping="Wrap"/>
                     </StackPanel>
                 </HierarchicalDataTemplate>
-            </s:StretchingTreeView.Resources>
-        </s:StretchingTreeView>
+            </uc:StretchingTreeView.Resources>
+        </uc:StretchingTreeView>
     </DockPanel>
 </UserControl>
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml.cs
deleted file mode 100644
index c7185f0..0000000
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Stylet.Samples.RedditBrowser.Pages
-{
-    /// <summary>
-    /// Interaction logic for PostCommentsView.xaml
-    /// </summary>
-    public partial class PostCommentsView : UserControl
-    {
-        public PostCommentsView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/PostsView.xaml.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/PostsView.xaml.cs
deleted file mode 100644
index e628039..0000000
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/PostsView.xaml.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Stylet.Samples.RedditBrowser.Pages
-{
-    /// <summary>
-    /// Interaction logic for PostsView.xaml
-    /// </summary>
-    public partial class PostsView : UserControl
-    {
-        public PostsView()
-        {
-            InitializeComponent();
-        }
-
-        private void ListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
-        {
-
-        }
-    }
-}
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/ShellView.xaml.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/ShellView.xaml.cs
deleted file mode 100644
index 50978df..0000000
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/ShellView.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Stylet.Samples.RedditBrowser.Pages
-{
-    /// <summary>
-    /// Interaction logic for ShellView.xaml
-    /// </summary>
-    public partial class ShellView : Window
-    {
-        public ShellView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditView.xaml.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditView.xaml.cs
deleted file mode 100644
index bfcd204..0000000
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Stylet.Samples.RedditBrowser.Pages
-{
-    /// <summary>
-    /// Interaction logic for SubredditView.xaml
-    /// </summary>
-    public partial class SubredditView : UserControl
-    {
-        public SubredditView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/TaskbarView.xaml.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/TaskbarView.xaml.cs
deleted file mode 100644
index 04a2a21..0000000
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/TaskbarView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Stylet.Samples.RedditBrowser.Pages
-{
-    /// <summary>
-    /// Interaction logic for TaskbarView.xaml
-    /// </summary>
-    public partial class TaskbarView : UserControl
-    {
-        public TaskbarView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Samples/Stylet.Samples.RedditBrowser/Stylet.Samples.RedditBrowser.csproj b/Samples/Stylet.Samples.RedditBrowser/Stylet.Samples.RedditBrowser.csproj
index ee9c35c..89290f1 100644
--- a/Samples/Stylet.Samples.RedditBrowser/Stylet.Samples.RedditBrowser.csproj
+++ b/Samples/Stylet.Samples.RedditBrowser/Stylet.Samples.RedditBrowser.csproj
@@ -13,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -67,33 +69,19 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Events\OpenSubredditEvent.cs" />
-    <Compile Include="Pages\PostCommentsView.xaml.cs">
-      <DependentUpon>PostCommentsView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\PostCommentsViewModel.cs" />
-    <Compile Include="Pages\PostsView.xaml.cs">
-      <DependentUpon>PostsView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\PostsViewModel.cs" />
-    <Compile Include="Pages\ShellView.xaml.cs">
-      <DependentUpon>ShellView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\ShellViewModel.cs" />
-    <Compile Include="Pages\SubredditView.xaml.cs">
-      <DependentUpon>SubredditView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\SubredditViewModel.cs" />
     <Compile Include="RedditApi\CommentCollection.cs" />
     <Compile Include="RedditApi\Contracts\CommentsResponse.cs" />
     <Compile Include="RedditApi\Contracts\PostsResponse.cs" />
     <Compile Include="RedditApi\PostCollection.cs" />
     <Compile Include="RedditApi\RedditClient.cs" />
+    <Compile Include="UserControls\StretchingTreeView.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrapper.cs" />
-    <Compile Include="Pages\TaskbarView.xaml.cs">
-      <DependentUpon>TaskbarView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\TaskbarViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -161,6 +149,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.22.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.22.1\build\Fody.targets'))" />
   </Target>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- 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">
diff --git a/Stylet/StretchingTreeView.cs b/Samples/Stylet.Samples.RedditBrowser/UserControls/StretchingTreeView.cs
similarity index 98%
rename from Stylet/StretchingTreeView.cs
rename to Samples/Stylet.Samples.RedditBrowser/UserControls/StretchingTreeView.cs
index 5d62b98..6d701ec 100644
--- a/Stylet/StretchingTreeView.cs
+++ b/Samples/Stylet.Samples.RedditBrowser/UserControls/StretchingTreeView.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 
-namespace Stylet
+namespace Stylet.Samples.RedditBrowser.UserControls
 {
     // http://blogs.msdn.com/b/jpricket/archive/2008/08/05/wpf-a-stretching-treeview.aspx
     public class StretchingTreeView : TreeView
diff --git a/Samples/Stylet.Samples.sln b/Samples/Stylet.Samples.sln
index fba37c4..77cd578 100644
--- a/Samples/Stylet.Samples.sln
+++ b/Samples/Stylet.Samples.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30110.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stylet", "..\Stylet\Stylet.csproj", "{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}"
 EndProject
@@ -17,6 +17,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stylet.Samples.OverridingVi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stylet.Samples.RedditBrowser", "Stylet.Samples.RedditBrowser\Stylet.Samples.RedditBrowser.csproj", "{72B1C6E4-1293-47DD-BEFD-FA2E782BDBDA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C3BAC068-E2C0-4470-9F2E-A1711299BFAE}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/Stylet/Stylet.csproj b/Stylet/Stylet.csproj
index 0168d7f..334c92f 100644
--- a/Stylet/Stylet.csproj
+++ b/Stylet/Stylet.csproj
@@ -81,7 +81,6 @@
     <Compile Include="View.cs" />
     <Compile Include="ViewManager.cs" />
     <Compile Include="WindowManager.cs" />
-    <Compile Include="StretchingTreeView.cs" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Xaml\StyletResourceDictionary.xaml">