diff --git a/src/Perspex.Controls/Expander.cs b/src/Perspex.Controls/Expander.cs
index 523976d596..be46949c22 100644
--- a/src/Perspex.Controls/Expander.cs
+++ b/src/Perspex.Controls/Expander.cs
@@ -1,5 +1,6 @@
 using Perspex.Animation;
 using Perspex.Controls.Primitives;
+using Perspex.VisualTree;
 
 namespace Perspex.Controls
 {
diff --git a/src/Perspex.Controls/IControl.cs b/src/Perspex.Controls/IControl.cs
index 7baa03fb9b..32f23b3e8f 100644
--- a/src/Perspex.Controls/IControl.cs
+++ b/src/Perspex.Controls/IControl.cs
@@ -7,6 +7,7 @@ using Perspex.Input;
 using Perspex.Layout;
 using Perspex.LogicalTree;
 using Perspex.Styling;
+using Perspex.VisualTree;
 
 namespace Perspex.Controls
 {
diff --git a/src/Perspex.Controls/Mixins/SelectableMixin.cs b/src/Perspex.Controls/Mixins/SelectableMixin.cs
index 4d1e5bb25f..fc975e805e 100644
--- a/src/Perspex.Controls/Mixins/SelectableMixin.cs
+++ b/src/Perspex.Controls/Mixins/SelectableMixin.cs
@@ -4,6 +4,7 @@
 using System;
 using Perspex.Interactivity;
 using Perspex.Controls.Primitives;
+using Perspex.VisualTree;
 
 namespace Perspex.Controls.Mixins
 {
diff --git a/src/Perspex.Controls/RequestBringIntoViewEventArgs.cs b/src/Perspex.Controls/RequestBringIntoViewEventArgs.cs
index da8d49a840..c892b80da6 100644
--- a/src/Perspex.Controls/RequestBringIntoViewEventArgs.cs
+++ b/src/Perspex.Controls/RequestBringIntoViewEventArgs.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Perspex.Interactivity;
+using Perspex.VisualTree;
 
 namespace Perspex.Controls
 {
diff --git a/src/Perspex.Diagnostics/Debug.cs b/src/Perspex.Diagnostics/Debug.cs
index 2977992f30..128ae0a8cf 100644
--- a/src/Perspex.Diagnostics/Debug.cs
+++ b/src/Perspex.Diagnostics/Debug.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Perspex.Controls;
 using Perspex.Data;
+using Perspex.VisualTree;
 
 namespace Perspex.Diagnostics
 {
diff --git a/src/Perspex.Input/IInputElement.cs b/src/Perspex.Input/IInputElement.cs
index c40087ca86..1a04d06859 100644
--- a/src/Perspex.Input/IInputElement.cs
+++ b/src/Perspex.Input/IInputElement.cs
@@ -5,6 +5,7 @@ using System.Diagnostics.Contracts;
 using System;
 using System.Collections.Generic;
 using Perspex.Interactivity;
+using Perspex.VisualTree;
 
 namespace Perspex.Input
 {
diff --git a/src/Perspex.Input/IMainMenu.cs b/src/Perspex.Input/IMainMenu.cs
index afe954c78a..aedff1b1f7 100644
--- a/src/Perspex.Input/IMainMenu.cs
+++ b/src/Perspex.Input/IMainMenu.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Perspex.VisualTree;
+
 namespace Perspex.Input
 {
     /// <summary>
diff --git a/src/Perspex.Input/IPointerDevice.cs b/src/Perspex.Input/IPointerDevice.cs
index 8af791b745..ecbc6b39a6 100644
--- a/src/Perspex.Input/IPointerDevice.cs
+++ b/src/Perspex.Input/IPointerDevice.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Perspex.Interactivity;
+using Perspex.VisualTree;
 
 namespace Perspex.Input
 {
diff --git a/src/Perspex.Input/KeyboardDevice.cs b/src/Perspex.Input/KeyboardDevice.cs
index 87d7b9c02c..be9e8833dc 100644
--- a/src/Perspex.Input/KeyboardDevice.cs
+++ b/src/Perspex.Input/KeyboardDevice.cs
@@ -8,6 +8,7 @@ using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using Perspex.Input.Raw;
 using Perspex.Interactivity;
+using Perspex.VisualTree;
 
 namespace Perspex.Input
 {
diff --git a/src/Perspex.Input/PointerEventArgs.cs b/src/Perspex.Input/PointerEventArgs.cs
index 25fbf7f26d..e0d2dfde23 100644
--- a/src/Perspex.Input/PointerEventArgs.cs
+++ b/src/Perspex.Input/PointerEventArgs.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Perspex.Interactivity;
+using Perspex.VisualTree;
 
 namespace Perspex.Input
 {
diff --git a/src/Perspex.Interactivity/Interactive.cs b/src/Perspex.Interactivity/Interactive.cs
index c348a3ed83..9915219f7a 100644
--- a/src/Perspex.Interactivity/Interactive.cs
+++ b/src/Perspex.Interactivity/Interactive.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Perspex.Layout;
+using Perspex.VisualTree;
 
 namespace Perspex.Interactivity
 {
diff --git a/src/Perspex.Layout/ILayoutable.cs b/src/Perspex.Layout/ILayoutable.cs
index 0d704272f2..478c3d4209 100644
--- a/src/Perspex.Layout/ILayoutable.cs
+++ b/src/Perspex.Layout/ILayoutable.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Perspex.VisualTree;
+
 namespace Perspex.Layout
 {
     /// <summary>
diff --git a/src/Perspex.SceneGraph/Animation/CrossFade.cs b/src/Perspex.SceneGraph/Animation/CrossFade.cs
index d035a9c83d..722082801d 100644
--- a/src/Perspex.SceneGraph/Animation/CrossFade.cs
+++ b/src/Perspex.SceneGraph/Animation/CrossFade.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
+using Perspex.VisualTree;
 
 namespace Perspex.Animation
 {
diff --git a/src/Perspex.SceneGraph/Animation/IPageTransition.cs b/src/Perspex.SceneGraph/Animation/IPageTransition.cs
index 50274734b9..92d4e451b2 100644
--- a/src/Perspex.SceneGraph/Animation/IPageTransition.cs
+++ b/src/Perspex.SceneGraph/Animation/IPageTransition.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System.Threading.Tasks;
+using Perspex.VisualTree;
 
 namespace Perspex.Animation
 {
diff --git a/src/Perspex.SceneGraph/Animation/PageSlide.cs b/src/Perspex.SceneGraph/Animation/PageSlide.cs
index cf145286fc..20fe2fdf76 100644
--- a/src/Perspex.SceneGraph/Animation/PageSlide.cs
+++ b/src/Perspex.SceneGraph/Animation/PageSlide.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
 using Perspex.Media;
+using Perspex.VisualTree;
 
 namespace Perspex.Animation
 {
diff --git a/src/Perspex.SceneGraph/Media/VisualBrush.cs b/src/Perspex.SceneGraph/Media/VisualBrush.cs
index 6ba6200074..fe35e32c86 100644
--- a/src/Perspex.SceneGraph/Media/VisualBrush.cs
+++ b/src/Perspex.SceneGraph/Media/VisualBrush.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Perspex.VisualTree;
+
 namespace Perspex.Media
 {
     /// <summary>
diff --git a/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj
index 9f6aa6216e..ab38fb8c0a 100644
--- a/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj
+++ b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj
@@ -86,7 +86,7 @@
     <Compile Include="Media\FormattedText.cs" />
     <Compile Include="Media\Geometry.cs" />
     <Compile Include="Media\IDrawingContext.cs" />
-    <Compile Include="IVisual.cs" />
+    <Compile Include="VisualTree\IVisual.cs" />
     <Compile Include="Media\Imaging\Bitmap.cs" />
     <Compile Include="Media\Imaging\IBitmap.cs" />
     <Compile Include="Media\Imaging\RenderTargetBitmap.cs" />
diff --git a/src/Perspex.SceneGraph/Rendering/IRenderQueueManager.cs b/src/Perspex.SceneGraph/Rendering/IRenderQueueManager.cs
index a583bcbc85..c3d83dec19 100644
--- a/src/Perspex.SceneGraph/Rendering/IRenderQueueManager.cs
+++ b/src/Perspex.SceneGraph/Rendering/IRenderQueueManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Reactive;
+using Perspex.VisualTree;
 
 namespace Perspex.Rendering
 {
diff --git a/src/Perspex.SceneGraph/Rendering/RenderQueueManager.cs b/src/Perspex.SceneGraph/Rendering/RenderQueueManager.cs
index bec552302c..c77ba4737f 100644
--- a/src/Perspex.SceneGraph/Rendering/RenderQueueManager.cs
+++ b/src/Perspex.SceneGraph/Rendering/RenderQueueManager.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Reactive;
 using System.Reactive.Subjects;
+using Perspex.VisualTree;
 
 namespace Perspex.Rendering
 {
diff --git a/src/Perspex.SceneGraph/Rendering/RendererMixin.cs b/src/Perspex.SceneGraph/Rendering/RendererMixin.cs
index 6acb10e6e9..628280bd76 100644
--- a/src/Perspex.SceneGraph/Rendering/RendererMixin.cs
+++ b/src/Perspex.SceneGraph/Rendering/RendererMixin.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Perspex.Media;
 using Perspex.Platform;
+using Perspex.VisualTree;
 
 namespace Perspex.Rendering
 {
diff --git a/src/Perspex.SceneGraph/IVisual.cs b/src/Perspex.SceneGraph/VisualTree/IVisual.cs
similarity index 98%
rename from src/Perspex.SceneGraph/IVisual.cs
rename to src/Perspex.SceneGraph/VisualTree/IVisual.cs
index de14703144..2cad9cf757 100644
--- a/src/Perspex.SceneGraph/IVisual.cs
+++ b/src/Perspex.SceneGraph/VisualTree/IVisual.cs
@@ -4,9 +4,8 @@
 using System;
 using Perspex.Collections;
 using Perspex.Media;
-using Perspex.VisualTree;
 
-namespace Perspex
+namespace Perspex.VisualTree
 {
     /// <summary>
     /// Represents a node in the visual scene graph.
diff --git a/tests/Perspex.Controls.UnitTests/TestTemplatedControl.cs b/tests/Perspex.Controls.UnitTests/TestTemplatedControl.cs
index 56f2ca8b3b..84146ed432 100644
--- a/tests/Perspex.Controls.UnitTests/TestTemplatedControl.cs
+++ b/tests/Perspex.Controls.UnitTests/TestTemplatedControl.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Perspex.Controls.Primitives;
+using Perspex.VisualTree;
 
 namespace Perspex.Controls.UnitTests
 {
diff --git a/tests/Perspex.Controls.UnitTests/Utils/AncestorFinderTests.cs b/tests/Perspex.Controls.UnitTests/Utils/AncestorFinderTests.cs
index d44d42edb4..0adf9ebd53 100644
--- a/tests/Perspex.Controls.UnitTests/Utils/AncestorFinderTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Utils/AncestorFinderTests.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Perspex.Controls.Utils;
+using Perspex.VisualTree;
 using Xunit;
 
 namespace Perspex.Controls.UnitTests.Utils
diff --git a/tests/Perspex.Layout.UnitTests/FullLayoutTests.cs b/tests/Perspex.Layout.UnitTests/FullLayoutTests.cs
index b3ec813f75..7945d944ac 100644
--- a/tests/Perspex.Layout.UnitTests/FullLayoutTests.cs
+++ b/tests/Perspex.Layout.UnitTests/FullLayoutTests.cs
@@ -18,6 +18,7 @@ using Perspex.Rendering;
 using Perspex.Shared.PlatformSupport;
 using Perspex.Styling;
 using Perspex.Themes.Default;
+using Perspex.VisualTree;
 using Ploeh.AutoFixture;
 using Ploeh.AutoFixture.AutoMoq;
 using Xunit;
diff --git a/tests/Perspex.SceneGraph.UnitTests/TestVisual.cs b/tests/Perspex.SceneGraph.UnitTests/TestVisual.cs
index 21a4427fbc..7ef0296b03 100644
--- a/tests/Perspex.SceneGraph.UnitTests/TestVisual.cs
+++ b/tests/Perspex.SceneGraph.UnitTests/TestVisual.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Perspex.Rendering;
+using Perspex.VisualTree;
 
 namespace Perspex.SceneGraph.UnitTests
 {
diff --git a/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs b/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
index 89cd535338..9b407a6de3 100644
--- a/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
+++ b/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Perspex.Controls;
 using Perspex.Controls.Templates;
+using Perspex.VisualTree;
 using Xunit;
 
 namespace Perspex.Styling.UnitTests