diff --git a/Avalonia/Avalonia.csproj b/Controls/Avalonia/Avalonia.csproj
similarity index 100%
rename from Avalonia/Avalonia.csproj
rename to Controls/Avalonia/Avalonia.csproj
diff --git a/Avalonia/ContentDialog/ContentDialog.cs b/Controls/Avalonia/ContentDialog/ContentDialog.cs
similarity index 100%
rename from Avalonia/ContentDialog/ContentDialog.cs
rename to Controls/Avalonia/ContentDialog/ContentDialog.cs
diff --git a/Avalonia/Frame/Frame.cs b/Controls/Avalonia/Frame/Frame.cs
similarity index 100%
rename from Avalonia/Frame/Frame.cs
rename to Controls/Avalonia/Frame/Frame.cs
diff --git a/Avalonia/NavigationView/NavigationView.cs b/Controls/Avalonia/NavigationView/NavigationView.cs
similarity index 100%
rename from Avalonia/NavigationView/NavigationView.cs
rename to Controls/Avalonia/NavigationView/NavigationView.cs
diff --git a/Avalonia/NavigationView/NavigationViewItem.cs b/Controls/Avalonia/NavigationView/NavigationViewItem.cs
similarity index 100%
rename from Avalonia/NavigationView/NavigationViewItem.cs
rename to Controls/Avalonia/NavigationView/NavigationViewItem.cs
diff --git a/Avalonia/Properties/Assembly.cs b/Controls/Avalonia/Properties/Assembly.cs
similarity index 100%
rename from Avalonia/Properties/Assembly.cs
rename to Controls/Avalonia/Properties/Assembly.cs
diff --git a/Toolkit.sln b/Toolkit.sln
index 50b1ec4..a7ddc12 100644
--- a/Toolkit.sln
+++ b/Toolkit.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia", "Framework\Avalo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{75BCD316-4955-4CA1-9CB3-F4A65495F5F2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia", "Avalonia\Avalonia.csproj", "{13DE3ACD-FEEE-4DDF-B020-6A566701112D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia", "Controls\Avalonia\Avalonia.csproj", "{13B0F7A2-47A7-45F5-ACC6-414CB4C59F2B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,10 +27,10 @@ Global
 		{73182B24-1F04-40B5-9C26-4BDD269E998D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73182B24-1F04-40B5-9C26-4BDD269E998D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73182B24-1F04-40B5-9C26-4BDD269E998D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13DE3ACD-FEEE-4DDF-B020-6A566701112D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13DE3ACD-FEEE-4DDF-B020-6A566701112D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13DE3ACD-FEEE-4DDF-B020-6A566701112D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13DE3ACD-FEEE-4DDF-B020-6A566701112D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13B0F7A2-47A7-45F5-ACC6-414CB4C59F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13B0F7A2-47A7-45F5-ACC6-414CB4C59F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13B0F7A2-47A7-45F5-ACC6-414CB4C59F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13B0F7A2-47A7-45F5-ACC6-414CB4C59F2B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -38,7 +38,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{9931E7E1-566A-4306-B243-FEC67128E9B7} = {B8DD190E-DB19-479B-B614-6160932C2AB6}
 		{73182B24-1F04-40B5-9C26-4BDD269E998D} = {B8DD190E-DB19-479B-B614-6160932C2AB6}
-		{13DE3ACD-FEEE-4DDF-B020-6A566701112D} = {75BCD316-4955-4CA1-9CB3-F4A65495F5F2}
+		{13B0F7A2-47A7-45F5-ACC6-414CB4C59F2B} = {75BCD316-4955-4CA1-9CB3-F4A65495F5F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A526C950-2F32-44D7-BF18-331B6B38D52D}