diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
index a859793d05..c9cb830659 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
@@ -202,10 +202,10 @@
     <Compile Include="Src\Visualizers\Graph\ObjectGraph\ObjectNode.cs" />
     <Compile Include="Src\Visualizers\Graph\ObjectGraph\ObjectProperty.cs" />
     <Compile Include="Src\Visualizers\Graph\ShowObjectGraphVisualizerCommand.cs" />
-    <Compile Include="Src\Visualizers\Graph\Utils\DebuggerHelpers.cs" />
-    <Compile Include="Src\Visualizers\Graph\Utils\DictionaryExtensions.cs" />
-    <Compile Include="Src\Visualizers\Graph\Utils\Lookup.cs" />
-    <Compile Include="Src\Visualizers\Graph\Utils\LookupValueCollection.cs" />
+    <Compile Include="Src\Visualizers\Utils\DebuggerHelpers.cs" />
+    <Compile Include="Src\Visualizers\Utils\DictionaryExtensions.cs" />
+    <Compile Include="Src\Visualizers\Utils\Lookup.cs" />
+    <Compile Include="Src\Visualizers\Utils\LookupValueCollection.cs" />
     <Compile Include="Src\Visualizers\Graph\VisualizerWPFWindow.xaml.cs">
       <DependentUpon>VisualizerWPFWindow.xaml</DependentUpon>
     </Compile>
@@ -296,7 +296,8 @@
     <Folder Include="Src\Visualizers\Graph\Layout\Tree" />
     <Folder Include="Src\Visualizers\Graph\Graphviz" />
     <Folder Include="Src\Visualizers\Graph\ObjectGraph" />
-    <Folder Include="Src\Visualizers\Graph\Utils" />
+    <Folder Include="Src\Visualizers\Utils" />
+    <Folder Include="Src\Visualizers\GridVisualizer" />
     <Folder Include="Src\Visualizers\PresentationBindings" />
     <Page Include="Src\Visualizers\Graph\Drawing\NodeControl.xaml" />
     <Page Include="Src\Visualizers\Graph\VisualizerWPFWindow.xaml" />
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphDiff.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphDiff.cs
index 0b4952f7b7..14ea667d63 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphDiff.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphDiff.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Debugger.AddIn.Visualizers.Graph.Utils;
+using Debugger.AddIn.Visualizers.Utils;
 
 namespace Debugger.AddIn.Visualizers.Graph.Layout
 {
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphMatcher.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphMatcher.cs
index 3dc739887c..781c4a6a98 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphMatcher.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Layout/GraphMatcher.cs
@@ -6,7 +6,7 @@
 // </file>
 using System;
 using System.Collections.Generic;
-using Debugger.AddIn.Visualizers.Graph.Utils;
+using Debugger.AddIn.Visualizers.Utils;
 
 namespace Debugger.AddIn.Visualizers.Graph.Layout
 {
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs
index 87ca058879..74a111a1aa 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs
@@ -10,7 +10,7 @@ using ICSharpCode.SharpDevelop.Services;
 using Debugger;
 using Debugger.MetaData;
 using Debugger.Expressions;
-using Debugger.AddIn.Visualizers.Graph.Utils;
+using Debugger.AddIn.Visualizers.Utils;
 
 namespace Debugger.AddIn.Visualizers.Graph
 {
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/DebuggerHelpers.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/DebuggerHelpers.cs
similarity index 92%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/DebuggerHelpers.cs
rename to src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/DebuggerHelpers.cs
index 49886eac20..9d426c2aa9 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/DebuggerHelpers.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/DebuggerHelpers.cs
@@ -7,7 +7,7 @@
 using System;
 using Debugger.Wrappers.CorDebug;
 
-namespace Debugger.AddIn.Visualizers.Graph.Utils
+namespace Debugger.AddIn.Visualizers.Utils
 {
 	public static class DebuggerHelpers
 	{
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/DictionaryExtensions.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/DictionaryExtensions.cs
similarity index 93%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/DictionaryExtensions.cs
rename to src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/DictionaryExtensions.cs
index cc91a85fd5..2e544ea25d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/DictionaryExtensions.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/DictionaryExtensions.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Debugger.AddIn.Visualizers.Graph.Utils
+namespace Debugger.AddIn.Visualizers.Utils
 {
 	public static class DictionaryExtensions
 	{
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/Lookup.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/Lookup.cs
similarity index 95%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/Lookup.cs
rename to src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/Lookup.cs
index eff669edc9..2851a2d7cd 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/Lookup.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/Lookup.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Debugger.AddIn.Visualizers.Graph.Utils
+namespace Debugger.AddIn.Visualizers.Utils
 {
 	/// <summary>
 	/// Same like Dictionary, but can store multiple values for one key.
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/LookupValueCollection.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/LookupValueCollection.cs
similarity index 89%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/LookupValueCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/LookupValueCollection.cs
index 4f63814918..16b0d9da1c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Graph/Utils/LookupValueCollection.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/Utils/LookupValueCollection.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Debugger.AddIn.Visualizers.Graph.Utils
+namespace Debugger.AddIn.Visualizers.Utils
 {
 	/// <summary>
 	/// A collection of values for one key in the Lookup class.