diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index 69ed028e0c..73605362bc 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -40,7 +40,7 @@
     <Compile Include="ColumnDefinition.cs" />
     <Compile Include="ColumnDefinitions.cs" />
     <Compile Include="ContentControl.cs" />
-    <Compile Include="ContentPresenter.cs" />
+    <Compile Include="Presenters\ContentPresenter.cs" />
     <Compile Include="Control.cs" />
     <Compile Include="ControlExtensions.cs" />
     <Compile Include="Controls.cs" />
@@ -63,7 +63,7 @@
     <Compile Include="Generators\IItemContainerGenerator.cs" />
     <Compile Include="ItemsControl.cs" />
     <Compile Include="ItemsPanelTemplate.cs" />
-    <Compile Include="ItemsPresenter.cs" />
+    <Compile Include="Presenters\ItemsPresenter.cs" />
     <Compile Include="Panel.cs" />
     <Compile Include="RowDefinition.cs" />
     <Compile Include="RowDefinitions.cs" />
diff --git a/Perspex.Controls/ContentPresenter.cs b/Perspex.Controls/Presenters/ContentPresenter.cs
similarity index 99%
rename from Perspex.Controls/ContentPresenter.cs
rename to Perspex.Controls/Presenters/ContentPresenter.cs
index c703ebe14a..adb7454d27 100644
--- a/Perspex.Controls/ContentPresenter.cs
+++ b/Perspex.Controls/Presenters/ContentPresenter.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Presenters
 {
     using System;
     using System.Linq;
diff --git a/Perspex.Controls/ItemsPresenter.cs b/Perspex.Controls/Presenters/ItemsPresenter.cs
similarity index 99%
rename from Perspex.Controls/ItemsPresenter.cs
rename to Perspex.Controls/Presenters/ItemsPresenter.cs
index eedca327fb..4ff0db7ea7 100644
--- a/Perspex.Controls/ItemsPresenter.cs
+++ b/Perspex.Controls/Presenters/ItemsPresenter.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Presenters
 {
     using System;
     using System.Collections;
diff --git a/Perspex.Controls/TabStrip.cs b/Perspex.Controls/TabStrip.cs
index 3e66396442..0df9812d43 100644
--- a/Perspex.Controls/TabStrip.cs
+++ b/Perspex.Controls/TabStrip.cs
@@ -10,6 +10,7 @@ namespace Perspex.Controls
     using System.Collections;
     using System.Linq;
     using Perspex.Controls.Generators;
+    using Perspex.Controls.Presenters;
     using Perspex.Input;
 
     public class TabStrip : SelectingItemsControl
diff --git a/Perspex.Controls/TreeView.cs b/Perspex.Controls/TreeView.cs
index 48263eca0c..04e0da6aed 100644
--- a/Perspex.Controls/TreeView.cs
+++ b/Perspex.Controls/TreeView.cs
@@ -11,6 +11,7 @@ namespace Perspex.Controls
     using System.Linq;
     using System.Reactive.Linq;
     using Perspex.Controls.Generators;
+    using Perspex.Controls.Presenters;
     using Perspex.Input;
 
     public class TreeView : SelectingItemsControl