diff --git a/src/GitHub.InlineReviews/SampleData/CommentThreadViewModelDesigner.cs b/src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs
similarity index 73%
rename from src/GitHub.InlineReviews/SampleData/CommentThreadViewModelDesigner.cs
rename to src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs
index eac1dca542..eede15b161 100644
--- a/src/GitHub.InlineReviews/SampleData/CommentThreadViewModelDesigner.cs
+++ b/src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs
@@ -1,16 +1,13 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
-using GitHub.InlineReviews.ViewModels;
-using GitHub.Models;
 using GitHub.ViewModels;
 using ReactiveUI;
 
-namespace GitHub.InlineReviews.SampleData
+namespace GitHub.SampleData
 {
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    class CommentThreadViewModelDesigner : ICommentThreadViewModel
+    public class CommentThreadViewModelDesigner : ICommentThreadViewModel
     {
         public ObservableCollection<ICommentViewModel> Comments { get; }
             = new ObservableCollection<ICommentViewModel>();
diff --git a/src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs b/src/GitHub.App/SampleData/CommentViewModelDesigner.cs
similarity index 89%
rename from src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs
rename to src/GitHub.App/SampleData/CommentViewModelDesigner.cs
index ddd907015c..5c4be54c25 100644
--- a/src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs
+++ b/src/GitHub.App/SampleData/CommentViewModelDesigner.cs
@@ -1,14 +1,13 @@
 using System;
-using System.Reactive;
 using System.Diagnostics.CodeAnalysis;
-using GitHub.InlineReviews.ViewModels;
-using ReactiveUI;
+using System.Reactive;
 using GitHub.ViewModels;
+using ReactiveUI;
 
-namespace GitHub.InlineReviews.SampleData
+namespace GitHub.SampleData
 {
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    class CommentViewModelDesigner : ReactiveObject, ICommentViewModel
+    public class CommentViewModelDesigner : ReactiveObject, ICommentViewModel
     {
         public CommentViewModelDesigner()
         {
diff --git a/src/GitHub.InlineReviews/Services/CommentService.cs b/src/GitHub.App/Services/CommentService.cs
similarity index 95%
rename from src/GitHub.InlineReviews/Services/CommentService.cs
rename to src/GitHub.App/Services/CommentService.cs
index 90d723fa72..0b03bab799 100644
--- a/src/GitHub.InlineReviews/Services/CommentService.cs
+++ b/src/GitHub.App/Services/CommentService.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Forms;
 
-namespace GitHub.InlineReviews.Services
+namespace GitHub.Services
 {
     [Export(typeof(ICommentService))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
diff --git a/src/GitHub.InlineReviews/ViewModels/CommentThreadViewModel.cs b/src/GitHub.App/ViewModels/CommentThreadViewModel.cs
similarity index 100%
rename from src/GitHub.InlineReviews/ViewModels/CommentThreadViewModel.cs
rename to src/GitHub.App/ViewModels/CommentThreadViewModel.cs
diff --git a/src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs b/src/GitHub.App/ViewModels/CommentViewModel.cs
similarity index 99%
rename from src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs
rename to src/GitHub.App/ViewModels/CommentViewModel.cs
index 3565682991..714244921b 100644
--- a/src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs
+++ b/src/GitHub.App/ViewModels/CommentViewModel.cs
@@ -3,11 +3,10 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using System.Windows;
 using GitHub.Extensions;
-using GitHub.InlineReviews.Services;
 using GitHub.Logging;
 using GitHub.Models;
+using GitHub.Services;
 using GitHub.ViewModels;
 using ReactiveUI;
 using Serilog;
diff --git a/src/GitHub.InlineReviews/Services/ICommentService.cs b/src/GitHub.Exports.Reactive/Services/ICommentService.cs
similarity index 90%
rename from src/GitHub.InlineReviews/Services/ICommentService.cs
rename to src/GitHub.Exports.Reactive/Services/ICommentService.cs
index a206eb2ac4..7c7330163e 100644
--- a/src/GitHub.InlineReviews/Services/ICommentService.cs
+++ b/src/GitHub.Exports.Reactive/Services/ICommentService.cs
@@ -1,4 +1,4 @@
-namespace GitHub.InlineReviews.Services
+namespace GitHub.Services
 {
     /// <summary>
     /// This service allows for functionality to be injected into the chain of different peek Comment ViewModel types.
diff --git a/src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/ICommentThreadViewModel.cs
similarity index 88%
rename from src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs
rename to src/GitHub.Exports.Reactive/ViewModels/ICommentThreadViewModel.cs
index b17290de59..5a328da0bb 100644
--- a/src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs
+++ b/src/GitHub.Exports.Reactive/ViewModels/ICommentThreadViewModel.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Reactive;
-using GitHub.Models;
-using GitHub.ViewModels;
 using ReactiveUI;
 
-namespace GitHub.InlineReviews.ViewModels
+namespace GitHub.ViewModels
 {
     /// <summary>
     /// A comment thread.
diff --git a/src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/ICommentViewModel.cs
similarity index 97%
rename from src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs
rename to src/GitHub.Exports.Reactive/ViewModels/ICommentViewModel.cs
index 9bb64b0bfb..34c238fba1 100644
--- a/src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs
+++ b/src/GitHub.Exports.Reactive/ViewModels/ICommentViewModel.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Reactive;
-using GitHub.Models;
-using GitHub.ViewModels;
 using ReactiveUI;
 
-namespace GitHub.InlineReviews.ViewModels
+namespace GitHub.ViewModels
 {
     public enum CommentEditState
     {
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
index 65e7fb0387..cbb40dfbc5 100644
--- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
+++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -84,8 +84,6 @@
     <Compile Include="Margins\InlineCommentMargin.cs" />
     <Compile Include="Margins\InlineCommentMarginVisible.cs" />
     <Compile Include="Margins\InlineCommentMarginEnabled.cs" />
-    <Compile Include="Services\CommentService.cs" />
-    <Compile Include="Services\ICommentService.cs" />
     <Compile Include="PullRequestStatusBarPackage.cs" />
     <Compile Include="InlineReviewsPackage.cs" />
     <Compile Include="Models\InlineCommentThreadModel.cs" />
@@ -102,7 +100,6 @@
     <Compile Include="Peek\InlineCommentPeekResultPresentation.cs" />
     <Compile Include="Peek\InlineCommentPeekResultPresenter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SampleData\CommentThreadViewModelDesigner.cs" />
     <Compile Include="Services\IInlineCommentPeekService.cs" />
     <Compile Include="Services\IPullRequestSessionService.cs" />
     <Compile Include="Services\InlineCommentPeekService.cs" />
@@ -111,9 +108,6 @@
     <Compile Include="Margins\InlineCommentMarginProvider.cs" />
     <Compile Include="Services\PullRequestSessionService.cs" />
     <Compile Include="ViewModels\PullRequestFileMarginViewModel.cs" />
-    <Compile Include="ViewModels\CommentViewModel.cs" />
-    <Compile Include="ViewModels\ICommentThreadViewModel.cs" />
-    <Compile Include="ViewModels\CommentThreadViewModel.cs" />
     <Compile Include="ViewModels\InlineCommentPeekViewModel.cs" />
     <Compile Include="ViewModels\IPullRequestReviewCommentViewModel.cs" />
     <Compile Include="ViewModels\NewInlineCommentThreadViewModel.cs" />
@@ -128,7 +122,6 @@
     <Compile Include="Views\InlineCommentPeekView.xaml.cs">
       <DependentUpon>InlineCommentPeekView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SampleData\CommentViewModelDesigner.cs" />
     <Compile Include="Services\DiffService.cs" />
     <Compile Include="Services\IDiffService.cs" />
     <Compile Include="Tags\AddInlineCommentTag.cs" />
@@ -144,13 +137,6 @@
     <Compile Include="Tags\InlineCommentTagger.cs" />
     <Compile Include="Tags\InlineCommentTaggerProvider.cs" />
     <Compile Include="ViewModels\InlineCommentThreadViewModel.cs" />
-    <Compile Include="ViewModels\ICommentViewModel.cs" />
-    <Compile Include="Views\CommentThreadView.xaml.cs">
-      <DependentUpon>CommentThreadView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CommentView.xaml.cs">
-      <DependentUpon>CommentView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\PullRequestStatusView.xaml.cs">
       <DependentUpon>PullRequestStatusView.xaml</DependentUpon>
     </Compile>
@@ -460,14 +446,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\CommentThreadView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\CommentView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\PullRequestStatusView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -481,7 +459,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="SampleData\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs b/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs
index 63bb86d96d..1c21cfa67b 100644
--- a/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs
+++ b/src/GitHub.InlineReviews/ViewModels/IPullRequestReviewCommentViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive;
+using GitHub.ViewModels;
 using ReactiveUI;
 
 namespace GitHub.InlineReviews.ViewModels
diff --git a/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs b/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs
index 91bef39588..0ed39c58a3 100644
--- a/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs
+++ b/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs
@@ -16,6 +16,7 @@
 using GitHub.Models;
 using GitHub.Primitives;
 using GitHub.Services;
+using GitHub.ViewModels;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using ReactiveUI;
diff --git a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml b/src/GitHub.InlineReviews/Views/CommentThreadView.xaml
deleted file mode 100644
index 6d8c904166..0000000000
--- a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<UserControl x:Class="GitHub.InlineReviews.Views.CommentThreadView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:GitHub.InlineReviews.Views"
-             xmlns:sample="clr-namespace:GitHub.InlineReviews.SampleData"
-             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
-    <d:DesignProperties.DataContext>
-        <x:Array Type="{x:Type sample:CommentThreadViewModelDesigner}">
-            <sample:CommentThreadViewModelDesigner>
-              <!-- <sample:CommentThreadViewModelDesigner.Comments>
-                    <sample:CommentViewModelDesigner>
-                        <sample:CommentViewModelDesigner.Body>
-                            I assume this doesn't do anything if our message isn't showing?
-                        </sample:CommentViewModelDesigner.Body>
-                    </sample:CommentViewModelDesigner>
-                    <sample:CommentViewModelDesigner>
-                        <sample:CommentViewModelDesigner.Body>
-                            Nope, does nothing! Also checked the logs.
-                        </sample:CommentViewModelDesigner.Body>
-                    </sample:CommentViewModelDesigner>
-                    <sample:CommentViewModelDesigner EditState="Placeholder">
-                        <sample:CommentViewModelDesigner.Body>
-                            Reply...
-                        </sample:CommentViewModelDesigner.Body>
-                    </sample:CommentViewModelDesigner>
-                </sample:CommentThreadViewModelDesigner.Comments> -->
-      </sample:CommentThreadViewModelDesigner>
-        </x:Array>
-    </d:DesignProperties.DataContext>
-
-    <ItemsControl ItemsSource="{Binding Comments}">
-        <ItemsControl.ItemTemplate>
-            <DataTemplate>
-                <local:CommentView Margin="0 4"/>
-            </DataTemplate>
-        </ItemsControl.ItemTemplate>
-    </ItemsControl>
-</UserControl>
diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
index 4822211b73..e8a7a4269a 100644
--- a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
+++ b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
@@ -105,7 +105,7 @@
                       VerticalScrollBarVisibility="Auto"
                       Background="{DynamicResource GitHubPeekViewBackground}">
             <Grid>
-                <local:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
+                <ghfvs:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
             </Grid>
         </ScrollViewer>
     </DockPanel>
diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
index 96356ce104..4756b9ba42 100644
--- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
+++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
@@ -7,6 +7,7 @@
   <Import Project="$(SolutionDir)\src\common\signing.props" />
 
   <ItemGroup>
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Xaml" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -15,12 +16,17 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI.Events\ReactiveUI.Events_Net45.csproj" />
-    <ProjectReference Include="..\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj" />
-    <ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj" />
+    <ProjectReference Include="..\GitHub.App\GitHub.App.csproj" />
+    <ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="EnvDTE" Version="8.0.1" />
     <PackageReference Include="Markdig.Signed" version="0.13.0" />
     <PackageReference Include="Markdig.Wpf.Signed" version="0.2.1" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
+    <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.25407" />
+    <PackageReference Include="Rx-XAML" version="2.2.5-custom" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs
index 42ad4ae77e..83e5092a04 100644
--- a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs
+++ b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs
@@ -3,3 +3,6 @@
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Controls")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Views")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.Dialog")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.GitHubPane")]
diff --git a/src/GitHub.VisualStudio/Views/ActorAvatarView.cs b/src/GitHub.VisualStudio.UI/Views/ActorAvatarView.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/ActorAvatarView.cs
rename to src/GitHub.VisualStudio.UI/Views/ActorAvatarView.cs
diff --git a/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml
new file mode 100644
index 0000000000..86d1616bb9
--- /dev/null
+++ b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml
@@ -0,0 +1,40 @@
+<UserControl x:Class="GitHub.VisualStudio.Views.CommentThreadView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:GitHub.VisualStudio.Views"
+             xmlns:ghfvs="https://github.com/github/VisualStudio"
+             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
+    <d:DesignProperties.DataContext>
+        <x:Array Type="{x:Type ghfvs:CommentThreadViewModelDesigner}">
+            <ghfvs:CommentThreadViewModelDesigner>
+              <!-- <ghfvs:CommentThreadViewModelDesigner.Comments>
+                    <ghfvs:CommentViewModelDesigner>
+                        <ghfvs:CommentViewModelDesigner.Body>
+                            I assume this doesn't do anything if our message isn't showing?
+                        </ghfvs:CommentViewModelDesigner.Body>
+                    </ghfvs:CommentViewModelDesigner>
+                    <ghfvs:CommentViewModelDesigner>
+                        <ghfvs:CommentViewModelDesigner.Body>
+                            Nope, does nothing! Also checked the logs.
+                        </ghfvs:CommentViewModelDesigner.Body>
+                    </ghfvs:CommentViewModelDesigner>
+                    <ghfvs:CommentViewModelDesigner EditState="Placeholder">
+                        <ghfvs:CommentViewModelDesigner.Body>
+                            Reply...
+                        </ghfvs:CommentViewModelDesigner.Body>
+                    </ghfvs:CommentViewModelDesigner>
+                </ghfvs:CommentThreadViewModelDesigner.Comments> -->
+      </ghfvs:CommentThreadViewModelDesigner>
+        </x:Array>
+    </d:DesignProperties.DataContext>
+
+    <ItemsControl ItemsSource="{Binding Comments}">
+        <ItemsControl.ItemTemplate>
+            <DataTemplate>
+                <local:CommentView Margin="0 4"/>
+            </DataTemplate>
+        </ItemsControl.ItemTemplate>
+    </ItemsControl>
+</UserControl>
diff --git a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml.cs
similarity index 89%
rename from src/GitHub.InlineReviews/Views/CommentThreadView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml.cs
index 3143ef3e42..4fb4fc78d5 100644
--- a/src/GitHub.InlineReviews/Views/CommentThreadView.xaml.cs
+++ b/src/GitHub.VisualStudio.UI/Views/CommentThreadView.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows.Controls;
 using GitHub.VisualStudio.UI.Helpers;
 
-namespace GitHub.InlineReviews.Views
+namespace GitHub.VisualStudio.Views
 {
     public partial class CommentThreadView : UserControl
     {
diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml
similarity index 96%
rename from src/GitHub.InlineReviews/Views/CommentView.xaml
rename to src/GitHub.VisualStudio.UI/Views/CommentView.xaml
index bc70450a96..9bf463a44a 100644
--- a/src/GitHub.InlineReviews/Views/CommentView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml
@@ -1,22 +1,21 @@
-<views:GenericCommentView x:Class="GitHub.InlineReviews.Views.CommentView"
+<views:GenericCommentView x:Class="GitHub.VisualStudio.Views.CommentView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
-             xmlns:controls="clr-namespace:GitHub.VisualStudio.UI.Controls;assembly=GitHub.VisualStudio.UI"
+             xmlns:controls="clr-namespace:GitHub.VisualStudio.UI.Controls"
              xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
              xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
-             xmlns:sample="clr-namespace:GitHub.InlineReviews.SampleData"
-             xmlns:views="clr-namespace:GitHub.InlineReviews.Views"
+             xmlns:views="clr-namespace:GitHub.VisualStudio.Views"
              mc:Ignorable="d" d:DesignWidth="300">
     <d:DesignProperties.DataContext>
-        <sample:CommentViewModelDesigner EditState="None">
-            <sample:CommentViewModelDesigner.Body>
+        <ghfvs:CommentViewModelDesigner EditState="None">
+            <ghfvs:CommentViewModelDesigner.Body>
                 You can use a `CompositeDisposable` type here, it's designed to handle disposables in an optimal way (you can just call `Dispose()` on it and it will handle disposing everything it holds).
-            </sample:CommentViewModelDesigner.Body>
-        </sample:CommentViewModelDesigner>
+            </ghfvs:CommentViewModelDesigner.Body>
+        </ghfvs:CommentViewModelDesigner>
     </d:DesignProperties.DataContext>
 
     <FrameworkElement.Resources>
diff --git a/src/GitHub.InlineReviews/Views/CommentView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs
similarity index 97%
rename from src/GitHub.InlineReviews/Views/CommentView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs
index 271fac0502..dea2a99bac 100644
--- a/src/GitHub.InlineReviews/Views/CommentView.xaml.cs
+++ b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs
@@ -3,10 +3,11 @@
 using GitHub.InlineReviews.ViewModels;
 using GitHub.Services;
 using GitHub.UI;
+using GitHub.ViewModels;
 using Microsoft.VisualStudio.Shell;
 using ReactiveUI;
 
-namespace GitHub.InlineReviews.Views
+namespace GitHub.VisualStudio.Views
 {
     public class GenericCommentView : ViewBase<ICommentViewModel, GenericCommentView> { }
 
diff --git a/src/GitHub.VisualStudio/Views/ContentView.cs b/src/GitHub.VisualStudio.UI/Views/ContentView.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/ContentView.cs
rename to src/GitHub.VisualStudio.UI/Views/ContentView.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml
similarity index 95%
rename from src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml
index 8f9e325829..70d0e25f24 100644
--- a/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml
@@ -5,6 +5,7 @@
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog.Clone"
+             xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls"
              mc:Ignorable="d" d:DesignHeight="414" d:DesignWidth="440">
     <d:DesignData.DataContext>
         <ghfvs:RepositoryCloneViewModelDesigner/>
@@ -53,9 +54,9 @@
             <TextBox Text="{Binding Path, UpdateSourceTrigger=PropertyChanged}"/>
         </DockPanel>
 
-        <ghfvs:InfoPanel Message="{Binding PathWarning}"
-                         DockPanel.Dock="Bottom"
-                         Margin="0"/>
+        <uic:InfoPanel Message="{Binding PathWarning}"
+                       DockPanel.Dock="Bottom"
+                       Margin="0"/>
 
         <TabControl SelectedIndex="{Binding SelectedTabIndex}"
                     Style="{StaticResource LightModalViewTabControl}">
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Clone/SelectPageView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/SelectPageView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/Clone/SelectPageView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/Clone/SelectPageView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Clone/SelectPageView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/SelectPageView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/Clone/SelectPageView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/Clone/SelectPageView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositoryExecuteView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositoryExecuteView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositoryExecuteView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositoryExecuteView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositorySelectView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositorySelectView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/ForkRepositorySelectView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositorySelectView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/ForkRepositorySelectView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositorySelectView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/ForkRepositorySelectView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/ForkRepositorySelectView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/GistCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/GistCreationView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/GistCreationView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/GistCreationView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/LogOutRequiredView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/LogOutRequiredView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/LogOutRequiredView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/LogOutRequiredView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Login2FaView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/Login2FaView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Login2FaView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/Login2FaView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/RepositoryCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/RepositoryCreationView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/RepositoryCreationView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/RepositoryCreationView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/Dialog/RepositoryRecloneView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryRecloneView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/RepositoryRecloneView.xaml
rename to src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryRecloneView.xaml
diff --git a/src/GitHub.VisualStudio/Views/Dialog/RepositoryRecloneView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryRecloneView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/Dialog/RepositoryRecloneView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryRecloneView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/DirectoryIsExpandedToImageMonikerConverter.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/DirectoryIsExpandedToImageMonikerConverter.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/DirectoryIsExpandedToImageMonikerConverter.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/DirectoryIsExpandedToImageMonikerConverter.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/FileNameToImageMonikerConverter.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/FileNameToImageMonikerConverter.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/FileNameToImageMonikerConverter.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/FileNameToImageMonikerConverter.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml
similarity index 97%
rename from src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml
index e86646bf4e..08dc358193 100644
--- a/src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml
@@ -6,6 +6,7 @@
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:views="clr-namespace:GitHub.VisualStudio.Views"
              xmlns:local="clr-namespace:GitHub.VisualStudio.Views.GitHubPane"
+             xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls"
              Foreground="{DynamicResource GitHubVsWindowText}"
              d:DesignHeight="300"
              d:DesignWidth="300"
@@ -39,7 +40,7 @@
   </Control.Resources>
 
   <DockPanel>
-    <ghfvs:InfoPanel Name="infoPanel"
+    <uic:InfoPanel x:Name="infoPanel"
                    DockPanel.Dock="Top"
                    Message="{Binding Message}"
                    VerticalAlignment="Top"/>
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/LoggedOutView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoggedOutView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/LoginFailedView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/LoginFailedView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitHubRepositoryView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/NotAGitRepositoryView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/NotAGitRepositoryView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCreationView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListItemView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestListView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewAuthoringView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestReviewSummaryView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml
similarity index 97%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml
index 63429db4cc..51cdd9f07a 100644
--- a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml
@@ -6,6 +6,7 @@
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:local="clr-namespace:GitHub.VisualStudio.Views.GitHubPane"
              xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
+             xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls"
              mc:Ignorable="d" d:DesignHeight="500" d:DesignWidth="300">
 
     <d:DesignData.DataContext>
@@ -40,7 +41,7 @@
                            Text="{Binding PullRequestTitle}"
                            TextWrapping="Wrap"/>
                 <StackPanel Orientation="Horizontal" Margin="0 4">
-                    <ghfvs:AccountAvatar Account="{Binding User}" Margin="0 0 4 0" Width="16" Height="16"/>
+                    <uic:AccountAvatar Account="{Binding User}" Margin="0 0 4 0" Width="16" Height="16"/>
                     <TextBlock Text="{Binding Reviews.Count, StringFormat={}{0} reviews}"
                                VerticalAlignment="Center"/>
                 </StackPanel>
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestUserReviewsView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml
rename to src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml
diff --git a/src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/TeamExplorer/RepositoryPublishView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/UserFilterView.xaml b/src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml
similarity index 100%
rename from src/GitHub.VisualStudio/Views/UserFilterView.xaml
rename to src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml
diff --git a/src/GitHub.VisualStudio/Views/UserFilterView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/UserFilterView.xaml.cs
rename to src/GitHub.VisualStudio.UI/Views/UserFilterView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Views/ViewLocator.cs b/src/GitHub.VisualStudio.UI/Views/ViewLocator.cs
similarity index 100%
rename from src/GitHub.VisualStudio/Views/ViewLocator.cs
rename to src/GitHub.VisualStudio.UI/Views/ViewLocator.cs
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
index 2a5bb719d7..c2d15e8449 100644
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -378,95 +378,6 @@
     <Compile Include="UI\Settings\OptionsControl.xaml.cs">
       <DependentUpon>OptionsControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\ActorAvatarView.cs" />
-    <Compile Include="Views\ContentView.cs" />
-    <Compile Include="Views\Dialog\Clone\RepositoryCloneView.xaml.cs">
-      <DependentUpon>RepositoryCloneView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\Clone\SelectPageView.xaml.cs">
-      <DependentUpon>SelectPageView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\ForkRepositoryExecuteView.xaml.cs">
-      <DependentUpon>ForkRepositoryExecuteView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\ForkRepositorySelectView.xaml.cs">
-      <DependentUpon>ForkRepositorySelectView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\GistCreationView.xaml.cs">
-      <DependentUpon>GistCreationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\GitHubDialogWindow.xaml.cs">
-      <DependentUpon>GitHubDialogWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\LoginCredentialsView.xaml.cs">
-      <DependentUpon>LoginCredentialsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\Login2FaView.xaml.cs">
-      <DependentUpon>Login2FaView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\LogOutRequiredView.xaml.cs">
-      <DependentUpon>LogOutRequiredView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\RepositoryCreationView.xaml.cs">
-      <DependentUpon>RepositoryCreationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\RepositoryRecloneView.xaml.cs">
-      <DependentUpon>RepositoryRecloneView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\DirectoryIsExpandedToImageMonikerConverter.cs" />
-    <Compile Include="Views\GitHubPane\FileNameToImageMonikerConverter.cs" />
-    <Compile Include="Views\GitHubPane\LoggedOutView.xaml.cs">
-      <DependentUpon>LoggedOutView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\GitHubPaneView.xaml.cs">
-      <DependentUpon>GitHubPaneView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\LoginFailedView.xaml.cs">
-      <DependentUpon>LoginFailedView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestFileCommentsView.xaml.cs">
-      <DependentUpon>PullRequestFileCommentsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestListItemView.xaml.cs">
-      <DependentUpon>PullRequestListItemView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestReviewAuthoringView.xaml.cs">
-      <DependentUpon>PullRequestReviewAuthoringView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestCheckView.xaml.cs">
-      <DependentUpon>PullRequestCheckView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestReviewSummaryView.xaml.cs">
-      <DependentUpon>PullRequestReviewSummaryView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestFilesView.xaml.cs">
-      <DependentUpon>PullRequestFilesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestListView.xaml.cs">
-      <DependentUpon>PullRequestListView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestDetailView.xaml.cs">
-      <DependentUpon>PullRequestDetailView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestCreationView.xaml.cs">
-      <DependentUpon>PullRequestCreationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\NotAGitHubRepositoryView.xaml.cs">
-      <DependentUpon>NotAGitHubRepositoryView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\NotAGitRepositoryView.xaml.cs">
-      <DependentUpon>NotAGitRepositoryView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GitHubPane\PullRequestUserReviewsView.xaml.cs">
-      <DependentUpon>PullRequestUserReviewsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\TeamExplorer\RepositoryPublishView.xaml.cs">
-      <DependentUpon>RepositoryPublishView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\UserFilterView.xaml.cs">
-      <DependentUpon>UserFilterView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ViewLocator.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VSPackage.resx">
@@ -564,116 +475,6 @@
       <Generator>MSBuild:Compile</Generator>
       <CustomToolNamespace>GitHub.VisualStudio.UI</CustomToolNamespace>
     </Page>
-    <Page Include="Views\Dialog\Clone\RepositoryCloneView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\Clone\SelectPageView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialog\ForkRepositoryExecuteView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialog\ForkRepositorySelectView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialog\GistCreationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\GitHubDialogWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\LoginCredentialsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\Login2FaView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\LogOutRequiredView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialog\RepositoryCreationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\RepositoryRecloneView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\LoggedOutView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\GitHubPaneView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\GitHubPane\LoginFailedView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestFileCommentsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestListItemView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestReviewAuthoringView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestCheckView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestReviewSummaryView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestFilesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestListView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestDetailView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestCreationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\NotAGitHubRepositoryView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\NotAGitRepositoryView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\GitHubPane\PullRequestUserReviewsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\TeamExplorer\RepositoryPublishView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\UserFilterView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\akavache\Akavache.Sqlite3\Akavache.Sqlite3.csproj">
diff --git a/src/GitHub.VisualStudio/GitHubPanePackage.cs b/src/GitHub.VisualStudio/GitHubPanePackage.cs
index a92afcef08..3738e32a40 100644
--- a/src/GitHub.VisualStudio/GitHubPanePackage.cs
+++ b/src/GitHub.VisualStudio/GitHubPanePackage.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Runtime.InteropServices;
 using GitHub.VisualStudio.UI;
+using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 
 namespace GitHub.VisualStudio
 {
diff --git a/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs
index 9b8e052f21..adb135bd5e 100644
--- a/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs
+++ b/src/GitHub.VisualStudio/Properties/AssemblyInfo.cs
@@ -6,7 +6,3 @@
 [assembly: AssemblyTitle("GitHub.VisualStudio")]
 [assembly: AssemblyDescription("GitHub for Visual Studio VSPackage")]
 [assembly: Guid("fad77eaa-3fe1-4c4b-88dc-3753b6263cd7")]
-
-[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views")]
-[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.Dialog")]
-[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.VisualStudio.Views.GitHubPane")]
diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest
index bd94aae42c..d102c8aa76 100644
--- a/src/GitHub.VisualStudio/source.extension.vsixmanifest
+++ b/src/GitHub.VisualStudio/source.extension.vsixmanifest
@@ -36,6 +36,7 @@
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.InlineReviewsPackage" Path="|GitHub.InlineReviews;PkgdefProjectOutputGroup|" />
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.StartPage" Path="|GitHub.StartPage;PkgdefProjectOutputGroup|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.InlineReviews" Path="|GitHub.InlineReviews|" />
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.VisualStudio.UI" Path="|GitHub.VisualStudio.UI|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" Path="Rothko.dll" />
   </Assets>
   <Prerequisites>
diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs
index 53debb849f..ab17a72813 100644
--- a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs
+++ b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs
@@ -20,6 +20,7 @@
 using Octokit;
 using NUnit.Framework;
 using GitHub.Commands;
+using GitHub.ViewModels;
 
 namespace GitHub.InlineReviews.UnitTests.ViewModels
 {
diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs
index 7704bde7cf..21188162cb 100644
--- a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs
+++ b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentThreadViewModelTests.cs
@@ -5,6 +5,7 @@
 using GitHub.InlineReviews.ViewModels;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.ViewModels;
 using NSubstitute;
 using NUnit.Framework;
 
diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs
index c1e8383801..beb3e27785 100644
--- a/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs
+++ b/test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs
@@ -4,6 +4,7 @@
 using GitHub.InlineReviews.ViewModels;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.ViewModels;
 using NSubstitute;
 using NUnit.Framework;