diff --git a/Perspex.Controls.UnitTests/ContentControlTests.cs b/Perspex.Controls.UnitTests/ContentControlTests.cs
index 79af0de7b3..c58c90cd71 100644
--- a/Perspex.Controls.UnitTests/ContentControlTests.cs
+++ b/Perspex.Controls.UnitTests/ContentControlTests.cs
@@ -11,6 +11,7 @@ namespace Perspex.Controls.UnitTests
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using Moq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Layout;
     using Perspex.Styling;
     using Splat;
diff --git a/Perspex.Controls.UnitTests/TemplatedControlTests.cs b/Perspex.Controls.UnitTests/TemplatedControlTests.cs
index f4fdee5883..99392826aa 100644
--- a/Perspex.Controls.UnitTests/TemplatedControlTests.cs
+++ b/Perspex.Controls.UnitTests/TemplatedControlTests.cs
@@ -4,7 +4,6 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 namespace Perspex.Controls.UnitTests
 {
     using System;
@@ -14,6 +13,7 @@ namespace Perspex.Controls.UnitTests
     using System.Threading.Tasks;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using Perspex.Controls;
+    using Perspex.Controls.Primitives;
 
     [TestClass]
     public class TemplatedControlTests
diff --git a/Perspex.Controls.UnitTests/TestTemplatedControl.cs b/Perspex.Controls.UnitTests/TestTemplatedControl.cs
index a019396a69..bfe07c9aca 100644
--- a/Perspex.Controls.UnitTests/TestTemplatedControl.cs
+++ b/Perspex.Controls.UnitTests/TestTemplatedControl.cs
@@ -6,10 +6,7 @@
 
 namespace Perspex.Controls.UnitTests
 {
-    using System;
-    using Moq;
-    using Perspex.Layout;
-    using Perspex.Rendering;
+    using Perspex.Controls.Primitives;
 
     internal class TestTemplatedControl : TemplatedControl
     {
diff --git a/Perspex.Controls/CheckBox.cs b/Perspex.Controls/CheckBox.cs
index a78e5ab7ae..eb16656037 100644
--- a/Perspex.Controls/CheckBox.cs
+++ b/Perspex.Controls/CheckBox.cs
@@ -4,6 +4,8 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using Perspex.Controls.Primitives;
+
 namespace Perspex.Controls
 {
     public class CheckBox : ToggleButton
diff --git a/Perspex.Controls/ContentControl.cs b/Perspex.Controls/ContentControl.cs
index cd8ae71c6d..42125f6c6b 100644
--- a/Perspex.Controls/ContentControl.cs
+++ b/Perspex.Controls/ContentControl.cs
@@ -6,9 +6,7 @@
 
 namespace Perspex.Controls
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
+    using Perspex.Controls.Primitives;
 
     public class ContentControl : TemplatedControl
     {
diff --git a/Perspex.Controls/ItemsControl.cs b/Perspex.Controls/ItemsControl.cs
index 6132932e66..730dc53415 100644
--- a/Perspex.Controls/ItemsControl.cs
+++ b/Perspex.Controls/ItemsControl.cs
@@ -11,6 +11,7 @@ namespace Perspex.Controls
     using System.ComponentModel;
     using System.Linq;
     using Perspex.Controls.Generators;
+    using Perspex.Controls.Primitives;
 
     public class ItemsControl : TemplatedControl
     {
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index 73605362bc..ce2217bd1e 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -56,8 +56,8 @@
     <Compile Include="DefinitionBase.cs" />
     <Compile Include="Grid.cs" />
     <Compile Include="GridLength.cs" />
-    <Compile Include="HeaderedContentControl.cs" />
-    <Compile Include="HeaderedItemsControl.cs" />
+    <Compile Include="Primitives\HeaderedContentControl.cs" />
+    <Compile Include="Primitives\HeaderedItemsControl.cs" />
     <Compile Include="IHeadered.cs" />
     <Compile Include="Image.cs" />
     <Compile Include="Generators\IItemContainerGenerator.cs" />
@@ -67,19 +67,19 @@
     <Compile Include="Panel.cs" />
     <Compile Include="RowDefinition.cs" />
     <Compile Include="RowDefinitions.cs" />
-    <Compile Include="SelectingItemsControl.cs" />
+    <Compile Include="Primitives\SelectingItemsControl.cs" />
     <Compile Include="Shapes\Path.cs" />
     <Compile Include="Shapes\Rectangle.cs" />
     <Compile Include="Shapes\Shape.cs" />
     <Compile Include="StackPanel.cs" />
     <Compile Include="TabControl.cs" />
     <Compile Include="TabItem.cs" />
-    <Compile Include="TabStrip.cs" />
-    <Compile Include="TemplatedControl.cs" />
+    <Compile Include="Primitives\TabStrip.cs" />
+    <Compile Include="Primitives\TemplatedControl.cs" />
     <Compile Include="TextBlock.cs" />
     <Compile Include="TextBox.cs" />
     <Compile Include="TextBoxView.cs" />
-    <Compile Include="ToggleButton.cs" />
+    <Compile Include="Primitives\ToggleButton.cs" />
     <Compile Include="TreeDataTemplate.cs" />
     <Compile Include="TreeView.cs" />
     <Compile Include="TreeViewItem.cs" />
diff --git a/Perspex.Controls/HeaderedContentControl.cs b/Perspex.Controls/Primitives/HeaderedContentControl.cs
similarity index 95%
rename from Perspex.Controls/HeaderedContentControl.cs
rename to Perspex.Controls/Primitives/HeaderedContentControl.cs
index 5afa057ee5..674f1f8064 100644
--- a/Perspex.Controls/HeaderedContentControl.cs
+++ b/Perspex.Controls/Primitives/HeaderedContentControl.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Primitives
 {
     using System;
     using System.Collections.Generic;
diff --git a/Perspex.Controls/HeaderedItemsControl.cs b/Perspex.Controls/Primitives/HeaderedItemsControl.cs
similarity index 84%
rename from Perspex.Controls/HeaderedItemsControl.cs
rename to Perspex.Controls/Primitives/HeaderedItemsControl.cs
index d65d1635b4..7941aec66d 100644
--- a/Perspex.Controls/HeaderedItemsControl.cs
+++ b/Perspex.Controls/Primitives/HeaderedItemsControl.cs
@@ -4,13 +4,8 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Primitives
 {
-    using System;
-    using System.Collections;
-    using System.Linq;
-    using System.Reactive.Linq;
-
     public class HeaderedItemsControl : ItemsControl
     {
         public static readonly PerspexProperty<object> HeaderProperty =
diff --git a/Perspex.Controls/SelectingItemsControl.cs b/Perspex.Controls/Primitives/SelectingItemsControl.cs
similarity index 95%
rename from Perspex.Controls/SelectingItemsControl.cs
rename to Perspex.Controls/Primitives/SelectingItemsControl.cs
index 28ba4ff363..e63278cea5 100644
--- a/Perspex.Controls/SelectingItemsControl.cs
+++ b/Perspex.Controls/Primitives/SelectingItemsControl.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Primitives
 {
     public class SelectingItemsControl : ItemsControl
     {
diff --git a/Perspex.Controls/TabStrip.cs b/Perspex.Controls/Primitives/TabStrip.cs
similarity index 98%
rename from Perspex.Controls/TabStrip.cs
rename to Perspex.Controls/Primitives/TabStrip.cs
index 0df9812d43..3c0b197a37 100644
--- a/Perspex.Controls/TabStrip.cs
+++ b/Perspex.Controls/Primitives/TabStrip.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Primitives
 {
     using System;
     using System.Collections;
diff --git a/Perspex.Controls/TemplatedControl.cs b/Perspex.Controls/Primitives/TemplatedControl.cs
similarity index 98%
rename from Perspex.Controls/TemplatedControl.cs
rename to Perspex.Controls/Primitives/TemplatedControl.cs
index ff9e6a0047..6d7e6c91cf 100644
--- a/Perspex.Controls/TemplatedControl.cs
+++ b/Perspex.Controls/Primitives/TemplatedControl.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Primitives
 {
     using System;
     using System.Collections.Generic;
diff --git a/Perspex.Controls/ToggleButton.cs b/Perspex.Controls/Primitives/ToggleButton.cs
similarity index 95%
rename from Perspex.Controls/ToggleButton.cs
rename to Perspex.Controls/Primitives/ToggleButton.cs
index 288b826a30..d24840b45e 100644
--- a/Perspex.Controls/ToggleButton.cs
+++ b/Perspex.Controls/Primitives/ToggleButton.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Primitives
 {
     using System;
 
diff --git a/Perspex.Controls/TabControl.cs b/Perspex.Controls/TabControl.cs
index 230359729b..86e5d61790 100644
--- a/Perspex.Controls/TabControl.cs
+++ b/Perspex.Controls/TabControl.cs
@@ -10,6 +10,7 @@ namespace Perspex.Controls
     using System.Linq;
     using System.Reactive.Linq;
     using Perspex.Controls.Generators;
+    using Perspex.Controls.Primitives;
 
     public class TabControl : SelectingItemsControl
     {
diff --git a/Perspex.Controls/TabItem.cs b/Perspex.Controls/TabItem.cs
index 351f4f2941..570d8ba149 100644
--- a/Perspex.Controls/TabItem.cs
+++ b/Perspex.Controls/TabItem.cs
@@ -6,6 +6,8 @@
 
 namespace Perspex.Controls
 {
+    using Perspex.Controls.Primitives;
+
     public class TabItem : HeaderedContentControl
     {
         public static readonly PerspexProperty<bool> IsSelectedProperty =
diff --git a/Perspex.Controls/TextBox.cs b/Perspex.Controls/TextBox.cs
index adf102fdd2..94d826b50e 100644
--- a/Perspex.Controls/TextBox.cs
+++ b/Perspex.Controls/TextBox.cs
@@ -8,6 +8,7 @@ namespace Perspex.Controls
 {
     using System;
     using System.Linq;
+    using Perspex.Controls.Primitives;
     using Perspex.Input;
     using Perspex.Platform;
     using Perspex.Styling;
diff --git a/Perspex.Controls/TreeView.cs b/Perspex.Controls/TreeView.cs
index 04e0da6aed..79c298c110 100644
--- a/Perspex.Controls/TreeView.cs
+++ b/Perspex.Controls/TreeView.cs
@@ -6,12 +6,11 @@
 
 namespace Perspex.Controls
 {
-    using System;
-    using System.Collections;
     using System.Linq;
     using System.Reactive.Linq;
     using Perspex.Controls.Generators;
     using Perspex.Controls.Presenters;
+    using Perspex.Controls.Primitives;
     using Perspex.Input;
 
     public class TreeView : SelectingItemsControl
diff --git a/Perspex.Controls/TreeViewItem.cs b/Perspex.Controls/TreeViewItem.cs
index 69692faa7b..6b6efada87 100644
--- a/Perspex.Controls/TreeViewItem.cs
+++ b/Perspex.Controls/TreeViewItem.cs
@@ -9,6 +9,7 @@ namespace Perspex.Controls
     using System;
     using System.Linq;
     using Perspex.Controls.Generators;
+    using Perspex.Controls.Primitives;
 
     public class TreeViewItem : HeaderedItemsControl
     {
diff --git a/Perspex.Themes.Default/ButtonStyle.cs b/Perspex.Themes.Default/ButtonStyle.cs
index 30327a4ad6..f6ac348658 100644
--- a/Perspex.Themes.Default/ButtonStyle.cs
+++ b/Perspex.Themes.Default/ButtonStyle.cs
@@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
 {
     using System.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Media;
     using Perspex.Styling;
 
diff --git a/Perspex.Themes.Default/CheckBoxStyle.cs b/Perspex.Themes.Default/CheckBoxStyle.cs
index b3c08d2703..49f37ab055 100644
--- a/Perspex.Themes.Default/CheckBoxStyle.cs
+++ b/Perspex.Themes.Default/CheckBoxStyle.cs
@@ -13,6 +13,7 @@ namespace Perspex.Themes.Default
     using Perspex.Media;
     using Perspex.Controls.Shapes;
     using Perspex.Styling;
+    using Perspex.Controls.Presenters;
 
     public class CheckBoxStyle : Styles
     {
diff --git a/Perspex.Themes.Default/ContentControlStyle.cs b/Perspex.Themes.Default/ContentControlStyle.cs
index 00feac460b..8afb594a5e 100644
--- a/Perspex.Themes.Default/ContentControlStyle.cs
+++ b/Perspex.Themes.Default/ContentControlStyle.cs
@@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
 {
     using System.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Media;
     using Perspex.Styling;
 
diff --git a/Perspex.Themes.Default/ItemsControlStyle.cs b/Perspex.Themes.Default/ItemsControlStyle.cs
index 396c6f7802..bd0766e66b 100644
--- a/Perspex.Themes.Default/ItemsControlStyle.cs
+++ b/Perspex.Themes.Default/ItemsControlStyle.cs
@@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
 {
     using System.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Styling;
 
     public class ItemsControlStyle : Styles
diff --git a/Perspex.Themes.Default/TabControlStyle.cs b/Perspex.Themes.Default/TabControlStyle.cs
index b304bef618..b902e46a75 100644
--- a/Perspex.Themes.Default/TabControlStyle.cs
+++ b/Perspex.Themes.Default/TabControlStyle.cs
@@ -9,6 +9,8 @@ namespace Perspex.Themes.Default
     using System.Linq;
     using System.Reactive.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
+    using Perspex.Controls.Primitives;
     using Perspex.Styling;
 
     public class TabControlStyle : Styles
diff --git a/Perspex.Themes.Default/TabItemStyle.cs b/Perspex.Themes.Default/TabItemStyle.cs
index fd20c4cf8b..eac19be1b9 100644
--- a/Perspex.Themes.Default/TabItemStyle.cs
+++ b/Perspex.Themes.Default/TabItemStyle.cs
@@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
 {
     using System.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Media;
     using Perspex.Styling;
 
diff --git a/Perspex.Themes.Default/TabStripStyle.cs b/Perspex.Themes.Default/TabStripStyle.cs
index cea79f49ae..6a46bee554 100644
--- a/Perspex.Themes.Default/TabStripStyle.cs
+++ b/Perspex.Themes.Default/TabStripStyle.cs
@@ -8,6 +8,8 @@ namespace Perspex.Themes.Default
 {
     using System.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
+    using Perspex.Controls.Primitives;
     using Perspex.Styling;
 
     public class TabStripStyle : Styles
diff --git a/Perspex.Themes.Default/TreeViewItemStyle.cs b/Perspex.Themes.Default/TreeViewItemStyle.cs
index c74da3915b..db38eaf3af 100644
--- a/Perspex.Themes.Default/TreeViewItemStyle.cs
+++ b/Perspex.Themes.Default/TreeViewItemStyle.cs
@@ -12,6 +12,8 @@ namespace Perspex.Themes.Default
     using Perspex.Media;
     using Perspex.Controls.Shapes;
     using Perspex.Styling;
+    using Perspex.Controls.Presenters;
+    using Perspex.Controls.Primitives;
 
     public class TreeViewItemStyle : Styles
     {
diff --git a/Perspex.Themes.Default/TreeViewStyle.cs b/Perspex.Themes.Default/TreeViewStyle.cs
index e872830481..6c55de912a 100644
--- a/Perspex.Themes.Default/TreeViewStyle.cs
+++ b/Perspex.Themes.Default/TreeViewStyle.cs
@@ -8,6 +8,7 @@ namespace Perspex.Themes.Default
 {
     using System.Linq;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Media;
     using Perspex.Styling;
 
diff --git a/Perspex.Windows/Threading/WindowsDispatcher.cs b/Perspex.Windows/Threading/WindowsDispatcher.cs
index f677fc6514..14d50f81c4 100644
--- a/Perspex.Windows/Threading/WindowsDispatcher.cs
+++ b/Perspex.Windows/Threading/WindowsDispatcher.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="Dispatcher.cs" company="Steven Kirk">
+// <copyright file="WindowsDispatcher.cs" company="Steven Kirk">
 // Copyright 2013 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Perspex.Windows/Window.cs b/Perspex.Windows/Window.cs
index 7b920701d0..44faf5fc99 100644
--- a/Perspex.Windows/Window.cs
+++ b/Perspex.Windows/Window.cs
@@ -12,6 +12,7 @@ namespace Perspex.Windows
     using System.Reactive.Linq;
     using System.Runtime.InteropServices;
     using Perspex.Controls;
+    using Perspex.Controls.Presenters;
     using Perspex.Diagnostics;
     using Perspex.Input;
     using Perspex.Input.Raw;