diff --git a/Perspex.sln b/Perspex.sln
index 93b8598998..5cf4ccc194 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -90,7 +90,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Cairo", "src\Gtk\Pe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.ReactiveUI", "src\Perspex.ReactiveUI\Perspex.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Markup.Xaml.Schema.Generator", "src\Markup\Perspex.Markup.Xaml.Schema.Generator\Perspex.Markup.Xaml.Schema.Generator.csproj", "{5658F6CE-8F9D-4A8F-AF8F-0A2D0B7A2749}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Markup.Xaml.Schema.Generator", "src\Tools\Perspex.Markup.Xaml.Schema.Generator\Perspex.Markup.Xaml.Schema.Generator.csproj", "{5658F6CE-8F9D-4A8F-AF8F-0A2D0B7A2749}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{20A6D2B6-5A5E-47B8-8BAB-86E296E53336}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -240,6 +242,6 @@ Global
 		{78CAFE33-DBEB-4132-8A28-81CFE8A4933C} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{54F237D5-A70A-4752-9656-0C70B1A7B047} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
 		{FB05AC90-89BA-4F2F-A924-F37875FB547C} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
-		{5658F6CE-8F9D-4A8F-AF8F-0A2D0B7A2749} = {8B6A8209-894F-4BA1-B880-965FD453982C}
+		{5658F6CE-8F9D-4A8F-AF8F-0A2D0B7A2749} = {20A6D2B6-5A5E-47B8-8BAB-86E296E53336}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/.gitignore b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/.gitignore
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/.gitignore
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/.gitignore
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/App.config b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/App.config
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/App.config
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/App.config
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/CSharpClassTest.vstemplate b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/CSharpClassTest.vstemplate
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/CSharpClassTest.vstemplate
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/CSharpClassTest.vstemplate
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/Perspex.Markup.Xaml.Schema.Generator.csproj b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/Perspex.Markup.Xaml.Schema.Generator.csproj
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/Perspex.Markup.Xaml.Schema.Generator.csproj
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/Perspex.Markup.Xaml.Schema.Generator.csproj
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/Program.cs b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/Program.cs
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/Program.cs
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/Program.cs
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/Properties/AssemblyInfo.cs b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/Properties/AssemblyInfo.cs
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/Properties/AssemblyInfo.cs
diff --git a/src/Markup/Perspex.Markup.Xaml.Schema.Generator/Test.xml b/src/Tools/Perspex.Markup.Xaml.Schema.Generator/Test.xml
similarity index 100%
rename from src/Markup/Perspex.Markup.Xaml.Schema.Generator/Test.xml
rename to src/Tools/Perspex.Markup.Xaml.Schema.Generator/Test.xml