diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index 4795005655..201da87e4d 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -227,12 +227,10 @@
       <DependentUpon>PositionedGraphNodeControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Visualizers\Graph\Expanded.cs" />
-    <Compile Include="Visualizers\Graph\ExpandedContentNodes.cs" />
-    <Compile Include="Visualizers\Graph\ExpandedExpressions.cs" />
-    <Compile Include="Visualizers\Graph\Layout\ContentNodeEventArgs.cs" />
-    <Compile Include="Visualizers\Graph\Layout\ContentPropertyNode.cs" />
-    <Compile Include="Visualizers\Graph\Layout\ContentNode.cs" />
+    <Compile Include="Visualizers\Graph\ExpandedPaths\Expanded.cs" />
+    <Compile Include="Visualizers\Graph\ExpandedPaths\ExpandedContentNodes.cs" />
+    <Compile Include="Visualizers\Graph\ExpandedPaths\ExpandedExpressions.cs" />
+    <Compile Include="Visualizers\Graph\ExpandedPaths\ExpandedPaths.cs" />
     <Compile Include="Visualizers\Graph\Layout\GraphEdgeRouter.cs" />
     <Compile Include="Visualizers\Graph\Layout\SplineRouting\Box.cs" />
     <Compile Include="Visualizers\Graph\Layout\SplineRouting\Edge.cs" />
@@ -248,17 +246,20 @@
     <Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\RouteGraphEdge.cs" />
     <Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\RouteVertex.cs" />
     <Compile Include="Visualizers\Graph\Layout\SplineRouting\ShortestPath\AStarShortestPathFinder.cs" />
+    <Compile Include="Visualizers\Graph\Layout\TreeModel\ContentNode.cs" />
+    <Compile Include="Visualizers\Graph\Layout\TreeModel\ContentNodeEventArgs.cs" />
+    <Compile Include="Visualizers\Graph\Layout\TreeModel\ContentPropertyNode.cs" />
     <Compile Include="Visualizers\Graph\NodeControlCache.cs" />
     <Compile Include="Visualizers\Graph\ObjectGraphControl.xaml.cs">
       <DependentUpon>ObjectGraphControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Visualizers\Graph\ObjectGraph\NamedEdge.cs" />
-    <Compile Include="Visualizers\Graph\TreeModel\AbstractNode.cs" />
-    <Compile Include="Visualizers\Graph\TreeModel\BaseClassNode.cs" />
-    <Compile Include="Visualizers\Graph\TreeModel\ThisNode.cs" />
-    <Compile Include="Visualizers\Graph\TreeModel\NonPublicMembersNode.cs" />
-    <Compile Include="Visualizers\Graph\TreeModel\PropertyNode.cs" />
+    <Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\AbstractNode.cs" />
+    <Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\BaseClassNode.cs" />
+    <Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\ThisNode.cs" />
+    <Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\NonPublicMembersNode.cs" />
+    <Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\PropertyNode.cs" />
     <Compile Include="Visualizers\GridVisualizer\ValueProviders\GridValuesProvider.cs" />
     <Compile Include="Visualizers\IEnumerableNode.cs" />
     <Compile Include="Visualizers\PresentationBindings\GridViewColumnHider.cs" />
@@ -310,7 +311,6 @@
     <Compile Include="TreeModel\Utils.cs" />
     <Compile Include="Visualizers\Graph\Drawing\CanvasLocationAdapter.cs" />
     <Compile Include="Visualizers\Graph\Drawing\GraphDrawer.cs" />
-    <Compile Include="Visualizers\Graph\ExpandedPaths.cs" />
     <Compile Include="Visualizers\Graph\Layout\GraphDiff.cs" />
     <Compile Include="Visualizers\Graph\Layout\GraphMatcher.cs" />
     <Compile Include="Visualizers\Graph\Layout\PositionedEdge.cs" />
@@ -430,11 +430,13 @@
     <Folder Include="Visualizers\Graph" />
     <Folder Include="Visualizers\Graph\Drawing" />
     <Folder Include="Visualizers\Graph\Layout" />
+    <Folder Include="Visualizers\Graph\Layout\TreeModel" />
     <Folder Include="Visualizers\Graph\Layout\SplineRouting" />
     <Folder Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph" />
     <Folder Include="Visualizers\Graph\Layout\SplineRouting\ShortestPath" />
     <Folder Include="Visualizers\Graph\Layout\Tree" />
-    <Folder Include="Visualizers\Graph\TreeModel" />
+    <Folder Include="Visualizers\Graph\ExpandedPaths" />
+    <Folder Include="Visualizers\Graph\ObjectGraph\TreeModel" />
     <Folder Include="Visualizers\Graph\ObjectGraph" />
     <Folder Include="Visualizers\GridVisualizer\ValueProviders" />
     <Folder Include="Visualizers\Controls" />
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Expanded.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/Expanded.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Expanded.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/Expanded.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedContentNodes.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/ExpandedContentNodes.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedContentNodes.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/ExpandedContentNodes.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedExpressions.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/ExpandedExpressions.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedExpressions.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/ExpandedExpressions.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/ExpandedPaths.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths/ExpandedPaths.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNode.cs
index 7a018098af..879ce511c6 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNode.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNode.cs
@@ -78,8 +78,7 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 		
 		public virtual IEnumerable<PositionedEdge> Edges
 		{
-			get
-			{
+			get	{
 				foreach	(PositionedNodeProperty property in this.Properties) {
 					if (property.Edge != null)
 						yield return property.Edge;
@@ -87,11 +86,6 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 			}
 		}
 		
-		public void Measure()
-		{
-			this.NodeVisualControl.Measure(new Size(800, 800));
-		}
-		
 		public double Left { get; set; }
 		public double Top { get; set; }
 		public double Width
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/TreeModel/ContentNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/TreeModel/ContentNode.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNodeEventArgs.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/TreeModel/ContentNodeEventArgs.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNodeEventArgs.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/TreeModel/ContentNodeEventArgs.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/TreeModel/ContentPropertyNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/TreeModel/ContentPropertyNode.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/AbstractNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/AbstractNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/AbstractNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/AbstractNode.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/BaseClassNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/BaseClassNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/BaseClassNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/BaseClassNode.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NonPublicMembersNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/NonPublicMembersNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NonPublicMembersNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/NonPublicMembersNode.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/PropertyNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/PropertyNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/PropertyNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/PropertyNode.cs
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/ThisNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/ThisNode.cs
similarity index 100%
rename from src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/ThisNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/TreeModel/ThisNode.cs