From 6956c733fa0211dc2db0b1632e4ed9118ea89e33 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 10 Dec 2020 16:16:28 -0500
Subject: [PATCH 01/84] Move some controls to Primitives.

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  4 ++
 .../AdaptiveGridView.Properties.cs            |  0
 .../AdaptiveGridView/AdaptiveGridView.cs      |  0
 .../AdaptiveHeightValueConverter.cs           |  0
 .../DockPanel/Dock.cs                         |  0
 .../DockPanel/DockPanel.Properties.cs         |  0
 .../DockPanel/DockPanel.cs                    |  0
 ....Toolkit.Uwp.UI.Controls.Primitives.csproj | 46 +++++++++++++++++++
 ....UI.Controls.Primitives.csproj.DotSettings |  3 ++
 .../Properties/AssemblyInfo.cs                | 13 ++++++
 .../StaggeredPanel/StaggeredPanel.cs          |  0
 .../SwitchPresenter/Case.cs                   |  0
 .../SwitchPresenter/CaseCollection.cs         |  0
 .../SwitchPresenter/SwitchPresenter.cs        |  0
 .../UniformGrid/TakenSpotsReferenceHolder.cs  |  0
 .../UniformGrid/UniformGrid.Helpers.cs        |  0
 .../UniformGrid/UniformGrid.Properties.cs     |  0
 .../UniformGrid/UniformGrid.cs                |  0
 .../VisualStudioToolsManifest.xml             | 11 +++++
 .../WrapPanel/StretchChild.cs                 |  0
 .../WrapPanel/WrapPanel.Data.cs               |  0
 .../WrapPanel/WrapPanel.cs                    |  0
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |  8 +---
 ...Toolkit.Uwp.UI.Controls.csproj.DotSettings |  1 -
 .../VisualStudioToolsManifest.xml             |  5 --
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  4 ++
 Windows Community Toolkit.sln                 | 23 ++++++++++
 27 files changed, 106 insertions(+), 12 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/AdaptiveGridView/AdaptiveGridView.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/AdaptiveGridView/AdaptiveGridView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/AdaptiveGridView/AdaptiveHeightValueConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/DockPanel/Dock.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/DockPanel/DockPanel.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/DockPanel/DockPanel.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredPanel/StaggeredPanel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/SwitchPresenter/Case.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/SwitchPresenter/CaseCollection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/SwitchPresenter/SwitchPresenter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/TakenSpotsReferenceHolder.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/UniformGrid.Helpers.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/UniformGrid.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/UniformGrid.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapPanel/StretchChild.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapPanel/WrapPanel.Data.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapPanel/WrapPanel.cs (100%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index d89fc02aa6b..e0bb1401acd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1498,6 +1498,10 @@
       <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj">
+      <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveHeightValueConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveHeightValueConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/Dock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/Dock.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
new file mode 100644
index 00000000000..a8f1f2508b6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+	<PropertyGroup>
+		<TargetFramework>uap10.0.17763</TargetFramework>
+		<Title>Windows Community Toolkit Controls</Title>
+		<Description>
+			This library provides XAML templated controls. It is part of the Windows Community Toolkit.
+
+			Controls:
+			- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
+			- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
+			- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
+			- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
+			- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
+		</Description>
+		<PackageTags>UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered UniformGrid Uniform Grid</PackageTags>
+		<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
+		<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+		<LangVersion>8.0</LangVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
+		<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
+		<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
+	</ItemGroup>
+
+	<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
+
+	<!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
+	<Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
+		<ItemGroup>
+			<GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
+		</ItemGroup>
+		<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
+		<Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
+	</Target>
+</Project>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings
new file mode 100644
index 00000000000..195f02ce511
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=adaptivegridview/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..cd5fbb60e47
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Resources;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: InternalsVisibleTo("UnitTests.UWP")]
+[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")]
+[assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/StaggeredPanel/StaggeredPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/StaggeredPanel/StaggeredPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/TakenSpotsReferenceHolder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/TakenSpotsReferenceHolder.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Helpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
new file mode 100644
index 00000000000..fa884a8a5e8
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -0,0 +1,11 @@
+<FileList>
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.dll">
+    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
+    </ToolboxItems>
+  </File>
+</FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/StretchChild.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/StretchChild.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 793d9571766..884d8427e87 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -7,12 +7,10 @@
       This library provides XAML templated controls. It is part of the Windows Community Toolkit.
 
       Controls:
-        - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
         - BladeView: Provides a horizontal collection of blades for master-detail scenarios.
         - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
         - Carousel: Presents items in a carousel control.
         - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version.
-        - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
         - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
         - Expander: Expander allows user to show/hide content based on a boolean state.
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
@@ -32,14 +30,11 @@
         - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
         - RotatorTile: Rotates through a set of items one-by-one like a live-tile.
         - ScrollHeader: A UI control that works as a ListView or GridView header control with quick return, sticky, and fade behavior.
-        - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
         - TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter.
         - TileControl: A ContentControl that show an image repeated many times.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
-        - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
-        - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Range WrapPanel Adaptive Markdown BladeView Blade CameraPreview Camera Carousel DockPanel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader StaggeredPanel Staggered Tile Tokenizing TextBox UniformGrid Uniform Grid</PackageTags>
+    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
@@ -52,6 +47,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
index 8a263d98309..fefa011eb69 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
@@ -1,5 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=adaptivegridview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=bladeview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=dropshadowpanel/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gridsplitter/@EntryIndexedValue">True</s:Boolean>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
index b952e2ec958..43ffe06715a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
@@ -1,13 +1,11 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Expander" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
@@ -30,11 +28,8 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index b7adf88cfc3..10e4e0b4cd1 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -238,6 +238,10 @@
       <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
       <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj">
+      <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 17df1370cd3..d9b251ac032 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -135,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITes
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -956,6 +958,26 @@ Global
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.Build.0 = Release|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.ActiveCfg = Release|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.Build.0 = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x64.Build.0 = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x86.Build.0 = Debug|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM.Build.0 = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM64.Build.0 = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.ActiveCfg = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.Build.0 = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.ActiveCfg = Release|Any CPU
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -997,6 +1019,7 @@ Global
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From e885c1014da4c149ad9fc2ecef35945edc990fa1 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 10 Dec 2020 16:26:45 -0500
Subject: [PATCH 02/84] Update Primiative controls ns

---
 .../Pages/About.xaml                          |  3 ++-
 .../Pages/SampleController.xaml               |  3 ++-
 .../AdaptiveGridViewCode.bind                 |  2 +-
 .../AdaptiveGridViewPage.xaml.cs              |  2 +-
 .../SamplePages/DockPanel/DockPanel.bind      |  2 +-
 .../SamplePages/DockPanel/DockPanelPage.xaml  |  2 +-
 .../DockPanel/DockPanelPage.xaml.cs           |  2 +-
 .../HeaderedItemsControlXaml.bind             |  3 ++-
 .../SamplePages/LiveTile/LiveTilePage.xaml    |  2 +-
 .../SamplePages/Loading/LoadingCode.bind      |  3 ++-
 .../SamplePages/Loading/LoadingPage.xaml      |  3 ++-
 .../SamplePages/Loading/LoadingPage.xaml.cs   |  1 +
 .../StaggeredPanel/StaggeredPanel.bind        |  2 +-
 .../StaggeredPanel/StaggeredPanelPage.xaml    |  2 +-
 .../ThemeListener/ThemeListenerPage.xaml      |  2 +-
 .../UniformGrid/UniformGridXaml.bind          |  2 +-
 .../WeatherLiveTileAndToastPage.xaml          |  2 +-
 .../SamplePages/WrapPanel/WrapPanel.bind      |  2 +-
 .../SamplePages/WrapPanel/WrapPanelPage.xaml  |  2 +-
 .../WrapPanel/WrapPanelPage.xaml.cs           |  2 +-
 .../AdaptiveGridView.Properties.cs            |  2 +-
 .../AdaptiveGridView/AdaptiveGridView.cs      |  2 +-
 .../AdaptiveHeightValueConverter.cs           |  2 +-
 .../DockPanel/Dock.cs                         |  2 +-
 .../DockPanel/DockPanel.Properties.cs         |  2 +-
 .../DockPanel/DockPanel.cs                    |  2 +-
 .../StaggeredPanel/StaggeredPanel.cs          |  2 +-
 .../SwitchPresenter/Case.cs                   |  2 +-
 .../SwitchPresenter/CaseCollection.cs         |  2 +-
 .../SwitchPresenter/SwitchPresenter.cs        |  2 +-
 .../UniformGrid/TakenSpotsReferenceHolder.cs  |  2 +-
 .../UniformGrid/UniformGrid.Helpers.cs        |  2 +-
 .../UniformGrid/UniformGrid.Properties.cs     |  2 +-
 .../UniformGrid/UniformGrid.cs                |  2 +-
 .../VisualStudioToolsManifest.xml             | 10 +++++-----
 .../WrapPanel/StretchChild.cs                 |  2 +-
 .../WrapPanel/WrapPanel.Data.cs               |  2 +-
 .../WrapPanel/WrapPanel.cs                    |  2 +-
 .../ColorPicker/ColorPicker.xaml              | 19 ++++++++++---------
 .../Menu/Menu.Events.cs                       |  1 +
 .../Menu/Menu.cs                              |  1 +
 .../Menu/Menu.xaml                            |  4 ++--
 .../TokenizingTextBox/TokenizingTextBox.xaml  |  3 ++-
 .../Test_AdaptiveHeightValueConverter.cs      |  2 +-
 .../Controls/Test_UniformGrid_AutoLayout.cs   | 18 +++++++++---------
 .../Controls/Test_UniformGrid_Dimensions.cs   | 14 +++++++-------
 .../UI/Controls/Test_UniformGrid_FreeSpots.cs |  2 +-
 .../Test_UniformGrid_RowColDefinitions.cs     | 18 +++++++++---------
 UnitTests/UnitTests.UWP/UnitTestApp.xaml      |  2 +-
 .../XamlIslandsTest_WrapPanel.cs              |  2 +-
 50 files changed, 92 insertions(+), 82 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
index 0607623cd30..8d4d4d8ea2a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
@@ -4,6 +4,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
@@ -61,7 +62,7 @@
         </DataTemplate>
 
         <ItemsPanelTemplate x:Key="ItemsWrapGridHorizontalTemplate">
-            <controls:WrapPanel Orientation="Horizontal"></controls:WrapPanel>
+            <primitiveControls:WrapPanel Orientation="Horizontal"></primitiveControls:WrapPanel>
         </ItemsPanelTemplate>
     </Page.Resources>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
index f0ad630fd1a..9848a797f25 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
@@ -3,6 +3,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:controlsLocal="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
@@ -125,7 +126,7 @@
                                       Margin="10,10,0,0">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <controls:WrapPanel />
+                                    <primitiveControls:WrapPanel />
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind
index 8e2fc5394c8..b85e74eb7f2 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind
@@ -1,7 +1,7 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
index 45e6f47a270..5cdcd94b3b0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
@@ -6,7 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.Toolkit.Uwp.SampleApp.Data;
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Popups;
 using Windows.UI.Xaml;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind
index 169df1ab3e4..760fd3c287f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind
@@ -1,7 +1,7 @@
 <Page
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml
index 2251bad21c0..91ac1ae4447 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.DockPanelPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
index f85da6df97a..6dad8d2672e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI;
 using Windows.UI.Xaml;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind
index c34de4be9b2..3ea40758fe9 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind
@@ -2,6 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="Page"
@@ -28,7 +29,7 @@
       </controls:HeaderedItemsControl.HeaderTemplate>
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
-          <controls:WrapPanel />
+          <primitiveControls:WrapPanel />
         </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
       <ItemsControl.ItemTemplate>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml
index 5391882742c..c03056d33d5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml
@@ -4,7 +4,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:visualizer="using:NotificationsVisualizerLibrary"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
index 3f731b56e19..0950ecfc643 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
@@ -3,6 +3,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:brushes="using:Microsoft.Toolkit.Uwp.UI.Media"
       mc:Ignorable="d">
 
@@ -50,7 +51,7 @@
           <Paragraph>His audiam deserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu.</Paragraph>
         </RichTextBlock>
 
-        <controls:AdaptiveGridView
+        <primitiveControls:AdaptiveGridView
           Margin="0,12,0,0"
           x:Name="AdaptiveGridViewControl"
           ItemHeight="200"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml
index 5c43915f8bf..03020a1c29f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml
@@ -4,13 +4,14 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
     <!-- Control References for Xaml Loader to have access to controls -->
     <Grid>
         <ScrollViewer>
             <StackPanel Margin="20">
-                <controls:AdaptiveGridView/>
+                <primitiveControls:AdaptiveGridView/>
             </StackPanel>
         </ScrollViewer>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
index a6b3b57aa53..47c4179d850 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -4,6 +4,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind
index d39434e7e77..69fa097aa42 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind
@@ -2,7 +2,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml
index da5ae9e798d..9d40597e74e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
     mc:Ignorable="d">
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml
index 39d02c41c6a..ef6d2aeb989 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
     mc:Ignorable="d">
 
     <controls:WrapPanel
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind
index d7f0fac6103..1b6cdb90a92 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind
@@ -1,7 +1,7 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml
index ed96ad629fb..71d1e315b0d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml
@@ -4,7 +4,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:visualizer="using:NotificationsVisualizerLibrary"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
index bb3f26c22d7..c26c7ac2271 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
@@ -2,7 +2,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
   <Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
index 4ea1953192d..2f408f72cc3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
     <!-- Shallow Copy -->
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
index 2d7825629d0..9607ba4b3c3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.ObjectModel;
 using Microsoft.Toolkit.Uwp.SampleApp.Data;
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
index a93a4287263..8f0d5639d5c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
index 7b77af7119e..05842e3d73a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
index e2bbba9044e..4c9fd299914 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     internal class AdaptiveHeightValueConverter : IValueConverter
     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
index 8c8afb44951..d256fe88e1c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// Specifies the Dock position of a child element that is inside a <see cref="DockPanel"/>.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
index 72931ee3d90..3d7cbe077c8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
@@ -4,7 +4,7 @@
 
 using Windows.UI.Xaml;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
index 8f395f01bf1..9aeb4155a8f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
index e148430bb91..0299df1d9c5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// Arranges child elements into a staggered grid pattern where items are added to the column that has used least amount of space.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
index 7829abc2a8f..e9162b58f60 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
@@ -6,7 +6,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// <see cref="Case"/> is the value container for the <see cref="SwitchPresenter"/>.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
index d1f3ee96187..9dafd3604ea 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
@@ -6,7 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// An collection of <see cref="Case"/> to help with XAML interop.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
index 0d1202e0bb7..2c07fcdb905 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// The <see cref="SwitchPresenter"/> is a <see cref="ContentPresenter"/> which can allow a developer to mimic a <c>switch</c> statement within XAML.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
index 9474082e25e..e8dda6e0094 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
@@ -6,7 +6,7 @@
 using System.Drawing;
 using Microsoft.Toolkit.Diagnostics;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// Referencable class object we can use to have a reference shared between
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
index 9d16b5cd986..0130b7f16ee 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// The UniformGrid control presents information within a Grid with even spacing.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
index 9bcf6286416..5a29c496106 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// The UniformGrid spaces items evenly.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
index a638a1db26c..ac141216249 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// The UniformGrid control presents information within a Grid with even spacing.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index fa884a8a5e8..42613caa37c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -1,11 +1,11 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.AdaptiveGridView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DockPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.StaggeredPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.UniformGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.WrapPanel" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
index fba7e723a83..2e6aed4b146 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// Options for how to calculate the layout of <see cref="Windows.UI.Xaml.Controls.WrapGrid"/> items.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
index c3112d9bd96..764339bf1ff 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
@@ -8,7 +8,7 @@
 using Windows.Foundation;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is received a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
index b416c50cba4..e94664f252d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
 {
     /// <summary>
     /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width / max height is reached a new row (in case of horizontal) or column (in case of vertical) is created to fit new controls.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
index 3e32331d4d7..bc6b698ff12 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
@@ -91,11 +92,11 @@
                     <FontIcon Glyph="&#xE9E9;" />
                 </ListBoxItem>
             </ListBox>
-            <controls:SwitchPresenter x:Name="ContentContainer"
+            <primitiveControls:SwitchPresenter x:Name="ContentContainer"
                                       Grid.Row="1"
                                       Margin="12"
                                       Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
-                <controls:Case Value="SpectrumListBoxItem">
+                <primitiveControls:Case Value="SpectrumListBoxItem">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"
@@ -149,8 +150,8 @@
                                                       DefaultForeground="{ThemeResource TextControlForeground}"
                                                       Orientation="Vertical" />
                     </Grid>
-                </controls:Case>
-                <controls:Case Value="PaletteListBoxItem">
+                </primitiveControls:Case>
+                <primitiveControls:Case Value="PaletteListBoxItem">
                     <GridView Margin="0"
                               Padding="0"
                               ItemContainerStyle="{StaticResource PaletteGridViewItemStyle}"
@@ -160,7 +161,7 @@
                               Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
                         <GridView.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
+                                <primitiveControls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
                                                       Columns="{Binding (ex:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}" />
                             </ItemsPanelTemplate>
                         </GridView.ItemsPanel>
@@ -177,8 +178,8 @@
                             </DataTemplate>
                         </GridView.ItemTemplate>
                     </GridView>
-                </controls:Case>
-                <controls:Case Value="ChannelsListBoxItem">
+                </primitiveControls:Case>
+                <primitiveControls:Case Value="ChannelsListBoxItem">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="30" />
@@ -375,8 +376,8 @@
                                                       AutomationProperties.Name="Alpha Channel"
                                                       DefaultForeground="{ThemeResource TextControlForeground}" />
                     </Grid>
-                </controls:Case>
-            </controls:SwitchPresenter>
+                </primitiveControls:Case>
+            </primitiveControls:SwitchPresenter>
 
             <!--  TODO: Expose resources for the height of this part and the margin  -->
             <Grid x:Name="ColorPreviewGrid"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
index 390a385c48a..395cf05a73f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.Foundation;
 using Windows.System;
 using Windows.UI.Core;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
index 93e6fd11e18..6c9ec70e660 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
index e28da50ceec..665ce762aef 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
@@ -86,7 +86,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <local:WrapPanel />
+                    <controls:WrapPanel />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
index 8245896155c..341c88373e6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
@@ -51,7 +52,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <controls:WrapPanel ex:FrameworkElementExtensions.AncestorType="controls:TokenizingTextBox"
+                    <primitiveControls:WrapPanel ex:FrameworkElementExtensions.AncestorType="controls:TokenizingTextBox"
                                         HorizontalSpacing="{Binding (ex:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
                                         VerticalSpacing="{Binding (ex:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
                                         StretchChild="Last"/>
diff --git a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs
index 9d10b9f199e..15147e4a048 100644
--- a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs
+++ b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 using Windows.UI.Xaml;
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
index b24c51b2439..8616f7f19b5 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
@@ -24,7 +24,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSingle()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1""/>
@@ -86,7 +86,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementZeroZeroSpecial()
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:ex=""using:Microsoft.Toolkit.Uwp.UI.Extensions""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -147,7 +147,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSquare()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1"" Grid.RowSpan=""2"" Grid.ColumnSpan=""2""/>
@@ -207,7 +207,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1"" Grid.RowSpan=""2"" x:Name=""OurItem""/>
@@ -254,7 +254,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -301,7 +301,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.ColumnSpan=""2"" x:Name=""OurItem""/>
@@ -348,7 +348,7 @@ public void Test_UniformGrid_AutoLayout_LargeElement()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border Grid.ColumnSpan=""2"" Grid.RowSpan=""2""/>
         <Border/>
@@ -396,7 +396,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1"" Grid.ColumnSpan=""2"" x:Name=""OurItem""/>
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
index a8e43606e31..6e280cfdff9 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
@@ -22,7 +22,7 @@ public void Test_UniformGrid_GetDimensions_NoElements()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
@@ -50,7 +50,7 @@ public void Test_UniformGrid_GetDimensions_AllVisible()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -86,7 +86,7 @@ public void Test_UniformGrid_GetDimensions_SomeVisible()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Visibility=""Collapsed""/>
@@ -127,7 +127,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumn()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -163,7 +163,7 @@ public void Test_UniformGrid_GetDimensions_ElementLarger()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -199,7 +199,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumnEqualsColumns()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
index 9b6bfb31cd5..b0ba511535e 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
@@ -4,7 +4,7 @@
 
 using System.Linq;
 using Microsoft.Toolkit.Extensions;
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
index bf6539aea5f..8fbcfb323b3 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
@@ -21,7 +21,7 @@ public void Test_UniformGrid_SetupRowDefinitions_AllAutomatic()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -92,7 +92,7 @@ public void Test_UniformGrid_SetupRowDefinitions_FirstFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <controls:UniformGrid.RowDefinitions>
             <RowDefinition Height=""48""/>
@@ -187,7 +187,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"" Rows=""5"">
         <controls:UniformGrid.RowDefinitions>
             <RowDefinition Height=""48""/>
@@ -287,7 +287,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleAndEndFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"" Rows=""5"">
         <controls:UniformGrid.RowDefinitions>
             <RowDefinition/>
@@ -422,7 +422,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_AllAutomatic()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -493,7 +493,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <controls:UniformGrid.ColumnDefinitions>
             <ColumnDefinition Width=""48""/>
@@ -588,7 +588,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_MiddleFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"" Columns=""5"">
         <controls:UniformGrid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -690,7 +690,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstAndEndFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
     <controls:UniformGrid x:Name=""UniformGrid"" Columns=""5"">
         <controls:UniformGrid.ColumnDefinitions>
             <ColumnDefinition Width=""48""/>
diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
index 38a0254edea..8e4bb57cb53 100644
--- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml
+++ b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="UnitTests.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
              xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
              xmlns:helpers="using:UnitTests.Extensions.Helpers"
              xmlns:unitTestExtensions="using:UnitTests.Extensions"
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs
index fb54c623398..4458526f7df 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs
@@ -25,7 +25,7 @@ await App.Dispatcher.EnqueueAsync(() =>
             {
                 var xamlItemsPanelTemplate = @"<ItemsPanelTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' 
                                                  xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-                                                 xmlns:controls='using:Microsoft.Toolkit.Uwp.UI.Controls'>
+                                                 xmlns:controls='using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives'>
                       <controls:WrapPanel Padding='0,0,0,0'
                                           VerticalSpacing='5'
                                           HorizontalSpacing='5' />

From 2fdcbe6bfde8904b6b2dfdc7f66a898666dc241a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 6 Jan 2021 17:13:30 -0500
Subject: [PATCH 03/84] Apply change for platform uno compatiblity #3651

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index a8f1f2508b6..3cb5a2dff4e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
 	<PropertyGroup>
-		<TargetFramework>uap10.0.17763</TargetFramework>
+		<TargetFrameworks>uap10.0.17763</TargetFrameworks>
 		<Title>Windows Community Toolkit Controls</Title>
 		<Description>
 			This library provides XAML templated controls. It is part of the Windows Community Toolkit.

From 7431e17c194d38e7bf0ce38030f633eab659d5ad Mon Sep 17 00:00:00 2001
From: Rosario Pulella <Rosariopulella@gmail.com>
Date: Fri, 8 Jan 2021 13:50:51 -0500
Subject: [PATCH 04/84] Update
 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index 3cb5a2dff4e..37c86715cf5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -4,7 +4,7 @@
 		<TargetFrameworks>uap10.0.17763</TargetFrameworks>
 		<Title>Windows Community Toolkit Controls</Title>
 		<Description>
-			This library provides XAML templated controls. It is part of the Windows Community Toolkit.
+			This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit.
 
 			Controls:
 			- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.

From 1e34abfc40f0414a55c8161d0ccdfb5b47762f48 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 8 Jan 2021 13:58:34 -0500
Subject: [PATCH 05/84] Remove System.ValueTuple from Controls.Primitives

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index 37c86715cf5..9f20cac2069 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -19,10 +19,6 @@
 		<LangVersion>8.0</LangVersion>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
 		<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />

From ac71f641111803ea004ea1e5b7d0163f821f302f Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 8 Jan 2021 14:01:47 -0500
Subject: [PATCH 06/84] Added SwitchPresenter in description of
 Control.Primitives project

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index 9f20cac2069..c000c19e1c1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -10,6 +10,7 @@
 			- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
 			- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
 			- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
+			- SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value.
 			- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
 			- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
 		</Description>

From b6bc173b4bdcf3f15c0c4c08c1f49bc8b72659c5 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 8 Jan 2021 14:06:10 -0500
Subject: [PATCH 07/84] Revert "Update Primiative controls ns"

This reverts commit e885c1014da4c149ad9fc2ecef35945edc990fa1.
---
 .../Pages/About.xaml                          |  3 +--
 .../Pages/SampleController.xaml               |  3 +--
 .../AdaptiveGridViewCode.bind                 |  2 +-
 .../AdaptiveGridViewPage.xaml.cs              |  2 +-
 .../SamplePages/DockPanel/DockPanel.bind      |  2 +-
 .../SamplePages/DockPanel/DockPanelPage.xaml  |  2 +-
 .../DockPanel/DockPanelPage.xaml.cs           |  2 +-
 .../HeaderedItemsControlXaml.bind             |  3 +--
 .../SamplePages/LiveTile/LiveTilePage.xaml    |  2 +-
 .../SamplePages/Loading/LoadingCode.bind      |  3 +--
 .../SamplePages/Loading/LoadingPage.xaml      |  3 +--
 .../SamplePages/Loading/LoadingPage.xaml.cs   |  1 -
 .../StaggeredPanel/StaggeredPanel.bind        |  2 +-
 .../StaggeredPanel/StaggeredPanelPage.xaml    |  2 +-
 .../ThemeListener/ThemeListenerPage.xaml      |  2 +-
 .../UniformGrid/UniformGridXaml.bind          |  2 +-
 .../WeatherLiveTileAndToastPage.xaml          |  2 +-
 .../SamplePages/WrapPanel/WrapPanel.bind      |  2 +-
 .../SamplePages/WrapPanel/WrapPanelPage.xaml  |  2 +-
 .../WrapPanel/WrapPanelPage.xaml.cs           |  2 +-
 .../AdaptiveGridView.Properties.cs            |  2 +-
 .../AdaptiveGridView/AdaptiveGridView.cs      |  2 +-
 .../AdaptiveHeightValueConverter.cs           |  2 +-
 .../DockPanel/Dock.cs                         |  2 +-
 .../DockPanel/DockPanel.Properties.cs         |  2 +-
 .../DockPanel/DockPanel.cs                    |  2 +-
 .../StaggeredPanel/StaggeredPanel.cs          |  2 +-
 .../SwitchPresenter/Case.cs                   |  2 +-
 .../SwitchPresenter/CaseCollection.cs         |  2 +-
 .../SwitchPresenter/SwitchPresenter.cs        |  2 +-
 .../UniformGrid/TakenSpotsReferenceHolder.cs  |  2 +-
 .../UniformGrid/UniformGrid.Helpers.cs        |  2 +-
 .../UniformGrid/UniformGrid.Properties.cs     |  2 +-
 .../UniformGrid/UniformGrid.cs                |  2 +-
 .../VisualStudioToolsManifest.xml             | 10 +++++-----
 .../WrapPanel/StretchChild.cs                 |  2 +-
 .../WrapPanel/WrapPanel.Data.cs               |  2 +-
 .../WrapPanel/WrapPanel.cs                    |  2 +-
 .../ColorPicker/ColorPicker.xaml              | 19 +++++++++----------
 .../Menu/Menu.Events.cs                       |  1 -
 .../Menu/Menu.cs                              |  1 -
 .../Menu/Menu.xaml                            |  4 ++--
 .../TokenizingTextBox/TokenizingTextBox.xaml  |  3 +--
 .../Test_AdaptiveHeightValueConverter.cs      |  2 +-
 .../Controls/Test_UniformGrid_AutoLayout.cs   | 18 +++++++++---------
 .../Controls/Test_UniformGrid_Dimensions.cs   | 14 +++++++-------
 .../UI/Controls/Test_UniformGrid_FreeSpots.cs |  2 +-
 .../Test_UniformGrid_RowColDefinitions.cs     | 18 +++++++++---------
 UnitTests/UnitTests.UWP/UnitTestApp.xaml      |  2 +-
 .../XamlIslandsTest_WrapPanel.cs              |  2 +-
 50 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
index 8d4d4d8ea2a..0607623cd30 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
@@ -4,7 +4,6 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
@@ -62,7 +61,7 @@
         </DataTemplate>
 
         <ItemsPanelTemplate x:Key="ItemsWrapGridHorizontalTemplate">
-            <primitiveControls:WrapPanel Orientation="Horizontal"></primitiveControls:WrapPanel>
+            <controls:WrapPanel Orientation="Horizontal"></controls:WrapPanel>
         </ItemsPanelTemplate>
     </Page.Resources>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
index 9848a797f25..f0ad630fd1a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml
@@ -3,7 +3,6 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:controlsLocal="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
@@ -126,7 +125,7 @@
                                       Margin="10,10,0,0">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <primitiveControls:WrapPanel />
+                                    <controls:WrapPanel />
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind
index b85e74eb7f2..8e2fc5394c8 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind
@@ -1,7 +1,7 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
index 5cdcd94b3b0..45e6f47a270 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs
@@ -6,7 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.Toolkit.Uwp.SampleApp.Data;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Popups;
 using Windows.UI.Xaml;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind
index 760fd3c287f..169df1ab3e4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind
@@ -1,7 +1,7 @@
 <Page
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml
index 91ac1ae4447..2251bad21c0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.DockPanelPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
index 6dad8d2672e..f85da6df97a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanelPage.xaml.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI;
 using Windows.UI.Xaml;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind
index 3ea40758fe9..c34de4be9b2 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedItemsControl/HeaderedItemsControlXaml.bind
@@ -2,7 +2,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="Page"
@@ -29,7 +28,7 @@
       </controls:HeaderedItemsControl.HeaderTemplate>
       <ItemsControl.ItemsPanel>
         <ItemsPanelTemplate>
-          <primitiveControls:WrapPanel />
+          <controls:WrapPanel />
         </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
       <ItemsControl.ItemTemplate>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml
index c03056d33d5..5391882742c 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml
@@ -4,7 +4,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:visualizer="using:NotificationsVisualizerLibrary"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
index 0950ecfc643..3f731b56e19 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind
@@ -3,7 +3,6 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:brushes="using:Microsoft.Toolkit.Uwp.UI.Media"
       mc:Ignorable="d">
 
@@ -51,7 +50,7 @@
           <Paragraph>His audiam deserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu.</Paragraph>
         </RichTextBlock>
 
-        <primitiveControls:AdaptiveGridView
+        <controls:AdaptiveGridView
           Margin="0,12,0,0"
           x:Name="AdaptiveGridViewControl"
           ItemHeight="200"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml
index 03020a1c29f..5c43915f8bf 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml
@@ -4,14 +4,13 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       mc:Ignorable="d">
 
     <!-- Control References for Xaml Loader to have access to controls -->
     <Grid>
         <ScrollViewer>
             <StackPanel Margin="20">
-                <primitiveControls:AdaptiveGridView/>
+                <controls:AdaptiveGridView/>
             </StackPanel>
         </ScrollViewer>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
index 47c4179d850..a6b3b57aa53 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs
@@ -4,7 +4,6 @@
 
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Uwp.UI.Controls;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind
index 69fa097aa42..d39434e7e77 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind
@@ -2,7 +2,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml
index 9d40597e74e..da5ae9e798d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d">
 
     <Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml
index ef6d2aeb989..39d02c41c6a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d">
 
     <controls:WrapPanel
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind
index 1b6cdb90a92..d7f0fac6103 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/UniformGrid/UniformGridXaml.bind
@@ -1,7 +1,7 @@
 <Page
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml
index 71d1e315b0d..ed96ad629fb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml
@@ -4,7 +4,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:visualizer="using:NotificationsVisualizerLibrary"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
     <Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
index c26c7ac2271..bb3f26c22d7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
@@ -2,7 +2,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
   <Page.Resources>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
index 2f408f72cc3..4ea1953192d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
     <!-- Shallow Copy -->
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
index 9607ba4b3c3..2d7825629d0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.ObjectModel;
 using Microsoft.Toolkit.Uwp.SampleApp.Data;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
index 8f0d5639d5c..a93a4287263 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
index 05842e3d73a..7b77af7119e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
index 4c9fd299914..e2bbba9044e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     internal class AdaptiveHeightValueConverter : IValueConverter
     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
index d256fe88e1c..8c8afb44951 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Specifies the Dock position of a child element that is inside a <see cref="DockPanel"/>.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
index 3d7cbe077c8..72931ee3d90 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs
@@ -4,7 +4,7 @@
 
 using Windows.UI.Xaml;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
index 9aeb4155a8f..8f395f01bf1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
index 0299df1d9c5..e148430bb91 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Arranges child elements into a staggered grid pattern where items are added to the column that has used least amount of space.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
index e9162b58f60..7829abc2a8f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs
@@ -6,7 +6,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// <see cref="Case"/> is the value container for the <see cref="SwitchPresenter"/>.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
index 9dafd3604ea..d1f3ee96187 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs
@@ -6,7 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// An collection of <see cref="Case"/> to help with XAML interop.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
index 2c07fcdb905..0d1202e0bb7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// The <see cref="SwitchPresenter"/> is a <see cref="ContentPresenter"/> which can allow a developer to mimic a <c>switch</c> statement within XAML.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
index e8dda6e0094..9474082e25e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs
@@ -6,7 +6,7 @@
 using System.Drawing;
 using Microsoft.Toolkit.Diagnostics;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Referencable class object we can use to have a reference shared between
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
index 0130b7f16ee..9d16b5cd986 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// The UniformGrid control presents information within a Grid with even spacing.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
index 5a29c496106..9bcf6286416 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs
@@ -8,7 +8,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// The UniformGrid spaces items evenly.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
index ac141216249..a638a1db26c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// The UniformGrid control presents information within a Grid with even spacing.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index 42613caa37c..fa884a8a5e8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -1,11 +1,11 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.AdaptiveGridView" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DockPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.StaggeredPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.UniformGrid" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Primitives.WrapPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
index 2e6aed4b146..fba7e723a83 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Options for how to calculate the layout of <see cref="Windows.UI.Xaml.Controls.WrapGrid"/> items.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
index 764339bf1ff..c3112d9bd96 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs
@@ -8,7 +8,7 @@
 using Windows.Foundation;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is received a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
index e94664f252d..b416c50cba4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width / max height is reached a new row (in case of horizontal) or column (in case of vertical) is created to fit new controls.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
index bc6b698ff12..3e32331d4d7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
@@ -92,11 +91,11 @@
                     <FontIcon Glyph="&#xE9E9;" />
                 </ListBoxItem>
             </ListBox>
-            <primitiveControls:SwitchPresenter x:Name="ContentContainer"
+            <controls:SwitchPresenter x:Name="ContentContainer"
                                       Grid.Row="1"
                                       Margin="12"
                                       Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
-                <primitiveControls:Case Value="SpectrumListBoxItem">
+                <controls:Case Value="SpectrumListBoxItem">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"
@@ -150,8 +149,8 @@
                                                       DefaultForeground="{ThemeResource TextControlForeground}"
                                                       Orientation="Vertical" />
                     </Grid>
-                </primitiveControls:Case>
-                <primitiveControls:Case Value="PaletteListBoxItem">
+                </controls:Case>
+                <controls:Case Value="PaletteListBoxItem">
                     <GridView Margin="0"
                               Padding="0"
                               ItemContainerStyle="{StaticResource PaletteGridViewItemStyle}"
@@ -161,7 +160,7 @@
                               Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
                         <GridView.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <primitiveControls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
+                                <controls:UniformGrid ex:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
                                                       Columns="{Binding (ex:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}" />
                             </ItemsPanelTemplate>
                         </GridView.ItemsPanel>
@@ -178,8 +177,8 @@
                             </DataTemplate>
                         </GridView.ItemTemplate>
                     </GridView>
-                </primitiveControls:Case>
-                <primitiveControls:Case Value="ChannelsListBoxItem">
+                </controls:Case>
+                <controls:Case Value="ChannelsListBoxItem">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="30" />
@@ -376,8 +375,8 @@
                                                       AutomationProperties.Name="Alpha Channel"
                                                       DefaultForeground="{ThemeResource TextControlForeground}" />
                     </Grid>
-                </primitiveControls:Case>
-            </primitiveControls:SwitchPresenter>
+                </controls:Case>
+            </controls:SwitchPresenter>
 
             <!--  TODO: Expose resources for the height of this part and the margin  -->
             <Grid x:Name="ColorPreviewGrid"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
index 395cf05a73f..390a385c48a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.Foundation;
 using Windows.System;
 using Windows.UI.Core;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
index 6c9ec70e660..93e6fd11e18 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
index 665ce762aef..e28da50ceec 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
@@ -86,7 +86,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <controls:WrapPanel />
+                    <local:WrapPanel />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
index 341c88373e6..8245896155c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
@@ -52,7 +51,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <primitiveControls:WrapPanel ex:FrameworkElementExtensions.AncestorType="controls:TokenizingTextBox"
+                    <controls:WrapPanel ex:FrameworkElementExtensions.AncestorType="controls:TokenizingTextBox"
                                         HorizontalSpacing="{Binding (ex:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
                                         VerticalSpacing="{Binding (ex:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
                                         StretchChild="Last"/>
diff --git a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs
index 15147e4a048..9d10b9f199e 100644
--- a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs
+++ b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 using Windows.UI.Xaml;
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
index 8616f7f19b5..b24c51b2439 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
@@ -24,7 +24,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSingle()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1""/>
@@ -86,7 +86,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementZeroZeroSpecial()
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:ex=""using:Microsoft.Toolkit.Uwp.UI.Extensions""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -147,7 +147,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSquare()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1"" Grid.RowSpan=""2"" Grid.ColumnSpan=""2""/>
@@ -207,7 +207,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1"" Grid.RowSpan=""2"" x:Name=""OurItem""/>
@@ -254,7 +254,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -301,7 +301,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.ColumnSpan=""2"" x:Name=""OurItem""/>
@@ -348,7 +348,7 @@ public void Test_UniformGrid_AutoLayout_LargeElement()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border Grid.ColumnSpan=""2"" Grid.RowSpan=""2""/>
         <Border/>
@@ -396,7 +396,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Grid.Row=""1"" Grid.Column=""1"" Grid.ColumnSpan=""2"" x:Name=""OurItem""/>
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
index 6e280cfdff9..a8e43606e31 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
@@ -22,7 +22,7 @@ public void Test_UniformGrid_GetDimensions_NoElements()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
     </controls:UniformGrid>
 </Page>") as FrameworkElement;
@@ -50,7 +50,7 @@ public void Test_UniformGrid_GetDimensions_AllVisible()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -86,7 +86,7 @@ public void Test_UniformGrid_GetDimensions_SomeVisible()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border Visibility=""Collapsed""/>
@@ -127,7 +127,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumn()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -163,7 +163,7 @@ public void Test_UniformGrid_GetDimensions_ElementLarger()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -199,7 +199,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumnEqualsColumns()
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
index b0ba511535e..9b6bfb31cd5 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
@@ -4,7 +4,7 @@
 
 using System.Linq;
 using Microsoft.Toolkit.Extensions;
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
index 8fbcfb323b3..bf6539aea5f 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
@@ -21,7 +21,7 @@ public void Test_UniformGrid_SetupRowDefinitions_AllAutomatic()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -92,7 +92,7 @@ public void Test_UniformGrid_SetupRowDefinitions_FirstFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <controls:UniformGrid.RowDefinitions>
             <RowDefinition Height=""48""/>
@@ -187,7 +187,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"" Rows=""5"">
         <controls:UniformGrid.RowDefinitions>
             <RowDefinition Height=""48""/>
@@ -287,7 +287,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleAndEndFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"" Rows=""5"">
         <controls:UniformGrid.RowDefinitions>
             <RowDefinition/>
@@ -422,7 +422,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_AllAutomatic()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <Border/>
         <Border/>
@@ -493,7 +493,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"">
         <controls:UniformGrid.ColumnDefinitions>
             <ColumnDefinition Width=""48""/>
@@ -588,7 +588,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_MiddleFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"" Columns=""5"">
         <controls:UniformGrid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -690,7 +690,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstAndEndFixed()
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"">
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
     <controls:UniformGrid x:Name=""UniformGrid"" Columns=""5"">
         <controls:UniformGrid.ColumnDefinitions>
             <ColumnDefinition Width=""48""/>
diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
index 8e4bb57cb53..38a0254edea 100644
--- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml
+++ b/UnitTests/UnitTests.UWP/UnitTestApp.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="UnitTests.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
+             xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
              xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
              xmlns:helpers="using:UnitTests.Extensions.Helpers"
              xmlns:unitTestExtensions="using:UnitTests.Extensions"
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs
index 4458526f7df..fb54c623398 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_WrapPanel.cs
@@ -25,7 +25,7 @@ await App.Dispatcher.EnqueueAsync(() =>
             {
                 var xamlItemsPanelTemplate = @"<ItemsPanelTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' 
                                                  xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-                                                 xmlns:controls='using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives'>
+                                                 xmlns:controls='using:Microsoft.Toolkit.Uwp.UI.Controls'>
                       <controls:WrapPanel Padding='0,0,0,0'
                                           VerticalSpacing='5'
                                           HorizontalSpacing='5' />

From 04869f4118df1549e657542f5382a573ce746ef2 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 8 Jan 2021 14:22:02 -0500
Subject: [PATCH 08/84] Add SwitchPresenter tag to Controls.Primitives

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index c000c19e1c1..063bc6ef4cb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -14,7 +14,7 @@
 			- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
 			- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
 		</Description>
-		<PackageTags>UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered UniformGrid Uniform Grid</PackageTags>
+		<PackageTags>UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered SwitchPresenter UniformGrid Uniform Grid</PackageTags>
 		<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
 		<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
 		<LangVersion>8.0</LangVersion>

From b6ca5afa694d8f12237ee53a4abdd6ae88c1fd12 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 8 Jan 2021 16:40:01 -0500
Subject: [PATCH 09/84] Split out primitives design project

---
 ...Toolkit.Uwp.UI.Controls.DesignTools.csproj |   4 -
 .../Properties/Resources.Designer.cs          |   9 --
 .../Properties/Resources.resx                 |   3 -
 .../Controls/AdaptiveGridView.Metadata.cs     |   0
 .../Controls/AdaptiveGridView.Typedata.cs     |   0
 .../Controls/WrapPanel.Metadata.cs            |   0
 .../Controls/WrapPanel.Typedata.cs            |   0
 ....UI.Controls.Primitives.DesignTools.csproj | 109 +++++++++++++++
 .../Properties/AssemblyInfo.cs                |  32 +++++
 .../Properties/Resources.Designer.cs          |  81 +++++++++++
 .../Properties/Resources.resx                 | 126 ++++++++++++++++++
 Windows Community Toolkit.sln                 |  18 +++
 12 files changed, 366 insertions(+), 16 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/AdaptiveGridView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/AdaptiveGridView.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/WrapPanel.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/WrapPanel.Typedata.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
index cb7387f0f66..a318c0dacc9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
@@ -79,8 +79,6 @@
     <Compile Include="Common\Constants.cs" />
     <Compile Include="Common\MetadataRegistrationBase.cs" />
     <Compile Include="Common\PlatformTypes.cs" />
-    <Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
-    <Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
     <Compile Include="Controls\BladeItem.Metadata.cs" />
     <Compile Include="Controls\BladeItem.Typedata.cs" />
     <Compile Include="Controls\BladeView.Metadata.cs" />
@@ -123,8 +121,6 @@
     <Compile Include="Controls\TextToolbar.Typedata.cs" />
     <Compile Include="Controls\TileControl.Metadata.cs" />
     <Compile Include="Controls\TileControl.Typedata.cs" />
-    <Compile Include="Controls\WrapPanel.Metadata.cs" />
-    <Compile Include="Controls\WrapPanel.Typedata.cs" />
     <Compile Include="MetadataRegistration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs
index e160035a377..092409a1a4a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs
@@ -105,15 +105,6 @@ internal static string CategoryInteractions {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Layout.
-        /// </summary>
-        internal static string CategoryLayout {
-            get {
-                return ResourceManager.GetString("CategoryLayout", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Markdown Style - Code.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
index e8903ef43b7..56bca35d53f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
@@ -132,9 +132,6 @@
   <data name="CategoryInteractions" xml:space="preserve">
     <value>Interactions</value>
   </data>
-  <data name="CategoryLayout" xml:space="preserve">
-    <value>Layout</value>
-  </data>
   <data name="CategoryMarkdownCodeStyle" xml:space="preserve">
     <value>Markdown Style - Code</value>
   </data>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
new file mode 100644
index 00000000000..e654a64149a
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
+    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\</OutputPath>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.ObjectModel" />
+    <Reference Include="System.Runtime.WindowsRuntime" />
+    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
+    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup Label="WinRT References">
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
+    <Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
+    <Compile Include="Controls\WrapPanel.Metadata.cs" />
+    <Compile Include="Controls\WrapPanel.Typedata.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <DependentUpon>Resources.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
+      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml</Link>
+      <Visible>False</Visible>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- No-op to avoid build error when packing solution from commandline -->
+  <Target Name="Pack" />
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..1189ff8f3b7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Windows Community Toolkit Controls Primitives (Design)")]
+[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitives Controls")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Windows Community Toolkit")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US English
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..bad69d9bf25
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Common.
+        /// </summary>
+        internal static string CategoryCommon {
+            get {
+                return ResourceManager.GetString("CategoryCommon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Layout.
+        /// </summary>
+        internal static string CategoryLayout {
+            get {
+                return ResourceManager.GetString("CategoryLayout", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx
new file mode 100644
index 00000000000..550ed935b51
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CategoryCommon" xml:space="preserve">
+    <value>Common</value>
+  </data>
+  <data name="CategoryLayout" xml:space="preserve">
+    <value>Layout</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d9b251ac032..622e132db51 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -137,6 +137,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UIT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -978,6 +983,18 @@ Global
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.Build.0 = Release|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.ActiveCfg = Release|Any CPU
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.Build.0 = Release|Any CPU
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.ActiveCfg = Debug|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.ActiveCfg = Debug|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.ActiveCfg = Debug|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.ActiveCfg = Debug|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.Build.0 = Debug|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.ActiveCfg = Release|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.ActiveCfg = Release|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.ActiveCfg = Release|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|x86
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1020,6 +1037,7 @@ Global
 		{C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 06a982274a5d77a8835d52872e462316a96a425c Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 11 Jan 2021 13:04:55 -0500
Subject: [PATCH 10/84] Fix primitives deisgn tools ref

---
 ...rosoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
index e654a64149a..470bf4c5e0f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
@@ -94,7 +94,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml">
       <Link>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml</Link>
       <Visible>False</Visible>
     </EmbeddedResource>

From 96e1aba56cd4c603e80641fd33b5a3aafff57afb Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 10:41:05 -0500
Subject: [PATCH 11/84] Fix finding desing output for controls.primitives

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index 063bc6ef4cb..e5d0f923bd7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -27,7 +27,7 @@
 
 	<ItemGroup>
 		<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
-		<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
+		<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
 	</ItemGroup>
 
 	<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

From 3fb905382d720950f35a7045da7d50764829c518 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 11:42:33 -0500
Subject: [PATCH 12/84] Add smoke test for Controls.Primitivs

---
 .../MainPage.xaml                             | 24 +++++++++++++++++++
 .../MainPage.xaml.cs                          | 14 +++++++++++
 SmokeTests/SmokeTests.proj                    |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml
new file mode 100644
index 00000000000..9936b5d90cd
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml
@@ -0,0 +1,24 @@
+<Page
+    x:Class="SmokeTest.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Padding="48">
+      <controls:DockPanel
+        Background="LightGray" 
+        LastChildFill="False" 
+        Margin="2" 
+        Padding="0,0,0,0"
+        >
+        <StackPanel Height="100" controls:DockPanel.Dock="Top" Background="Black"></StackPanel>
+        <StackPanel Width="100" controls:DockPanel.Dock="Left" Background="Red"></StackPanel>
+        <StackPanel Height="100" controls:DockPanel.Dock="Bottom" Background="Green"></StackPanel>
+        <StackPanel Width="100" controls:DockPanel.Dock="Right" Background="Blue"></StackPanel>
+      </controls:DockPanel>
+    </Grid>
+</Page>
+
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs
new file mode 100644
index 00000000000..65e09322217
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace SmokeTest
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index e4f08260c42..f91a2662a89 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <BuildPlatforms>x86</BuildPlatforms>
     <BuildConfigurations>Release</BuildConfigurations>
-    <ToolkitPackages>UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown</ToolkitPackages>
+    <ToolkitPackages>UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Controls.Primitives;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown</ToolkitPackages>
   </PropertyGroup>
 
   <Target Name="GetNuGetVersion">

From 4f83e089f6413f36180463a7c94c42658aafc04b Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 12:29:36 -0500
Subject: [PATCH 13/84] List SwitchPresenter for DesignTools

---
 .../VisualStudioToolsManifest.xml                                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
index fa884a8a5e8..da08ea53fd9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -4,6 +4,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.AdaptiveGridView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DockPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.StaggeredPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.SwitchPresenter" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.UniformGrid" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel" />
     </ToolboxItems>

From 0043ecd4aca74b76eb4589fb0047d7ac21d57386 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 13:07:18 -0500
Subject: [PATCH 14/84] Better wording for titles and descriptions around
 primitivs package

---
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
index 1189ff8f3b7..9fd890b71a6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Windows Community Toolkit Controls Primitives (Design)")]
-[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitives Controls")]
+[assembly: AssemblyTitle("Windows Community Toolkit Primitive Controls (Design)")]
+[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive Controls")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Windows Community Toolkit")]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index e5d0f923bd7..d958e168f5e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>uap10.0.17763</TargetFrameworks>
-		<Title>Windows Community Toolkit Controls</Title>
+		<Title>Windows Community Toolkit Primitive Controls</Title>
 		<Description>
 			This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit.
 

From 3cc5a648224bfbf6309c518dd58c22c71fa618a5 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 14:05:36 -0500
Subject: [PATCH 15/84] Remove exposing internals to xmalisland test, not
 needed. Remove NeutralResourcesLanguage on attribute on assembly, no
 resources or language specific code.

---
 .../Properties/AssemblyInfo.cs                                 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
index cd5fbb60e47..996b6308daf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
@@ -2,12 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Resources;
 using System.Runtime.CompilerServices;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: InternalsVisibleTo("UnitTests.UWP")]
-[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")]
-[assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file

From c7630491622f8a917598b440911c9a701b5e5ce9 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 16:13:24 -0500
Subject: [PATCH 16/84] WIP: move Eyedropper, ImageCropper, InfiniteCanvas to
 Microsoft.Toolkit.Uwp.UI.Controls.Media Issue: coped
 ControlHelpers.XamlHost.cs Controls -> Controls.Media

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  4 ++
 .../ControlHelpers.XamlHost.cs                | 14 +++++++
 .../Eyedropper/Eyedropper.Logic.cs            |  0
 .../Eyedropper/Eyedropper.Properties.cs       |  0
 .../Eyedropper/Eyedropper.cs                  |  0
 .../Eyedropper/Eyedropper.xaml                |  0
 .../EyedropperColorChangedEventArgs.cs        |  0
 .../EyedropperToolButton.Properties.cs        |  0
 .../Eyedropper/EyedropperToolButton.cs        |  0
 .../Eyedropper/EyedropperToolButton.xaml      |  0
 .../ImageCropper/BitmapFileFormat.cs          |  0
 .../ImageCropper/CropShape.cs                 |  0
 .../ImageCropper/ImageCropper.Animations.cs   |  0
 .../ImageCropper/ImageCropper.Constants.cs    |  0
 .../ImageCropper/ImageCropper.Events.cs       |  0
 .../ImageCropper/ImageCropper.Helpers.cs      |  0
 .../ImageCropper/ImageCropper.Logic.cs        |  0
 .../ImageCropper/ImageCropper.Properties.cs   |  0
 .../ImageCropper/ImageCropper.cs              |  0
 .../ImageCropper/ImageCropper.xaml            |  0
 .../ImageCropper/ImageCropperThumb.cs         |  0
 .../ImageCropper/ImageCropperThumb.xaml       |  0
 .../ImageCropper/ThumbPlacement.cs            |  0
 .../ImageCropper/ThumbPosition.cs             |  0
 .../Commands/IInfiniteCanvasCommand.cs        |  0
 .../Commands/InfiniteCanvasClearAllCommand.cs |  0
 .../InfiniteCanvasCreateInkCommand.cs         |  0
 .../InfiniteCanvasCreateTextBoxCommand.cs     |  0
 .../Commands/InfiniteCanvasEraseInkCommand.cs |  0
 .../InfiniteCanvasRemoveTextBoxCommand.cs     |  0
 .../InfiniteCanvasUpdateTextColorCommand.cs   |  0
 .../InfiniteCanvasUpdateTextCommand.cs        |  0
 ...InfiniteCanvasUpdateTextFontSizeCommand.cs |  0
 .../InfiniteCanvasUpdateTextStyleCommand.cs   |  0
 .../InfiniteCanvasUpdateTextWeightCommand.cs  |  0
 .../Controls/InfiniteCanvasTextBox.cs         |  0
 ...iteCanvasVirtualDrawingSurface.Commands.cs |  0
 ...InfiniteCanvasVirtualDrawingSurface.Ink.cs |  0
 ...initeCanvasVirtualDrawingSurface.Render.cs |  0
 ...niteCanvasVirtualDrawingSurface.TextBox.cs |  0
 .../InfiniteCanvasVirtualDrawingSurface.cs    |  0
 .../InfiniteCanvas/Drawables/IDrawable.cs     |  0
 .../InfiniteCanvas/Drawables/InkDrawable.cs   |  0
 .../InfiniteCanvas/Drawables/TextDrawable.cs  |  0
 .../InfiniteCanvas/InfiniteCanvas.Events.cs   |  0
 .../InfiniteCanvas/InfiniteCanvas.TextBox.cs  |  0
 .../InfiniteCanvas/InfiniteCanvas.cs          |  0
 .../InfiniteCanvas/InfiniteCanvas.xaml        |  0
 .../CustomInkDrawingAttribute.cs              |  0
 .../JsonConverters/IDrawableConverter.cs      |  0
 .../JsonConverters/InkCanvasExportModel.cs    |  0
 .../JsonConverters/Matrix3x2Converter.cs      |  0
 .../JsonConverters/SerializablePoint.cs       |  0
 .../JsonConverters/SerializableStroke.cs      |  0
 .../SerializableStrokeConverter.cs            |  0
 ...osoft.Toolkit.Uwp.UI.Controls.Media.csproj | 42 +++++++++++++++++++
 .../Properties/AssemblyInfo.cs                | 13 ++++++
 .../Microsoft.Toolkit.Uwp.UI.Controls.rd.xml  |  0
 .../Themes/Generic.xaml                       | 10 +++++
 .../VisualStudioToolsManifest.xml             |  7 ++++
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  |  2 -
 .../Themes/Generic.xaml                       |  7 ----
 .../VisualStudioToolsManifest.xml             |  1 -
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  4 ++
 .../UnitTests.XamlIslands.UWPApp.csproj       |  4 ++
 Windows Community Toolkit.sln                 | 23 ++++++++++
 66 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.Logic.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperColorChangedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperToolButton.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperToolButton.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperToolButton.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/BitmapFileFormat.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/CropShape.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Animations.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Constants.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Helpers.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Logic.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropperThumb.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropperThumb.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ThumbPlacement.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ThumbPosition.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Drawables/IDrawable.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Drawables/InkDrawable.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Drawables/TextDrawable.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.TextBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/IDrawableConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/SerializablePoint.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/SerializableStroke.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index d89fc02aa6b..c5f84bc533e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1498,6 +1498,10 @@
       <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj">
+      <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs
new file mode 100644
index 00000000000..90514de7cd6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// Internal class used to provide helpers for controls
+    /// </summary>
+    internal static partial class ControlHelpers
+    {
+        internal static bool IsXamlRootAvailable { get; } = Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperColorChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperColorChangedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperColorChangedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperColorChangedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/BitmapFileFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/BitmapFileFormat.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/BitmapFileFormat.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/BitmapFileFormat.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/CropShape.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/CropShape.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/CropShape.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/CropShape.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPlacement.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPlacement.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPlacement.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPlacement.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPosition.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPosition.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPosition.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPosition.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/IDrawable.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/IDrawable.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/InkDrawable.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/InkDrawable.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/TextDrawable.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/TextDrawable.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.TextBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.TextBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializablePoint.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializablePoint.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializablePoint.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializablePoint.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStroke.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStroke.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
new file mode 100644
index 00000000000..a8f4f65e4d7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <Title>Windows Community Toolkit Controls</Title>
+    <Description>
+      This library provides XAML templated controls. It is part of the Windows Community Toolkit.
+
+      Controls:
+        - ImageCropper: ImageCropper control allows user to crop image freely.
+        - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export &amp; Import.
+    </Description>
+    <PackageTags>UWP Toolkit Windows Controls XAML InfiniteCanvas</PackageTags>
+    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
+    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="Win2D.uwp" Version="1.25.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
+    <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
+  </ItemGroup>
+
+  <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
+  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
+    <ItemGroup>
+      <GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
+    </ItemGroup>
+    <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
+    <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
+  </Target>
+</Project>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..cd5fbb60e47
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Resources;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: InternalsVisibleTo("UnitTests.UWP")]
+[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")]
+[assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml
new file mode 100644
index 00000000000..479c663071b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
new file mode 100644
index 00000000000..7e74146691b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -0,0 +1,7 @@
+<FileList>
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.dll">
+    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
+    </ToolboxItems>
+  </File>
+</FileList>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 793d9571766..03b9d0600bf 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -18,10 +18,8 @@
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
         - HeaderedContentControl: Provides a header to content.
         - HeaderedItemsControl: Provides a header to items.
-        - ImageCropper: ImageCropper control allows user to crop image freely.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
-        - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export &amp; Import.
         - LayoutTransformControl: Support for transformations as if applied by LayoutTransform.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
         - MasterDetailsView: Implements the Master/Details design pattern.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
index 6422f8690d2..da3ac143c6a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
@@ -12,11 +12,8 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml" />
@@ -28,10 +25,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
index b952e2ec958..5dee0c75f66 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
@@ -16,7 +16,6 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageExBase" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView" />
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index b7adf88cfc3..9c5fa893d29 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -238,6 +238,10 @@
       <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
       <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj">
+      <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index cc9fc72981e..bb54f37fd89 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -187,6 +187,10 @@
       <Project>{5bf75694-798a-43a0-8150-415de195359c}</Project>
       <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj">
+      <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 17df1370cd3..c5e2d3686e3 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -135,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITes
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media", "Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj", "{43BD2A36-9E12-4788-80AE-2377E41E6D05}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -956,6 +958,26 @@ Global
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.Build.0 = Release|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.ActiveCfg = Release|Any CPU
 		{C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.Build.0 = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM.Build.0 = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x64.Build.0 = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x86.Build.0 = Debug|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM.ActiveCfg = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM.Build.0 = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM64.Build.0 = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x64.ActiveCfg = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x64.Build.0 = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.ActiveCfg = Release|Any CPU
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -997,6 +1019,7 @@ Global
 		{5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
+		{43BD2A36-9E12-4788-80AE-2377E41E6D05} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From f66ae16776e4331a1db53658faa68d4661bb77fc Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 16:33:55 -0500
Subject: [PATCH 17/84] Controls.Media: Remove System.ValueTuple

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index a8f4f65e4d7..152d68d520c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -17,7 +17,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
     <PackageReference Include="Win2D.uwp" Version="1.25.0" />
   </ItemGroup>

From 89272018e0357254f6e2dd9af0b07d3321bbc691 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 16:37:08 -0500
Subject: [PATCH 18/84] Controls: Remove System.ValueTuple, System.Text.Json

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 03b9d0600bf..988389864a9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -43,11 +43,6 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />

From 0869c79a40dfd344da75a3579cdf23ea6cf05958 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 16:59:23 -0500
Subject: [PATCH 19/84] Fix assemly name in test file

---
 .../UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
index 08a856e87a9..2882f6efcff 100644
--- a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
+++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
@@ -1,7 +1,7 @@
 {
   "DrawableList": [
     {
-      "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls",
+      "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls.Media",
       "SerializableStrokeList": [
         {
           "DrawingAttributes": {

From 3ffa9b56e8aaf3994b076380efc2cc64d2853e04 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 12 Jan 2021 17:15:35 -0500
Subject: [PATCH 20/84] Remove unneded deps

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index d958e168f5e..aad78b95e6b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -21,7 +21,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
 		<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
 	</ItemGroup>
 

From b298fd061417e2689afa791cbab7050831fe3f7a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 13 Jan 2021 14:03:15 -0500
Subject: [PATCH 21/84] Controls.Media: ControlHelpers.XamlHost.cs, use file
 like in project instead of copy

---
 .../ControlHelpers.XamlHost.cs                     | 14 --------------
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs
deleted file mode 100644
index 90514de7cd6..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls
-{
-    /// <summary>
-    /// Internal class used to provide helpers for controls
-    /// </summary>
-    internal static partial class ControlHelpers
-    {
-        internal static bool IsXamlRootAvailable { get; } = Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index 152d68d520c..ae959da7cad 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
     <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>

From e4db504887227c4d09d7cdcb106df0ad045c7e51 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 15 Jan 2021 13:14:45 -0500
Subject: [PATCH 22/84] Handle V1 of InfiniteCanvasExport data, and regresion
 test for V2

---
 .../JsonConverters/IDrawableConverter.cs      |   4 +-
 .../Samples/InfiniteCanvasExportPreMedia.json | 102 ++++++++++++++++++
 .../Test_InfiniteCanvas_Regression.cs         |   7 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   3 +-
 4 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
index 19fdc0472b4..3db04df765a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
@@ -11,6 +11,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     internal class IDrawableConverter : JsonConverter<IDrawable>
     {
+        private const string OldDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls";
+
         public override bool CanConvert(Type typeToConvert) => typeof(IDrawable).IsAssignableFrom(typeToConvert);
 
         public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -40,7 +42,7 @@ public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 
             var typeDiscriminator = reader.GetString();
             IDrawable drawable;
-            if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)))
+            if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)) || typeDiscriminator == OldDiscriminator)
             {
                 drawable = new InkDrawable();
             }
diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json
new file mode 100644
index 00000000000..08a856e87a9
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json
@@ -0,0 +1,102 @@
+{
+  "DrawableList": [
+    {
+      "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls",
+      "SerializableStrokeList": [
+        {
+          "DrawingAttributes": {
+            "Color": {
+              "A": 255,
+              "R": 0,
+              "G": 0,
+              "B": 0
+            },
+            "FitToCurve": true,
+            "IgnorePressure": false,
+            "IgnoreTilt": true,
+            "Size": {
+              "Width": 4.0,
+              "Height": 4.0,
+              "IsEmpty": false
+            },
+            "PenTip": 0,
+            "PenTipTransform": {
+              "M11": 1.0,
+              "M12": 0.0,
+              "M21": 0.0,
+              "M22": 1.0,
+              "M31": 0.0,
+              "M32": 0.0,
+              "IsIdentity": true,
+              "Translation": {
+                "X": 0.0,
+                "Y": 0.0
+              }
+            },
+            "DrawAsHighlighter": false
+          },
+          "SerializableFinalPointList": [
+            {
+              "Position": {
+                "X": 103.97531127929688,
+                "Y": 45.995269775390625
+              },
+              "Pressure": 0.5,
+              "TiltX": 0.0,
+              "TiltY": 0.0,
+              "Timestamp": 0
+            },
+            {
+              "Position": {
+                "X": 103.80825805664063,
+                "Y": 45.995269775390625
+              },
+              "Pressure": 0.5,
+              "TiltX": 0.0,
+              "TiltY": 0.0,
+              "Timestamp": 0
+            },
+            {
+              "Position": {
+                "X": 103.41259002685547,
+                "Y": 45.995269775390625
+              },
+              "Pressure": 0.5,
+              "TiltX": 0.0,
+              "TiltY": 0.0,
+              "Timestamp": 0
+            }
+          ],
+          "SerializableDrawingAttributesKind": 0,
+          "SerializableDrawingAttributesPencilProperties": null,
+          "PointTransform": {
+            "M11": 1.0,
+            "M12": 0.0,
+            "M21": 0.0,
+            "M22": 1.0,
+            "M31": 0.0,
+            "M32": 0.0,
+            "IsIdentity": true,
+            "Translation": {
+              "X": 0.0,
+              "Y": 0.0
+            }
+          }
+        }
+      ],
+      "Bounds": {
+        "X": 69.949455261230469,
+        "Y": 28.069997787475586,
+        "Width": 1668.2589111328125,
+        "Height": 280.38735961914062,
+        "Left": 69.949455261230469,
+        "Top": 28.069997787475586,
+        "Right": 1738.2083740234375,
+        "Bottom": 308.45736694335938,
+        "IsEmpty": false
+      },
+      "IsActive": true
+    }
+  ],
+  "Version": 1
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
index 5c52be75339..ddb9ae9dbbb 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
@@ -18,7 +18,10 @@ public class Test_InfiniteCanvas_Regression
     {
         [TestCategory("InfiniteCanvas")]
         [TestMethod]
-        public async Task Test_InfiniteCanvas_LoadsV1File()
+        [DataRow(@"Assets\Samples\InfiniteCanvasExportPreMedia.json", DisplayName = "Version1")]
+        [DataRow(@"Assets\Samples\InfiniteCanvasExport.json", DisplayName = "Version2")]
+
+        public async Task Test_InfiniteCanvas_LoadsFile(string file)
         {
             var taskSource = new TaskCompletionSource<object>();
             await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(
@@ -26,7 +29,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(
                 {
                     try
                     {
-                        string json = await StorageFileHelper.ReadTextFromPackagedFileAsync(@"Assets\Samples\InfiniteCanvasExport.json");
+                        string json = await StorageFileHelper.ReadTextFromPackagedFileAsync(file);
 
                         InfiniteCanvasVirtualDrawingSurface.LoadJson(json).Should().NotBeEmpty();
 
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 408ba208c6f..12d87dfb764 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -204,11 +204,12 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <None Include=".editorconfig" />
+    <Content Include="Assets\Samples\InfiniteCanvasExportPreMedia.json" />
+    <Content Include="Assets\Samples\InfiniteCanvasExport.json" />
     <PRIResource Include="Strings\fr\Resources.resw" />
     <PRIResource Include="Strings\en-us\Resources.resw">
       <SubType>Designer</SubType>
     </PRIResource>
-    <Content Include="Assets\Samples\InfiniteCanvasExport.json" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Samples\lorem.txt" />

From 8ee6b1a4c6e604939bcda477f668da0b52569058 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 15 Jan 2021 13:35:18 -0500
Subject: [PATCH 23/84] Controls.Media: Add smoke tests.

---
 .../MainPage.xaml                                  | 13 +++++++++++++
 .../MainPage.xaml.cs                               | 14 ++++++++++++++
 SmokeTests/SmokeTests.proj                         |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml
new file mode 100644
index 00000000000..7d7a726e88c
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml
@@ -0,0 +1,13 @@
+<Page
+    x:Class="SmokeTest.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Padding="48">
+        <controls:InfiniteCanvas />
+    </Grid>
+</Page>
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs
new file mode 100644
index 00000000000..65e09322217
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace SmokeTest
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index f91a2662a89..c86dc27cd56 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <BuildPlatforms>x86</BuildPlatforms>
     <BuildConfigurations>Release</BuildConfigurations>
-    <ToolkitPackages>UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Controls.Primitives;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown</ToolkitPackages>
+    <ToolkitPackages>UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Controls.Primitives;Microsoft.Toolkit.Uwp.UI.Controls.Media;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown</ToolkitPackages>
   </PropertyGroup>
 
   <Target Name="GetNuGetVersion">

From ddc7950ee0bf1401750507268bc4f1648e90d2a1 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 15 Jan 2021 14:18:26 -0500
Subject: [PATCH 24/84] Controls.Media: Eyedroper to Project description and
 Package Tags

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index ae959da7cad..d4bb0780da7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -7,10 +7,11 @@
       This library provides XAML templated controls. It is part of the Windows Community Toolkit.
 
       Controls:
+        - Eyedropper: Eyedropper allows user to pick up a color from anywhere in there application.
         - ImageCropper: ImageCropper control allows user to crop image freely.
         - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export &amp; Import.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML InfiniteCanvas</PackageTags>
+    <PackageTags>UWP Toolkit Windows Controls XAML InfiniteCanvas Eyedropper</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>

From 8f60463b405fae3436f182064463bd08f7ba59ae Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 15 Jan 2021 15:38:56 -0500
Subject: [PATCH 25/84] Controls.Media: change title to include Media

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index d4bb0780da7..656f733222d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
-    <Title>Windows Community Toolkit Controls</Title>
+    <Title>Windows Community Toolkit Media Controls</Title>
     <Description>
       This library provides XAML templated controls. It is part of the Windows Community Toolkit.
 

From 97dda4a7ce18f2ddd3719ad8f2cec58fb70c5a04 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 15 Jan 2021 15:41:24 -0500
Subject: [PATCH 26/84] Controls.Media: List Eyedropper and ImageCropper in
 VisualStudioToolsManifest.xml

---
 .../VisualStudioToolsManifest.xml                               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
index 7e74146691b..627261189e7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -1,6 +1,8 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Eyedropper" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropper" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InfiniteCanvas" />
     </ToolboxItems>
   </File>

From fb228c3d1fdf309fbcc3d5fec00ad8b6401da1a7 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 15 Jan 2021 16:00:19 -0500
Subject: [PATCH 27/84] Controls.Media: Imporove description

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index 656f733222d..85beee41047 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Media Controls</Title>
     <Description>
-      This library provides XAML templated controls. It is part of the Windows Community Toolkit.
+      This library provides controls backed by win2d for use in XAML. It is part of the Windows Community Toolkit.
 
       Controls:
         - Eyedropper: Eyedropper allows user to pick up a color from anywhere in there application.

From c61156dca3e3d93bd056f1285d4b0da38cab7d1d Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 19 Jan 2021 16:32:16 -0500
Subject: [PATCH 28/84] Fix usages of old assembly name

---
 .../Themes/Generic.xaml                                | 10 +++++-----
 .../VisualStudioToolsManifest.xml                      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml
index 479c663071b..782ee42cd95 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
index 627261189e7..31b1259a180 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -1,5 +1,5 @@
 <FileList>
-  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.dll">
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Media.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Eyedropper" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageCropper" />

From 56609a06ce179de8d8b55a73a50074dd24d35be2 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 19 Jan 2021 17:00:21 -0500
Subject: [PATCH 29/84] Handel descirminator textDrawable from Control Assembly

---
 .../InfiniteCanvas/JsonConverters/IDrawableConverter.cs    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
index 3db04df765a..9cadfd0da35 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
@@ -11,7 +11,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     internal class IDrawableConverter : JsonConverter<IDrawable>
     {
-        private const string OldDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls";
+        private const string OldInkDrawableDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls";
+        private const string OldTextDrawableDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.TextDrawable, Microsoft.Toolkit.Uwp.UI.Controls";
 
         public override bool CanConvert(Type typeToConvert) => typeof(IDrawable).IsAssignableFrom(typeToConvert);
 
@@ -42,11 +43,11 @@ public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 
             var typeDiscriminator = reader.GetString();
             IDrawable drawable;
-            if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)) || typeDiscriminator == OldDiscriminator)
+            if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)) || typeDiscriminator == OldInkDrawableDiscriminator)
             {
                 drawable = new InkDrawable();
             }
-            else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable)))
+            else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable)) || typeDiscriminator == OldTextDrawableDiscriminator)
             {
                 drawable = new TextDrawable();
             }

From 53344dc4ff8aede9f8733e318e3bf865177a55fb Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 19 Jan 2021 17:01:27 -0500
Subject: [PATCH 30/84] Test sample exported from inifinate canvase instead of
 modified from old sample.

---
 .../Assets/Samples/InfiniteCanvasExport.json  | 50 ++++++++-----------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
index 2882f6efcff..68b97e43b0a 100644
--- a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
+++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
@@ -15,23 +15,18 @@
             "IgnorePressure": false,
             "IgnoreTilt": true,
             "Size": {
-              "Width": 4.0,
-              "Height": 4.0,
+              "Width": 4,
+              "Height": 4,
               "IsEmpty": false
             },
             "PenTip": 0,
             "PenTipTransform": {
-              "M11": 1.0,
-              "M12": 0.0,
-              "M21": 0.0,
-              "M22": 1.0,
-              "M31": 0.0,
-              "M32": 0.0,
-              "IsIdentity": true,
-              "Translation": {
-                "X": 0.0,
-                "Y": 0.0
-              }
+              "M11": 1,
+              "M12": 0,
+              "M21": 0,
+              "M22": 1,
+              "M31": 0,
+              "M32": 0
             },
             "DrawAsHighlighter": false
           },
@@ -42,8 +37,8 @@
                 "Y": 45.995269775390625
               },
               "Pressure": 0.5,
-              "TiltX": 0.0,
-              "TiltY": 0.0,
+              "TiltX": 0,
+              "TiltY": 0,
               "Timestamp": 0
             },
             {
@@ -52,8 +47,8 @@
                 "Y": 45.995269775390625
               },
               "Pressure": 0.5,
-              "TiltX": 0.0,
-              "TiltY": 0.0,
+              "TiltX": 0,
+              "TiltY": 0,
               "Timestamp": 0
             },
             {
@@ -62,25 +57,20 @@
                 "Y": 45.995269775390625
               },
               "Pressure": 0.5,
-              "TiltX": 0.0,
-              "TiltY": 0.0,
+              "TiltX": 0,
+              "TiltY": 0,
               "Timestamp": 0
             }
           ],
           "SerializableDrawingAttributesKind": 0,
           "SerializableDrawingAttributesPencilProperties": null,
           "PointTransform": {
-            "M11": 1.0,
-            "M12": 0.0,
-            "M21": 0.0,
-            "M22": 1.0,
-            "M31": 0.0,
-            "M32": 0.0,
-            "IsIdentity": true,
-            "Translation": {
-              "X": 0.0,
-              "Y": 0.0
-            }
+            "M11": 1,
+            "M12": 0,
+            "M21": 0,
+            "M22": 1,
+            "M31": 0,
+            "M32": 0
           }
         }
       ],

From aed5068fe3cd62e8354fb0a8306f018cb06874c4 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 20 Jan 2021 13:13:03 -0500
Subject: [PATCH 31/84] TEMP: Remove usages of graph controls

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    | 16 ++++++++++++
 .../Models/Sample.cs                          | 26 ++++++++++---------
 .../SamplePages/samples.json                  |  2 ++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index c39275376b9..c704c8cb80e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -112,9 +112,11 @@
     <PackageReference Include="Microsoft.Services.Store.Engagement">
       <Version>10.1901.28001</Version>
     </PackageReference>
+    <!-- TODO Reintroduce graph controls
     <PackageReference Include="Microsoft.Toolkit.Graph.Controls">
       <Version>6.1.0-build.6</Version>
     </PackageReference>
+    -->
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.4.2</Version>
     </PackageReference>
@@ -278,8 +280,10 @@
     <Content Include="SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
     <Content Include="SamplePages\ImageCropper\ImageCropper.png" />
     <Content Include="SamplePages\StaggeredLayout\StaggeredLayout.png" />
+    <!-- TODO Reintroduce graph controls
     <Content Include="SamplePages\PeoplePicker\PeoplePicker.png" />
     <Content Include="SamplePages\PersonView\PersonView.png" />
+    -->
     <Content Include="SamplePages\TokenizingTextBox\TokenizingTextBox.png" />
     <Content Include="SamplePages\UniformGrid\UniformGrid.png" />
     <Content Include="SamplePages\AdaptiveGridView\AdaptiveGridView.png" />
@@ -298,7 +302,9 @@
     <Content Include="SamplePages\DataGrid\DataGrid.png" />
     <Content Include="SamplePages\DispatcherQueueHelper\DispatchQueueHelper.png" />
     <Content Include="SamplePages\DockPanel\DockPanel.png" />
+    <!-- TODO Reintroduce graph controls
     <Content Include="SamplePages\LoginButton\LoginButton.png" />
+    -->
     <Content Include="SamplePages\FadeHeader\FadeHeaderBehavior.png" />
     <Content Include="SamplePages\Fade\FadeBehavior.png" />
     <Content Include="SamplePages\FocusTracker\FocusTracker.png" />
@@ -490,9 +496,11 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\CameraPreview\CameraPreviewXaml.bind" />
+    <!-- TODO Reintroduce graph controls
     <Content Include="SamplePages\LoginButton\LoginButtonXaml.bind" />
     <Content Include="SamplePages\PeoplePicker\PeoplePickerXaml.bind" />
     <Content Include="SamplePages\PersonView\PersonViewXaml.bind" />
+    -->
     <Content Include="SamplePages\GazeInteraction\GazeInteractionXaml.bind">
       <SubType>Designer</SubType>
     </Content>
@@ -649,12 +657,14 @@
     <Compile Include="Pages\SampleController.xaml.cs">
       <DependentUpon>SampleController.xaml</DependentUpon>
     </Compile>
+    <!-- TODO Reintroduce graph controls
     <Compile Include="SamplePages\PeoplePicker\PeoplePickerPage.xaml.cs">
       <DependentUpon>PeoplePickerPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\PersonView\PersonViewPage.xaml.cs">
       <DependentUpon>PersonViewPage.xaml</DependentUpon>
     </Compile>
+    -->
     <Compile Include="SamplePages\AdvancedCollectionView\AdvancedCollectionViewPage.xaml.cs">
       <DependentUpon>AdvancedCollectionViewPage.xaml</DependentUpon>
     </Compile>
@@ -695,9 +705,11 @@
     <Compile Include="SamplePages\BackdropBlurBrush\BackdropBlurBrushPage.xaml.cs">
       <DependentUpon>BackdropBlurBrushPage.xaml</DependentUpon>
     </Compile>
+    <!-- TODO Reintroduce graph controls
     <Compile Include="SamplePages\LoginButton\LoginButtonPage.xaml.cs">
       <DependentUpon>LoginButtonPage.xaml</DependentUpon>
     </Compile>
+    -->
     <Compile Include="SamplePages\DataGrid\DataGridPage.xaml.cs">
       <DependentUpon>DataGridPage.xaml</DependentUpon>
     </Compile>
@@ -1048,6 +1060,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <!-- TODO Reintroduce graph controls
     <Page Include="SamplePages\PeoplePicker\PeoplePickerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1056,6 +1069,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    -->
     <Page Include="SamplePages\BackdropGammaTransferBrush\BackdropGammaTransferBrushPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1140,10 +1154,12 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <!-- TODO Reintroduce graph controls
     <Page Include="SamplePages\LoginButton\LoginButtonPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    -->
     <Page Include="SamplePages\FocusTracker\FocusTrackerPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 0707df494f7..ec05b29caea 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -16,8 +16,9 @@
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Graph.Converters;
-using Microsoft.Toolkit.Graph.Providers;
+// TODO Reintroduce graph controls
+// using Microsoft.Toolkit.Graph.Converters;
+// using Microsoft.Toolkit.Graph.Providers;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
 using Microsoft.Toolkit.Uwp.SampleApp.Models;
@@ -659,17 +660,18 @@ private static Type LookForTypeByName(string typeName)
                 }
             }
 
-            // Search in Microsoft.Toolkit.Graph.Controls
-            var graphControlsProxyType = typeof(UserToPersonConverter);
-            assembly = graphControlsProxyType.GetTypeInfo().Assembly;
+            // TODO Reintroduce graph controls
+            //// Search in Microsoft.Toolkit.Graph.Controls
+            //var graphControlsProxyType = typeof(UserToPersonConverter);
+            //assembly = graphControlsProxyType.GetTypeInfo().Assembly;
 
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
+            //foreach (var typeInfo in assembly.ExportedTypes)
+            //{
+            //    if (typeInfo.Name == typeName)
+            //    {
+            //        return typeInfo;
+            //    }
+            //}
 
             // Search in Microsoft.Toolkit.Uwp.UI.Animations
             var animationsProxyType = EasingType.Default;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index b7d7a495ffd..075c1ea7b95 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -387,6 +387,7 @@
         "Icon": "/SamplePages/Eyedropper/Eyedropper.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Eyedropper.md"
       },
+      /* TODO Reintroduce graph controls
       {
         "Name": "LoginButton",
         "Type": "LoginButtonPage",
@@ -423,6 +424,7 @@
         "DeprecatedWarning": "The PeoplePicker control is in preview. Find out more here: https://aka.ms/wgt",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/controls/PeoplePicker.md"
       },
+      */
       {
         "Name": "AlignmentGrid",
         "Type": "AlignmentGridPage",

From 704a3561f7da6d8247c6693f6381548e7f576797 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 19 Jan 2021 11:52:27 -0500
Subject: [PATCH 32/84] Move Controls to Controls.Core folder

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj                      | 2 +-
 .../BladeView/BladeItem.Events.cs                               | 0
 .../BladeView/BladeItem.Properties.cs                           | 0
 .../BladeView/BladeItem.cs                                      | 0
 .../BladeView/BladeItemAutomationPeer.cs                        | 0
 .../BladeView/BladeMode.cs                                      | 0
 .../BladeView/BladeView.Events.cs                               | 0
 .../BladeView/BladeView.Properties.cs                           | 0
 .../BladeView/BladeView.cs                                      | 0
 .../BladeView/BladeView.xaml                                    | 0
 .../BladeView/BladeViewAutomationPeer.cs                        | 0
 .../CameraPreview/CameraPreview.Constants.cs                    | 0
 .../CameraPreview/CameraPreview.Events.cs                       | 0
 .../CameraPreview/CameraPreview.Properties.cs                   | 0
 .../CameraPreview/CameraPreview.cs                              | 0
 .../CameraPreview/CameraPreview.xaml                            | 0
 .../CameraPreview/PreviewFailedEventArgs.cs                     | 0
 .../Carousel/Carousel.cs                                        | 0
 .../Carousel/Carousel.xaml                                      | 0
 .../Carousel/CarouselItem.cs                                    | 0
 .../Carousel/CarouselPanel.cs                                   | 0
 .../ColorPicker/ColorChannel.cs                                 | 0
 .../ColorPicker/ColorPicker.Properties.cs                       | 0
 .../ColorPicker/ColorPicker.cs                                  | 0
 .../ColorPicker/ColorPicker.xaml                                | 0
 .../ColorPicker/ColorPickerButton.cs                            | 0
 .../ColorPicker/ColorPickerButton.xaml                          | 0
 .../ColorPicker/ColorPickerRenderingHelpers.cs                  | 0
 .../ColorPicker/ColorPickerSlider.Properties.cs                 | 0
 .../ColorPicker/ColorPickerSlider.cs                            | 0
 .../ColorPicker/ColorPickerSlider.xaml                          | 0
 .../ColorPicker/ColorRepresentation.cs                          | 0
 .../ColorPicker/ColorToColorShadeConverter.cs                   | 0
 .../ColorPicker/ColorToHexConverter.cs                          | 0
 .../ColorPicker/ContrastBrushConverter.cs                       | 0
 .../ColorPicker/FluentColorPalette.cs                           | 0
 .../ColorPicker/IColorPalette.cs                                | 0
 .../ControlHelpers.Composition.cs                               | 0
 .../ControlHelpers.Math.cs                                      | 0
 .../ControlHelpers.XamlHost.cs                                  | 0
 .../DropShadowPanel/DropShadowPanel.Properties.cs               | 0
 .../DropShadowPanel/DropShadowPanel.cs                          | 0
 .../DropShadowPanel/DropShadowPanel.xaml                        | 0
 .../Expander/ExpandDirection.cs                                 | 0
 .../Expander/Expander.Constants.cs                              | 0
 .../Expander/Expander.Events.cs                                 | 0
 .../Expander/Expander.Properties.cs                             | 0
 .../Expander/Expander.cs                                        | 0
 .../Expander/Expander.xaml                                      | 0
 .../Expander/ExpanderAutomationPeer.cs                          | 0
 .../GridSplitter/GridSplitter.Data.cs                           | 0
 .../GridSplitter/GridSplitter.Events.cs                         | 0
 .../GridSplitter/GridSplitter.Helper.cs                         | 0
 .../GridSplitter/GridSplitter.Options.cs                        | 0
 .../GridSplitter/GridSplitter.cs                                | 0
 .../GridSplitter/GridSplitter.xaml                              | 0
 .../GridSplitter/GripperHoverWrapper.cs                         | 0
 .../HeaderedContentControl/HeaderedContentControl.cs            | 0
 .../HeaderedContentControl/HeaderedContentControl.xaml          | 0
 .../HeaderedItemsControl/HeaderedItemsControl.cs                | 0
 .../HeaderedItemsControl/HeaderedItemsControl.xaml              | 0
 .../ImageEx/CachingStrategy.cs                                  | 0
 .../ImageEx/ImageEx.Members.cs                                  | 0
 .../ImageEx/ImageEx.cs                                          | 0
 .../ImageEx/ImageEx.xaml                                        | 0
 .../ImageEx/ImageExBase.Members.cs                              | 0
 .../ImageEx/ImageExBase.Placeholder.cs                          | 0
 .../ImageEx/ImageExBase.Source.cs                               | 0
 .../ImageEx/ImageExBase.cs                                      | 0
 .../ImageEx/ImageExFailedEventArgs.cs                           | 0
 .../ImageEx/ImageExOpenedEventArgs.cs                           | 0
 .../InAppNotification/InAppNotification.AttachedProperties.cs   | 0
 .../InAppNotification/InAppNotification.Constants.cs            | 0
 .../InAppNotification/InAppNotification.Events.cs               | 0
 .../InAppNotification/InAppNotification.Properties.cs           | 0
 .../InAppNotification/InAppNotification.cs                      | 0
 .../InAppNotification/InAppNotification.xaml                    | 0
 .../InAppNotification/InAppNotificationClosedEventArgs.cs       | 0
 .../InAppNotification/InAppNotificationClosingEventArgs.cs      | 0
 .../InAppNotification/InAppNotificationDismissKind.cs           | 0
 .../InAppNotification/InAppNotificationOpeningEventArgs.cs      | 0
 .../InAppNotification/NotificationOptions.cs                    | 0
 .../InAppNotification/StackMode.cs                              | 0
 .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml       | 0
 .../InAppNotification/Styles/VSCodeNotificationStyle.xaml       | 0
 .../InlineCollectionWrapper.cs                                  | 0
 .../LayoutTransformControl/LayoutTransformControl.Properties.cs | 0
 .../LayoutTransformControl/LayoutTransformControl.cs            | 0
 .../LayoutTransformControl/LayoutTransformControl.xaml          | 0
 .../LayoutTransformControl/PropertyChangeEventSource.cs         | 0
 .../Loading/Loading.Properties.cs                               | 0
 .../Loading/Loading.cs                                          | 0
 .../Loading/Loading.xaml                                        | 0
 .../MasterDetailsView/BackButtonBehavior.cs                     | 0
 .../MasterDetailsView/MasterDetailsView.Events.cs               | 0
 .../MasterDetailsView/MasterDetailsView.Properties.cs           | 0
 .../MasterDetailsView/MasterDetailsView.cs                      | 0
 .../MasterDetailsView/MasterDetailsView.xaml                    | 0
 .../MasterDetailsView/MasterDetailsViewState.cs                 | 0
 .../Menu/Menu.Events.cs                                         | 0
 .../Menu/Menu.Extensions.cs                                     | 0
 .../Menu/Menu.Logic.cs                                          | 0
 .../Menu/Menu.cs                                                | 0
 .../Menu/Menu.xaml                                              | 0
 .../Menu/MenuItem.cs                                            | 0
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                    | 0
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings        | 0
 .../OrbitView/OrbitView.cs                                      | 0
 .../OrbitView/OrbitView.xaml                                    | 0
 .../OrbitView/OrbitViewDataItem.cs                              | 0
 .../OrbitView/OrbitViewDataItemCollection.cs                    | 0
 .../OrbitView/OrbitViewElementProperties.cs                     | 0
 .../OrbitView/OrbitViewItem.cs                                  | 0
 .../OrbitView/OrbitViewItemClickedEventArgs.cs                  | 0
 .../OrbitView/OrbitViewPanel.cs                                 | 0
 .../OrbitView/OrbitViewPanelItemArrangedArgs.cs                 | 0
 .../OrbitView/OrbitViewPanelItemsArrangedArgs.cs                | 0
 .../Properties/AssemblyInfo.cs                                  | 0
 .../RadialGauge/RadialGauge.cs                                  | 0
 .../RadialGauge/RadialGauge.xaml                                | 0
 .../RadialGauge/RadialGaugeAutomationPeer.cs                    | 0
 .../RadialProgressBar/RadialProgressBar.cs                      | 0
 .../RadialProgressBar/RadialProgressBar.xaml                    | 0
 .../RangeSelector/RangeChangedEventArgs.cs                      | 0
 .../RangeSelector/RangeSelector.cs                              | 0
 .../RangeSelector/RangeSelector.xaml                            | 0
 .../RemoteDevicePicker/RemoteDevicePicker.cs                    | 0
 .../RemoteDevicePicker/RemoteDevicePicker.xaml                  | 0
 .../RemoteDevicePicker/RemoteDeviceSelectionMode.cs             | 0
 .../RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs     | 0
 .../RotatorTile/RotatorTile.cs                                  | 0
 .../RotatorTile/RotatorTile.xaml                                | 0
 .../Strings/en-US/Resources.resw                                | 0
 .../TextToolbar/EditorChangedArgs.cs                            | 0
 .../TextToolbar/Formats/ButtonActions.cs                        | 0
 .../TextToolbar/Formats/Formatter.cs                            | 0
 .../TextToolbar/Formats/RichText/RichTextButtonActions.cs       | 0
 .../TextToolbar/Formats/RichText/RichTextFormatter.cs           | 0
 .../TextToolbar/ShortcutKeyRequestArgs.cs                       | 0
 .../TextToolbar/Symbols/List.cs                                 | 0
 .../TextToolbar/Symbols/NumberedList.cs                         | 0
 .../TextToolbar/Symbols/Symbol.cs                               | 0
 .../TextToolbar/Symbols/Symbols.xaml                            | 0
 .../TextToolbar/TextToolbar.Events.cs                           | 0
 .../TextToolbar/TextToolbar.Methods.cs                          | 0
 .../TextToolbar/TextToolbar.Properties.cs                       | 0
 .../TextToolbar/TextToolbar.cs                                  | 0
 .../TextToolbar/TextToolbar.xaml                                | 0
 .../TextToolbar/ToolbarItems/ButtonMap.cs                       | 0
 .../TextToolbar/ToolbarItems/ButtonType.cs                      | 0
 .../TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs     | 0
 .../TextToolbar/ToolbarItems/Common/CommonButtons.cs            | 0
 .../TextToolbar/ToolbarItems/DefaultButton.cs                   | 0
 .../TextToolbar/ToolbarItems/DefaultButtonModificationList.cs   | 0
 .../TextToolbar/ToolbarItems/IToolbarItem.cs                    | 0
 .../TextToolbar/ToolbarItems/ToolbarButton.cs                   | 0
 .../TextToolbar/ToolbarItems/ToolbarButton.xaml                 | 0
 .../TextToolbar/ToolbarItems/ToolbarSeparator.cs                | 0
 .../TextToolbar/ToolbarItems/ToolbarSeparator.xaml              | 0
 .../Themes/Generic.xaml                                         | 0
 .../TileControl/ImageAlignment.cs                               | 0
 .../TileControl/ScrollOrientation.cs                            | 0
 .../TileControl/TileControl.Properties.cs                       | 0
 .../TileControl/TileControl.cs                                  | 0
 .../TileControl/TileControl.xaml                                | 0
 .../TokenizingTextBox/ITokenStringContainer.cs                  | 0
 .../TokenizingTextBox/InterspersedObservableCollection.cs       | 0
 .../TokenizingTextBox/PretokenStringContainer.cs                | 0
 .../TokenizingTextBox/TokenItemAddingEventArgs.cs               | 0
 .../TokenizingTextBox/TokenItemRemovingEventArgs.cs             | 0
 .../TokenizingTextBox/TokenizingTextBox.Events.cs               | 0
 .../TokenizingTextBox/TokenizingTextBox.Properties.cs           | 0
 .../TokenizingTextBox/TokenizingTextBox.Selection.cs            | 0
 .../TokenizingTextBox/TokenizingTextBox.cs                      | 0
 .../TokenizingTextBox/TokenizingTextBox.xaml                    | 0
 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs   | 0
 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml | 0
 .../TokenizingTextBox/TokenizingTextBoxItem.Token.xaml          | 0
 .../TokenizingTextBox/TokenizingTextBoxItem.cs                  | 0
 .../TokenizingTextBox/TokenizingTextBoxStyleSelector.cs         | 0
 .../VisualStudioToolsManifest.xml                               | 0
 .../Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj        | 2 +-
 .../Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj           | 2 +-
 .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj              | 2 +-
 UITests/UITests.App/UITests.App.csproj                          | 2 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj                    | 2 +-
 .../UnitTests.XamlIslands.UWPApp.csproj                         | 2 +-
 Windows Community Toolkit.sln                                   | 2 +-
 188 files changed, 8 insertions(+), 8 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItemAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeMode.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeViewAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Constants.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/PreviewFailedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/Carousel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/Carousel.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/CarouselItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/CarouselPanel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorChannel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerButton.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerButton.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerRenderingHelpers.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorRepresentation.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorToColorShadeConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorToHexConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ContrastBrushConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/FluentColorPalette.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/IColorPalette.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.Composition.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.Math.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.XamlHost.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/ExpandDirection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Constants.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/ExpanderAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Data.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Helper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Options.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GripperHoverWrapper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedContentControl/HeaderedContentControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedContentControl/HeaderedContentControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedItemsControl/HeaderedItemsControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedItemsControl/HeaderedItemsControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/CachingStrategy.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.Members.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Members.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Placeholder.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Source.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExFailedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExOpenedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.AttachedProperties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Constants.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationClosedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationClosingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationDismissKind.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationOpeningEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/NotificationOptions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/StackMode.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/Styles/MSEdgeNotificationStyle.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/Styles/VSCodeNotificationStyle.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InlineCollectionWrapper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/PropertyChangeEventSource.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/BackButtonBehavior.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsViewState.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Extensions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Logic.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/MenuItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Microsoft.Toolkit.Uwp.UI.Controls.csproj (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitView.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewDataItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewDataItemCollection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewElementProperties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewItemClickedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanelItemArrangedArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanelItemsArrangedArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Properties/AssemblyInfo.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGauge.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGauge.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGaugeAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialProgressBar/RadialProgressBar.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialProgressBar/RadialProgressBar.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeChangedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeSelector.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeSelector.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDevicePicker.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDevicePicker.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDeviceSelectionMode.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RotatorTile/RotatorTile.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RotatorTile/RotatorTile.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Strings/en-US/Resources.resw (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/EditorChangedArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/ButtonActions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/Formatter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/RichText/RichTextButtonActions.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/RichText/RichTextFormatter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ShortcutKeyRequestArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/List.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/NumberedList.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/Symbol.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/Symbols.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Methods.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ButtonMap.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ButtonType.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/Common/CommonButtons.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/DefaultButton.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/IToolbarItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarButton.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarButton.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarSeparator.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarSeparator.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Themes/Generic.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/ImageAlignment.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/ScrollOrientation.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/ITokenStringContainer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/InterspersedObservableCollection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/PretokenStringContainer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenItemAddingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenItemRemovingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Selection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/VisualStudioToolsManifest.xml (100%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 3358e6eee51..550ccd02eb7 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1479,7 +1479,7 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
     </ProjectReference>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationDismissKind.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationDismissKind.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationDismissKind.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationDismissKind.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationOpeningEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationOpeningEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationOpeningEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationOpeningEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/NotificationOptions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/NotificationOptions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/NotificationOptions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/NotificationOptions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/StackMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/StackMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/StackMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/StackMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InlineCollectionWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InlineCollectionWrapper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InlineCollectionWrapper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InlineCollectionWrapper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Extensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Extensions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Extensions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Extensions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Logic.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Logic.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ShortcutKeyRequestArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ShortcutKeyRequestArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ShortcutKeyRequestArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ShortcutKeyRequestArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/List.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/List.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/List.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/List.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/NumberedList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/NumberedList.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/NumberedList.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/NumberedList.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbol.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbol.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Methods.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Methods.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonMap.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonMap.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonMap.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonMap.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonType.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonType.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonType.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonType.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/IToolbarItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/IToolbarItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/IToolbarItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/IToolbarItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
index a318c0dacc9..8412f2e5013 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
@@ -137,7 +137,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
       <Link>Microsoft.Toolkit.Uwp.UI.Controls.xml</Link>
       <Visible>False</Visible>
     </EmbeddedResource>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index 9d8dfd8aa28..4154680ba7d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -35,7 +35,7 @@
   <ItemGroup>
     <PackageReference Include="ColorCode.UWP" Version="2.0.6" />
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index 85beee41047..294e7524498 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
     <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index bcb7be34ecc..0c8da3c893c 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -226,7 +226,7 @@
       <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
     </ProjectReference>
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 12d87dfb764..98e5a542e95 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -247,7 +247,7 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
     </ProjectReference>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index bb54f37fd89..a77570c8fd4 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -191,7 +191,7 @@
       <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
     </ProjectReference>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index ce6734c34cc..5ae2469baa9 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{F1AFFFA7-28FE-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B30036C4-D514-4E5B-A323-587A061772CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj", "{DAEB9CEC-C817-33B2-74B2-BC379380DB72}"
 EndProject

From 41bb7e554f26cb714d9c6456a599f976ad65dad2 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 19 Jan 2021 15:35:16 -0500
Subject: [PATCH 33/84] Reanme controls package to controls.core

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  4 +-
 .../InAppNotificationXaml.bind                |  4 +-
 .../BladeView/BladeItem.cs                    |  4 +-
 .../GridSplitter/GridSplitter.cs              |  2 +-
 .../InAppNotification/InAppNotification.cs    |  2 +-
 .../InAppNotification/InAppNotification.xaml  |  4 +-
 ...osoft.Toolkit.Uwp.UI.Controls.Core.csproj} |  0
 ...t.Uwp.UI.Controls.Core.csproj.DotSettings} |  0
 .../Formats/RichText/RichTextFormatter.cs     |  2 +-
 .../TextToolbar/TextToolbar.xaml              |  6 +--
 .../Common/CommonButtons.Events.cs            | 18 +++----
 .../ToolbarItems/Common/CommonButtons.cs      | 12 ++---
 .../Themes/Generic.xaml                       | 52 +++++++++----------
 .../TokenizingTextBox/TokenizingTextBox.cs    |  6 +--
 .../TokenizingTextBox/TokenizingTextBox.xaml  |  4 +-
 .../VisualStudioToolsManifest.xml             |  2 +-
 ...Toolkit.Uwp.UI.Controls.DesignTools.csproj |  4 +-
 ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj |  6 +--
 .../Formats/MarkDown/MarkDownButtonActions.cs |  4 +-
 .../Formats/MarkDown/MarkDownFormatter.cs     |  8 +--
 UITests/UITests.App/UITests.App.csproj        |  4 +-
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  4 +-
 .../UnitTests.XamlIslands.UWPApp.csproj       |  4 +-
 .../XamlIslandsTest_StringExtensions.cs       |  2 +-
 Windows Community Toolkit.sln                 |  2 +-
 25 files changed, 80 insertions(+), 80 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{Microsoft.Toolkit.Uwp.UI.Controls.csproj => Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj} (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings => Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings} (100%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 550ccd02eb7..77d1b2ee9c8 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1479,9 +1479,9 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj">
       <Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
index 812d93e65cd..c9072cde030 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
@@ -12,8 +12,8 @@
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
-              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
+              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
+              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <local:DismissCommand x:Key="DismissCommand" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
index 21202d4d9fe..b6683199794 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
@@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args)
             {
                 Width = _normalModeWidth;
                 VisualStateManager.GoToState(this, "Expanded", true);
-                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
@@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args)
             {
                 Width = double.NaN;
                 VisualStateManager.GoToState(this, "Collapsed", true);
-                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
index facc3230bf7..edc0bab90c1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
@@ -168,7 +168,7 @@ public GridSplitter()
         {
             DefaultStyleKey = typeof(GridSplitter);
             Loaded += GridSplitter_Loaded;
-            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
             AutomationProperties.SetName(this, automationName);
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
index 7f2fd97cbfc..3ccdb9020b4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
@@ -63,7 +63,7 @@ protected override void OnApplyTemplate()
             {
                 _dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed;
                 _dismissButton.Click += DismissButton_Click;
-                AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
+                AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"));
             }
 
             if (_visualStateGroup != null)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
index 852ffaf2a63..8be0b25da05 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
@@ -3,8 +3,8 @@
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="BaseInAppNotificationsStyle"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs
index 9bf8ea673d4..08364b7189f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs
@@ -120,7 +120,7 @@ public override ButtonMap DefaultButtons
                 StrikeButton = CommonButtons.Strikethrough;
                 Underline = new ToolbarButton
                 {
-                    ToolTip = "WCT_TextToolbar_UnderlineLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_UnderlineLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Underline },
                     ShortcutKey = VirtualKey.U,
                     Activation = ((RichTextButtonActions)ButtonActions).FormatUnderline
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml
index 1e9da77f34d..85c878c325b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml
@@ -2,9 +2,9 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:TextToolbar">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
index 68bc7b5314e..8ea541e1a33 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs
@@ -54,13 +54,13 @@ public async void OpenLinkCreator(ToolbarButton button)
 
             var labelBox = new RichEditBox
             {
-                PlaceholderText = "WCT_TextToolbar_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                PlaceholderText = "WCT_TextToolbar_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                 Margin = new Thickness(0, 0, 0, 5),
                 AcceptsReturn = false
             };
             var linkBox = new TextBox
             {
-                PlaceholderText = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                PlaceholderText = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
 
             CheckBox relativeBox = null;
@@ -78,7 +78,7 @@ public async void OpenLinkCreator(ToolbarButton button)
             {
                 relativeBox = new CheckBox
                 {
-                    Content = "WCT_TextToolbar_RelativeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                    Content = "WCT_TextToolbar_RelativeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
                 };
                 contentPanel.Children.Add(relativeBox);
             }
@@ -89,10 +89,10 @@ public async void OpenLinkCreator(ToolbarButton button)
 
             var contentDialog = new ContentDialog
             {
-                Title = "WCT_TextToolbar_CreateLinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                Title = "WCT_TextToolbar_CreateLinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                 Content = contentPanel,
-                PrimaryButtonText = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
-                SecondaryButtonText = "WCT_TextToolbar_CancelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                PrimaryButtonText = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
+                SecondaryButtonText = "WCT_TextToolbar_CancelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
 
             if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
@@ -107,9 +107,9 @@ public async void OpenLinkCreator(ToolbarButton button)
                 labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.None, out string labelText);
                 labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.FormatRtf, out string formattedlabelText);
 
-                string linkInvalidLabel = "WCT_TextToolbar_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-                string okLabel = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-                string warningLabel = "WCT_TextToolbar_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                string linkInvalidLabel = "WCT_TextToolbar_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
+                string okLabel = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
+                string warningLabel = "WCT_TextToolbar_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 string linkText = linkBox.Text.Trim();
 
                 if (string.IsNullOrWhiteSpace(linkText))
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs
index 19c782e14bc..c1ca4575682 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs
@@ -37,7 +37,7 @@ public ToolbarButton Bold
                 return new ToolbarButton
                 {
                     Name = TextToolbar.BoldElement,
-                    ToolTip = "WCT_TextToolbar_BoldLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_BoldLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Bold },
                     ShortcutKey = VirtualKey.B,
                     Activation = MakeBold
@@ -55,7 +55,7 @@ public ToolbarButton Italics
                 return new ToolbarButton
                 {
                     Name = TextToolbar.ItalicsElement,
-                    ToolTip = "WCT_TextToolbar_ItalicsLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_ItalicsLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Italic },
                     ShortcutKey = VirtualKey.I,
                     Activation = MakeItalics
@@ -73,7 +73,7 @@ public ToolbarButton Strikethrough
                 return new ToolbarButton
                 {
                     Name = TextToolbar.StrikethoughElement,
-                    ToolTip = "WCT_TextToolbar_StrikethroughLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_StrikethroughLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Icon = new FontIcon { Glyph = "\u0335a\u0335b\u0335c\u0335", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                     Activation = MakeStrike,
                     ShortcutKey = VirtualKey.Subtract,
@@ -92,7 +92,7 @@ public ToolbarButton Link
                 return new ToolbarButton
                 {
                     Name = TextToolbar.LinkElement,
-                    ToolTip = "WCT_TextToolbar_LinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_LinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Link },
                     ShortcutKey = VirtualKey.K,
                     Activation = OpenLinkCreator,
@@ -111,7 +111,7 @@ public ToolbarButton List
                 return new ToolbarButton
                 {
                     Name = TextToolbar.ListElement,
-                    ToolTip = "WCT_TextToolbar_ListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_ListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Content = new TextToolbarSymbols.List(),
                     Activation = MakeList
                 };
@@ -128,7 +128,7 @@ public ToolbarButton OrderedList
                 return new ToolbarButton
                 {
                     Name = TextToolbar.OrderedElement,
-                    ToolTip = "WCT_TextToolbar_OrderedListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_OrderedListLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Content = new TextToolbarSymbols.NumberedList(),
                     Activation = MakeOList
                 };
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
index 95de109ee45..9d8b1d45878 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -1,31 +1,31 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
index 0b9576a565a..d46f9f24b17 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
@@ -185,7 +185,7 @@ protected override void OnApplyTemplate()
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
             var menuFlyout = new MenuFlyout();
@@ -349,7 +349,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var removeMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
             removeMenuItem.Click += (s, e) => TokenizingTextBoxItem_ClearClicked(tokenitem, null);
 
@@ -361,7 +361,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
index 8245896155c..dca7c0f5617 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
@@ -3,8 +3,8 @@
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Resources for TokenizingTextBox  -->
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 754b18df839..7503ac81402 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -1,5 +1,5 @@
 <FileList>
-  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.dll">
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Core.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
index 8412f2e5013..3ab5dfb3fb5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
@@ -137,8 +137,8 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.xml</Link>
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Core.xml">
+      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Core.xml</Link>
       <Visible>False</Visible>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index 4154680ba7d..a16e02bd467 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -35,7 +35,7 @@
   <ItemGroup>
     <PackageReference Include="ColorCode.UWP" Version="2.0.6" />
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
   </ItemGroup>
 
@@ -58,8 +58,8 @@
   <Target Name="RemoveUnwantedPri" AfterTargets="GetPackagingOutputs">
     <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
     <ItemGroup>
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
     </ItemGroup>
     <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
   </Target>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
index 087c6f54caa..3029e64d7f8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs
@@ -44,8 +44,8 @@ public override void FormatLink(ToolbarButton button, string label, string forma
         {
             var select = Formatter.Selected;
             int originalStart = Formatter.Selected.StartPosition;
-            string urlLabel = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
-            string labelLabel = "WCT_TextToolbar_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string urlLabel = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
+            string labelLabel = "WCT_TextToolbar_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
 
             // Replaces Selection of first Line only.
             if (select.Text.Contains("\r"))
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
index def51acba52..9bd48402bff 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs
@@ -55,7 +55,7 @@ public void StyleHeader(ToolbarButton button)
                 {
                     Content = new MarkdownTextBlock
                     {
-                        Text = val + "WCT_TextToolbar_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        Text = val + "WCT_TextToolbar_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                         IsTextSelectionEnabled = false
                     },
                     Tag = val,
@@ -462,7 +462,7 @@ public override ButtonMap DefaultButtons
                 QuoteButton = new ToolbarButton
                 {
                     Name = QuoteElement,
-                    ToolTip = "WCT_TextToolbar_QuoteLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                    ToolTip = "WCT_TextToolbar_QuoteLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                     Icon = new SymbolIcon { Symbol = Symbol.Message },
                     Activation = FormatQuote
                 };
@@ -479,13 +479,13 @@ public override ButtonMap DefaultButtons
                     {
                         Name = HeadersElement,
                         Icon = new SymbolIcon { Symbol = Symbol.FontSize },
-                        ToolTip = "WCT_TextToolbar_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        ToolTip = "WCT_TextToolbar_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                         Activation = StyleHeader
                     },
                     new ToolbarButton
                     {
                         Name = CodeElement,
-                        ToolTip = "WCT_TextToolbar_CodeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
+                        ToolTip = "WCT_TextToolbar_CodeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"),
                         Icon = new FontIcon { Glyph = "{}", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
                         Activation = FormatCode
                     },
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 0c8da3c893c..273b0b92955 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -226,9 +226,9 @@
       <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj">
       <Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 98e5a542e95..11820c049c6 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -247,9 +247,9 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj">
       <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index a77570c8fd4..3067971ab21 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -191,9 +191,9 @@
       <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj">
       <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
index d9393b8054c..3310f05c1a4 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
@@ -44,7 +44,7 @@ await App.Dispatcher.EnqueueAsync(() =>
         [TestMethod]
         public void StringExtensions_GetLocalizedWithResourcePath()
         {
-            var str = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            var str = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
             Assert.AreEqual("Ok", str);
         }
 
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 5ae2469baa9..68ef0df7d91 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{F1AFFFA7-28FE-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B30036C4-D514-4E5B-A323-587A061772CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Core", "Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj", "{DAEB9CEC-C817-33B2-74B2-BC379380DB72}"
 EndProject

From c26afc9af9ee47f095180c6ff230f374ec10008d Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 19 Jan 2021 12:43:45 -0500
Subject: [PATCH 34/84] Move Controls.Desin to Controls.Core.Desin

---
 .../Common/Constants.cs                             |   0
 .../Common/MetadataRegistrationBase.cs              |   0
 .../Common/PlatformTypes.cs                         |   0
 .../Controls/BladeItem.Metadata.cs                  |   0
 .../Controls/BladeItem.Typedata.cs                  |   0
 .../Controls/BladeView.Metadata.cs                  |   0
 .../Controls/BladeView.Typedata.cs                  |   0
 .../Controls/Carousel.Metadata.cs                   |   0
 .../Controls/Carousel.Typedata.cs                   |   0
 .../Controls/DropShadowPanel.Metadata.cs            |   0
 .../Controls/DropShadowPanel.Typedata.cs            |   0
 .../Controls/Expander.Metadata.cs                   |   0
 .../Controls/Expander.Typedata.cs                   |   0
 .../Controls/GridSplitter.Metadata.cs               |   0
 .../Controls/GridSplitter.Typedata.cs               |   0
 .../Controls/ImageEx.Metadata.cs                    |   0
 .../Controls/ImageEx.Typedata.cs                    |   0
 .../Controls/InAppNotification.Metadata.cs          |   0
 .../Controls/InAppNotification.Typedata.cs          |   0
 .../Controls/LayoutTransitionControl.Metadata.cs    |   0
 .../Controls/LayoutTransitionControl.Typedata.cs    |   0
 .../Controls/Loading.Metadata.cs                    |   0
 .../Controls/Loading.Typedata.cs                    |   0
 .../Controls/MasterDetailsView.Metadata.cs          |   0
 .../Controls/MasterDetailsView.Typedata.cs          |   0
 .../Controls/Menu.Metadata.cs                       |   0
 .../Controls/Menu.Typedata.cs                       |   0
 .../Controls/MenuItem.Metadata.cs                   |   0
 .../Controls/MenuItem.Typedata.cs                   |   0
 .../Controls/OrbitView.Metadata.cs                  |   0
 .../Controls/OrbitView.Typedata.cs                  |   0
 .../Controls/RadialGauge.Metadata.cs                |   0
 .../Controls/RadialGauge.Typedata.cs                |   0
 .../Controls/RadialProgressBar.Metadata.cs          |   0
 .../Controls/RadialProgressBar.Typedata.cs          |   0
 .../Controls/RangeSelector.Metadata.cs              |   0
 .../Controls/RangeSelector.Typedata.cs              |   0
 .../Controls/RotatorTile.Metadata.cs                |   0
 .../Controls/RotatorTile.Typedata.cs                |   0
 .../Controls/ScrollHeader.Metadata.cs               |   0
 .../Controls/ScrollHeader.Typedata.cs               |   0
 .../Controls/TextToolbar.Metadata.cs                |   0
 .../Controls/TextToolbar.Typedata.cs                |   0
 .../Controls/TileControl.Metadata.cs                |   0
 .../Controls/TileControl.Typedata.cs                |   0
 .../Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png | Bin
 ...oft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png | Bin
 .../MetadataRegistration.cs                         |   0
 ...osoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj |   0
 .../Properties/AssemblyInfo.cs                      |   0
 .../Properties/Resources.Designer.cs                |   0
 .../Properties/Resources.resx                       |   0
 ...lkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj |   8 ++++----
 ...lkit.Uwp.UI.Controls.Markdown.DesignTools.csproj |   8 ++++----
 ...it.Uwp.UI.Controls.Primitives.DesignTools.csproj |   8 ++++----
 Windows Community Toolkit.sln                       |   2 +-
 56 files changed, 13 insertions(+), 13 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Common/Constants.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Common/MetadataRegistrationBase.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Common/PlatformTypes.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/BladeItem.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/BladeItem.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/BladeView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/BladeView.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Carousel.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Carousel.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/DropShadowPanel.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/DropShadowPanel.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Expander.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Expander.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/GridSplitter.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/GridSplitter.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/ImageEx.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/ImageEx.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/InAppNotification.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/InAppNotification.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/LayoutTransitionControl.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/LayoutTransitionControl.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Loading.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Loading.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/MasterDetailsView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/MasterDetailsView.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Menu.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/Menu.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/MenuItem.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/MenuItem.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/OrbitView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/OrbitView.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RadialGauge.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RadialGauge.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RadialProgressBar.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RadialProgressBar.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RangeSelector.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RangeSelector.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RotatorTile.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/RotatorTile.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/ScrollHeader.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/ScrollHeader.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/TextToolbar.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/TextToolbar.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/TileControl.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Controls/TileControl.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/MetadataRegistration.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Properties/AssemblyInfo.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Properties/Resources.Designer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Core.Design}/Properties/Resources.resx (100%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistrationBase.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistrationBase.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/PlatformTypes.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/PlatformTypes.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Loading.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Menu.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MenuItem.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
index 379b99d06a8..ae9be61bced 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj
@@ -75,10 +75,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
     <Compile Include="Controls\DataGrid.Metadata.cs" />
     <Compile Include="Controls\DataGrid.Typedata.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
index 2c32a4774c2..e8ba7d46a80 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj
@@ -75,10 +75,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
     <Compile Include="Controls\MarkdownTextBlock.Metadata.cs" />
     <Compile Include="Controls\MarkdownTextBlock.Typedata.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
index 470bf4c5e0f..351fd292c13 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
@@ -75,10 +75,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
     <Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
     <Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
     <Compile Include="Controls\WrapPanel.Metadata.cs" />
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 68ef0df7d91..c9c1795e836 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -55,7 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		settings.xamlstyler = settings.xamlstyler
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Design\Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81}
 	EndProjectSection

From 28b6056f806ecce34b7fd6712248eeb3d1ff600b Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 14:55:50 -0500
Subject: [PATCH 35/84] Rename Contols.Design -> Controls.Core.Design

---
 ...> Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj} | 2 +-
 Windows Community Toolkit.sln                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/{Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj => Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj} (98%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index 3ab5dfb3fb5..de47247a39f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.DesignTools</AssemblyName>
+    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index c9c1795e836..cde9430b45f 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -55,7 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		settings.xamlstyler = settings.xamlstyler
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81}
 	EndProjectSection

From 298b95beed745535e1f95b938ec329b3a69c88da Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 16:35:48 -0500
Subject: [PATCH 36/84] Controls.Core: Remove animation proj ref

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index 8e2ffab23ce..179a1c4a8ac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -38,7 +38,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>

From 123b8643e3fe8b008ead8aec58153b516b4a942a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 16:51:11 -0500
Subject: [PATCH 37/84] SmokeTests: update ref to Controls.Core

---
 .../MainPage.xaml                                               | 0
 .../MainPage.xaml.cs                                            | 0
 SmokeTests/SmokeTest.csproj                                     | 2 +-
 SmokeTests/SmokeTests.proj                                      | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename SmokeTests/{Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MainPage.xaml (100%)
 rename SmokeTests/{Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MainPage.xaml.cs (100%)

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
similarity index 100%
rename from SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
rename to SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml.cs
similarity index 100%
rename from SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
rename to SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml.cs
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index 3b481d98be5..065f2d84af3 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -4,7 +4,7 @@
   <!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
   <PropertyGroup Condition="'$(CurrentProject)' == ''">
     <!-- When writting the SmokeTests, change this to whichever Toolkit project you want to build a test to, then reload the project -->
-    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls</CurrentProject>
+    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls.Core</CurrentProject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NuGetPackageVersion)' == ''">
     <NuGetPackageVersion>To Fill In With Local Version Number</NuGetPackageVersion>
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index b7ba6ee0f16..c421f2b3e71 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -19,7 +19,7 @@
       Microsoft.Toolkit.Uwp.UI;
       Microsoft.Toolkit.Uwp.UI.Animations;
       Microsoft.Toolkit.Uwp.UI.Behaviors;
-      Microsoft.Toolkit.Uwp.UI.Controls;
+      Microsoft.Toolkit.Uwp.UI.Controls.Core;
       Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
       Microsoft.Toolkit.Uwp.UI.Controls.Layout;
       Microsoft.Toolkit.Uwp.UI.Controls.Markdown;

From d9f6e1820e2ee8d39e5bbfb7e3d1459e7d1ab658 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 15:12:37 -0500
Subject: [PATCH 38/84] Rename folder: MasterDetailsView -> ListDetailsView

---
 .../BackButtonBehavior.cs                                       | 0
 .../MasterDetailsView.Events.cs                                 | 0
 .../MasterDetailsView.Properties.cs                             | 0
 .../{MasterDetailsView => ListDetailsView}/MasterDetailsView.cs | 0
 .../MasterDetailsView.xaml                                      | 0
 .../MasterDetailsViewState.cs                                   | 0
 Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml      | 2 +-
 7 files changed, 1 insertion(+), 1 deletion(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{MasterDetailsView => ListDetailsView}/BackButtonBehavior.cs (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{MasterDetailsView => ListDetailsView}/MasterDetailsView.Events.cs (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{MasterDetailsView => ListDetailsView}/MasterDetailsView.Properties.cs (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{MasterDetailsView => ListDetailsView}/MasterDetailsView.cs (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{MasterDetailsView => ListDetailsView}/MasterDetailsView.xaml (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{MasterDetailsView => ListDetailsView}/MasterDetailsViewState.cs (100%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsViewState.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsViewState.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
index 9d8b1d45878..5ffeaa40a44 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -16,7 +16,7 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />

From a3c2cf735d4de5316f8dcc4f3447fd3e23803a2b Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 15:18:00 -0500
Subject: [PATCH 39/84] Rename file: MasterDetailView -> ListDetailView

---
 ...ew.Events.cs => ListDetailsView.Events.cs} |  0
 ...rties.cs => ListDetailsView.Properties.cs} |  8 +++----
 ...asterDetailsView.cs => ListDetailsView.cs} | 22 +++++++++----------
 ...rDetailsView.xaml => ListDetailsView.xaml} |  0
 ...lsViewState.cs => ListDetailsViewState.cs} |  0
 .../Themes/Generic.xaml                       |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/{MasterDetailsView.Events.cs => ListDetailsView.Events.cs} (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/{MasterDetailsView.Properties.cs => ListDetailsView.Properties.cs} (98%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/{MasterDetailsView.cs => ListDetailsView.cs} (96%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/{MasterDetailsView.xaml => ListDetailsView.xaml} (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/{MasterDetailsViewState.cs => ListDetailsViewState.cs} (100%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
index e7b7a22ca54..d3aca2c18e4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
@@ -131,9 +131,9 @@ public partial class MasterDetailsView
         /// <returns>The identifier for the <see cref="ViewState"/> dependency property.</returns>
         public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(
             nameof(ViewState),
-            typeof(MasterDetailsViewState),
+            typeof(ListDetailsViewState),
             typeof(MasterDetailsView),
-            new PropertyMetadata(default(MasterDetailsViewState)));
+            new PropertyMetadata(default(ListDetailsViewState)));
 
         /// <summary>
         /// Identifies the <see cref="MasterCommandBar"/> dependency property
@@ -298,9 +298,9 @@ public DataTemplate NoSelectionContentTemplate
         /// <summary>
         /// Gets the current visual state of the control
         /// </summary>
-        public MasterDetailsViewState ViewState
+        public ListDetailsViewState ViewState
         {
-            get { return (MasterDetailsViewState)GetValue(ViewStateProperty); }
+            get { return (ListDetailsViewState)GetValue(ViewStateProperty); }
             private set { SetValue(ViewStateProperty, value); }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
index 60ad5fdbf4e..7a3d81d308d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
@@ -282,7 +282,7 @@ private void HandleStateChanges()
         /// <param name="args">The event args</param>
         private void OnFrameNavigating(object sender, NavigatingCancelEventArgs args)
         {
-            if ((args.NavigationMode == NavigationMode.Back) && (ViewState == MasterDetailsViewState.Details))
+            if ((args.NavigationMode == NavigationMode.Back) && (ViewState == ListDetailsViewState.Details))
             {
                 SelectedItem = null;
                 args.Cancel = true;
@@ -296,7 +296,7 @@ private void OnFrameNavigating(object sender, NavigatingCancelEventArgs args)
         /// <param name="args">The event args</param>
         private void OnBackRequested(object sender, BackRequestedEventArgs args)
         {
-            if (ViewState == MasterDetailsViewState.Details)
+            if (ViewState == ListDetailsViewState.Details)
             {
                 // let the OnFrameNavigating method handle it if
                 if (_frame == null || !_frame.CanGoBack)
@@ -327,7 +327,7 @@ private void UpdateView(bool animate)
         /// <summary>
         /// Sets the back button visibility based on the current visual state and selected item
         /// </summary>
-        private void SetBackButtonVisibility(MasterDetailsViewState? previousState = null)
+        private void SetBackButtonVisibility(ListDetailsViewState? previousState = null)
         {
             const int backButtonVisible = 1;
 
@@ -336,7 +336,7 @@ private void SetBackButtonVisibility(MasterDetailsViewState? previousState = nul
                 return;
             }
 
-            if (ViewState == MasterDetailsViewState.Details)
+            if (ViewState == ListDetailsViewState.Details)
             {
                 if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
                 {
@@ -370,7 +370,7 @@ private void SetBackButtonVisibility(MasterDetailsViewState? previousState = nul
                     navigationManager.AppViewBackButtonVisibility = AppViewBackButtonVisibility.Visible;
                 }
             }
-            else if (previousState == MasterDetailsViewState.Details)
+            else if (previousState == ListDetailsViewState.Details)
             {
                 if ((BackButtonBehavior == BackButtonBehavior.Inline) && (_inlineBackButton != null))
                 {
@@ -406,11 +406,11 @@ private void UpdateViewState()
 
             if (ActualWidth < CompactModeThresholdWidth)
             {
-                ViewState = SelectedItem == null ? MasterDetailsViewState.Master : MasterDetailsViewState.Details;
+                ViewState = SelectedItem == null ? ListDetailsViewState.Master : ListDetailsViewState.Details;
             }
             else
             {
-                ViewState = MasterDetailsViewState.Both;
+                ViewState = ListDetailsViewState.Both;
             }
 
             if (previousState != ViewState)
@@ -504,9 +504,9 @@ private void OnCommandBarChanged(string panelName, CommandBar commandbar)
         /// Sets whether the selected item should change when focused with the keyboard based on the view state
         /// </summary>
         /// <param name="viewState">the view state</param>
-        private void SetListSelectionWithKeyboardFocusOnVisualStateChanged(MasterDetailsViewState viewState)
+        private void SetListSelectionWithKeyboardFocusOnVisualStateChanged(ListDetailsViewState viewState)
         {
-            if (viewState == MasterDetailsViewState.Both)
+            if (viewState == ListDetailsViewState.Both)
             {
                 SetListSelectionWithKeyboardFocus(true);
             }
@@ -546,9 +546,9 @@ private void OnSelectionStateChanged(object sender, VisualStateChangedEventArgs
         /// Sets focus to the relevant control based on the viewState.
         /// </summary>
         /// <param name="viewState">the view state</param>
-        private void SetFocus(MasterDetailsViewState viewState)
+        private void SetFocus(ListDetailsViewState viewState)
         {
-            if (viewState != MasterDetailsViewState.Details)
+            if (viewState != ListDetailsViewState.Details)
             {
                 FocusItemList();
             }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsViewState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
index 5ffeaa40a44..d6c4cc4e660 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -16,7 +16,7 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/MasterDetailsView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />

From d422af71b03c7915f4121d8bba3e4939bbd48aa3 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 15:41:40 -0500
Subject: [PATCH 40/84] Rename class: MasterDetailsView -> ListDetailsView

---
 .../MasterDetailsView/MasterDetailsView.bind  | 24 ++++++-------
 .../MasterDetailsViewPage.xaml                |  2 +-
 .../ListDetailsView/BackButtonBehavior.cs     |  8 ++---
 .../ListDetailsView/ListDetailsView.Events.cs |  4 +--
 .../ListDetailsView.Properties.cs             | 34 +++++++++----------
 .../ListDetailsView/ListDetailsView.cs        | 22 ++++++------
 .../ListDetailsView/ListDetailsView.xaml      |  4 +--
 .../ListDetailsView/ListDetailsViewState.cs   |  4 +--
 .../VisualStudioToolsManifest.xml             |  2 +-
 .../UI/Controls/Test_MasterDetailsView.cs     | 12 +++----
 10 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
index 44436fe8278..7667e0edd21 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
@@ -8,11 +8,11 @@
     mc:Ignorable="d">
 
     <Grid>
-        <controls:MasterDetailsView BackButtonBehavior="Automatic" 
+        <controls:ListDetailsView BackButtonBehavior="Automatic" 
                                     ItemsSource="{Binding Emails}"
                                     NoSelectionContent="Select an item to view"
                                     CompactModeThresholdWidth="720">
-            <controls:MasterDetailsView.ItemTemplate>
+            <controls:ListDetailsView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Margin="0,8">
                         <TextBlock Text="{Binding From}" 
@@ -27,8 +27,8 @@
                                    MaxLines="1"/>
                     </StackPanel>
                 </DataTemplate>
-            </controls:MasterDetailsView.ItemTemplate>
-            <controls:MasterDetailsView.DetailsTemplate>
+            </controls:ListDetailsView.ItemTemplate>
+            <controls:ListDetailsView.DetailsTemplate>
                 <DataTemplate>
                     <RelativePanel Margin="24">
                         <controls:ImageEx x:Name="FromEllipse"
@@ -53,8 +53,8 @@
                                    Margin="0,12,0,0"/>
                     </RelativePanel>
                 </DataTemplate>
-            </controls:MasterDetailsView.DetailsTemplate>
-            <controls:MasterDetailsView.NoSelectionContentTemplate>
+            </controls:ListDetailsView.DetailsTemplate>
+            <controls:ListDetailsView.NoSelectionContentTemplate>
                 <DataTemplate>
                     <StackPanel HorizontalAlignment="Center" 
                                 VerticalAlignment="Center">
@@ -71,8 +71,8 @@
                                    Margin="0,12"/>
                     </StackPanel>
                 </DataTemplate>
-            </controls:MasterDetailsView.NoSelectionContentTemplate>
-            <controls:MasterDetailsView.MasterCommandBar>
+            </controls:ListDetailsView.NoSelectionContentTemplate>
+            <controls:ListDetailsView.MasterCommandBar>
                 <CommandBar>
                     <AppBarButton Icon="Back" Label="Back"/>
                     <AppBarButton Icon="Forward" Label="Forward"/>
@@ -84,14 +84,14 @@
             </TextBlock>
           </CommandBar.Content>
         </CommandBar>
-      </controls:MasterDetailsView.MasterCommandBar>
-      <controls:MasterDetailsView.DetailsCommandBar>
+      </controls:ListDetailsView.MasterCommandBar>
+      <controls:ListDetailsView.DetailsCommandBar>
         <CommandBar>
           <AppBarButton Icon="MailReply" Label="Reply" />
           <AppBarButton Icon="MailReplyAll" Label="Reply All" />
           <AppBarButton Icon="MailForward" Label="Forward" />
         </CommandBar>
-      </controls:MasterDetailsView.DetailsCommandBar>
-    </controls:MasterDetailsView>
+      </controls:ListDetailsView.DetailsCommandBar>
+    </controls:ListDetailsView>
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml
index 017805b8326..e86bba58882 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml
@@ -7,5 +7,5 @@
       xmlns:models="using:Microsoft.Toolkit.Uwp.SampleApp.Models"
       mc:Ignorable="d">
 
-    <controls:MasterDetailsView Visibility="Collapsed" />
+    <controls:ListDetailsView Visibility="Collapsed" />
 </Page>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
index 694979e659d..96fe2bd6f87 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// The behavior to use for navigating between the <see cref="MasterDetailsView"/> master and details views
+    /// The behavior to use for navigating between the <see cref="ListDetailsView"/> master and details views
     /// </summary>
     public enum BackButtonBehavior
     {
@@ -13,14 +13,14 @@ public enum BackButtonBehavior
         /// Automatically determine the best approach to use.
         /// </summary>
         /// <remarks>
-        /// If the back button controlled by <see cref="Windows.UI.Core.SystemNavigationManager"/> is already visible, the <see cref="MasterDetailsView"/> will hook into that button.
-        /// If the new NavigationView provided by the Windows UI nuget package is used, the <see cref="MasterDetailsView"/> will enable and show that button.
+        /// If the back button controlled by <see cref="Windows.UI.Core.SystemNavigationManager"/> is already visible, the <see cref="ListDetailsView"/> will hook into that button.
+        /// If the new NavigationView provided by the Windows UI nuget package is used, the <see cref="ListDetailsView"/> will enable and show that button.
         /// Otherwise the inline button is used.
         /// </remarks>
         Automatic,
 
         /// <summary>
-        /// Use a back button built into the <see cref="MasterDetailsView"/>
+        /// Use a back button built into the <see cref="ListDetailsView"/>
         /// </summary>
         Inline,
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
index ab7c55a2b29..ab4ee4dcfce 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// Panel that allows for a Master/Details pattern.
     /// </summary>
     /// <seealso cref="Windows.UI.Xaml.Controls.ItemsControl" />
-    public partial class MasterDetailsView
+    public partial class ListDetailsView
     {
         /// <summary>
         /// Occurs when the currently selected item changes.
@@ -21,7 +21,7 @@ public partial class MasterDetailsView
         /// <summary>
         /// Occurs when the view state changes
         /// </summary>
-        public event EventHandler<MasterDetailsViewState> ViewStateChanged;
+        public event EventHandler<ListDetailsViewState> ViewStateChanged;
 
         private void OnSelectionChanged(SelectionChangedEventArgs e)
         {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
index d3aca2c18e4..0531b2c96a7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// Panel that allows for a Master/Details pattern.
     /// </summary>
     /// <seealso cref="Windows.UI.Xaml.Controls.ItemsControl" />
-    public partial class MasterDetailsView
+    public partial class ListDetailsView
     {
         /// <summary>
         /// Identifies the SelectedIndex dependency property.
@@ -22,7 +22,7 @@ public partial class MasterDetailsView
             DependencyProperty.Register(
                 nameof(SelectedIndex),
                 typeof(int),
-                typeof(MasterDetailsView),
+                typeof(ListDetailsView),
                 new PropertyMetadata(-1, OnSelectedIndexChanged));
 
         /// <summary>
@@ -32,7 +32,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register(
             nameof(SelectedItem),
             typeof(object),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null, OnSelectedItemChanged));
 
         /// <summary>
@@ -42,7 +42,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty DetailsTemplateProperty = DependencyProperty.Register(
             nameof(DetailsTemplate),
             typeof(DataTemplate),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -52,7 +52,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty MasterPaneBackgroundProperty = DependencyProperty.Register(
             nameof(MasterPaneBackground),
             typeof(Brush),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -62,7 +62,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty MasterHeaderProperty = DependencyProperty.Register(
             nameof(MasterHeader),
             typeof(object),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null, OnMasterHeaderChanged));
 
         /// <summary>
@@ -72,7 +72,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty MasterHeaderTemplateProperty = DependencyProperty.Register(
             nameof(MasterHeaderTemplate),
             typeof(DataTemplate),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -82,7 +82,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty DetailsHeaderProperty = DependencyProperty.Register(
             nameof(DetailsHeader),
             typeof(object),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -92,7 +92,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty DetailsHeaderTemplateProperty = DependencyProperty.Register(
             nameof(DetailsHeaderTemplate),
             typeof(DataTemplate),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -102,7 +102,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty MasterPaneWidthProperty = DependencyProperty.Register(
             nameof(MasterPaneWidth),
             typeof(double),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(320d));
 
         /// <summary>
@@ -112,7 +112,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty NoSelectionContentProperty = DependencyProperty.Register(
             nameof(NoSelectionContent),
             typeof(object),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -122,7 +122,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty NoSelectionContentTemplateProperty = DependencyProperty.Register(
             nameof(NoSelectionContentTemplate),
             typeof(DataTemplate),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -132,7 +132,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(
             nameof(ViewState),
             typeof(ListDetailsViewState),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(default(ListDetailsViewState)));
 
         /// <summary>
@@ -142,7 +142,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty MasterCommandBarProperty = DependencyProperty.Register(
             nameof(MasterCommandBar),
             typeof(CommandBar),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null, OnMasterCommandBarChanged));
 
         /// <summary>
@@ -152,7 +152,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty DetailsCommandBarProperty = DependencyProperty.Register(
             nameof(DetailsCommandBar),
             typeof(CommandBar),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(null, OnDetailsCommandBarChanged));
 
         /// <summary>
@@ -161,7 +161,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty CompactModeThresholdWidthProperty = DependencyProperty.Register(
             nameof(CompactModeThresholdWidth),
             typeof(double),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(720d, OnCompactModeThresholdWidthChanged));
 
         /// <summary>
@@ -170,7 +170,7 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty BackButtonBehaviorProperty = DependencyProperty.Register(
             nameof(BackButtonBehavior),
             typeof(BackButtonBehavior),
-            typeof(MasterDetailsView),
+            typeof(ListDetailsView),
             new PropertyMetadata(BackButtonBehavior.System, OnBackButtonBehaviorChanged));
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
index 7a3d81d308d..df14152ed54 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
@@ -25,7 +25,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplateVisualState(Name = HasSelectionNarrowState, GroupName = SelectionStates)]
     [TemplateVisualState(Name = NarrowState, GroupName = WidthStates)]
     [TemplateVisualState(Name = WideState, GroupName = WidthStates)]
-    public partial class MasterDetailsView : ItemsControl
+    public partial class ListDetailsView : ItemsControl
     {
         private const string PartDetailsPresenter = "DetailsPresenter";
         private const string PartDetailsPanel = "DetailsPanel";
@@ -52,11 +52,11 @@ public partial class MasterDetailsView : ItemsControl
         private Frame _frame;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="MasterDetailsView"/> class.
+        /// Initializes a new instance of the <see cref="ListDetailsView"/> class.
         /// </summary>
-        public MasterDetailsView()
+        public ListDetailsView()
         {
-            DefaultStyleKey = typeof(MasterDetailsView);
+            DefaultStyleKey = typeof(ListDetailsView);
 
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
@@ -105,7 +105,7 @@ protected override void OnApplyTemplate()
         /// </remarks>
         private static void OnSelectedIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var view = (MasterDetailsView)d;
+            var view = (ListDetailsView)d;
 
             var newValue = (int)e.NewValue < 0 ? null : view.Items[(int)e.NewValue];
             var oldValue = e.OldValue == null ? null : view.Items.ElementAtOrDefault((int)e.OldValue);
@@ -129,7 +129,7 @@ private static void OnSelectedIndexChanged(DependencyObject d, DependencyPropert
         /// </remarks>
         private static void OnSelectedItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var view = (MasterDetailsView)d;
+            var view = (ListDetailsView)d;
             var index = e.NewValue == null ? -1 : view.Items.IndexOf(e.NewValue);
 
             // check if selection actually changed
@@ -148,7 +148,7 @@ private static void OnSelectedItemChanged(DependencyObject d, DependencyProperty
         /// <param name="e">The event args</param>
         private static void OnMasterHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var view = (MasterDetailsView)d;
+            var view = (ListDetailsView)d;
             view.SetMasterHeaderVisibility();
         }
 
@@ -159,7 +159,7 @@ private static void OnMasterHeaderChanged(DependencyObject d, DependencyProperty
         /// <param name="e">The event args</param>
         private static void OnDetailsCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var view = (MasterDetailsView)d;
+            var view = (ListDetailsView)d;
             view.OnDetailsCommandBarChanged();
         }
 
@@ -170,12 +170,12 @@ private static void OnDetailsCommandBarChanged(DependencyObject d, DependencyPro
         /// <param name="e">The event args</param>
         private static void OnCompactModeThresholdWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            ((MasterDetailsView)d).HandleStateChanges();
+            ((ListDetailsView)d).HandleStateChanges();
         }
 
         private static void OnBackButtonBehaviorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var view = (MasterDetailsView)d;
+            var view = (ListDetailsView)d;
             view.SetBackButtonVisibility();
         }
 
@@ -186,7 +186,7 @@ private static void OnBackButtonBehaviorChanged(DependencyObject d, DependencyPr
         /// <param name="e">The event args</param>
         private static void OnMasterCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var view = (MasterDetailsView)d;
+            var view = (ListDetailsView)d;
             view.OnMasterCommandBarChanged();
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
index dd37399662f..dd276236b68 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
@@ -2,14 +2,14 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
-    <Style TargetType="controls:MasterDetailsView">
+    <Style TargetType="controls:ListDetailsView">
         <Setter Property="Background" Value="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="controls:MasterDetailsView">
+                <ControlTemplate TargetType="controls:ListDetailsView">
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
index a22d3ac678b..4dc02d3cde8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
@@ -5,9 +5,9 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// The <see cref="MasterDetailsView"/> state.
+    /// The <see cref="ListDetailsView"/> state.
     /// </summary>
-    public enum MasterDetailsViewState
+    public enum ListDetailsViewState
     {
         /// <summary>
         /// Only the Master view is shown
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 7503ac81402..5a84cf2dbac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -16,7 +16,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ListDetailsView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitView" />
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
index 7108d74e020..bcb88b98f27 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
@@ -17,7 +17,7 @@ public class Test_MasterDetailsView
         public void Test_SelectedIndex_Default()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
+            var masterDetailsView = new ListDetailsView();
             masterDetailsView.ItemsSource = items;
             Assert.AreEqual(-1, masterDetailsView.SelectedIndex);
         }
@@ -27,7 +27,7 @@ public void Test_SelectedIndex_Default()
         public void Test_SelectedItem_Default()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
+            var masterDetailsView = new ListDetailsView();
             masterDetailsView.ItemsSource = items;
             Assert.IsNull(masterDetailsView.SelectedItem);
         }
@@ -37,7 +37,7 @@ public void Test_SelectedItem_Default()
         public void Test_SelectedIndex_Syncs_SelectedItem()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
+            var masterDetailsView = new ListDetailsView();
             masterDetailsView.ItemsSource = items;
             masterDetailsView.SelectedIndex = 6;
             Assert.AreEqual(items[6], masterDetailsView.SelectedItem);
@@ -48,7 +48,7 @@ public void Test_SelectedIndex_Syncs_SelectedItem()
         public void Test_UnselectUsingIndex()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
+            var masterDetailsView = new ListDetailsView();
             masterDetailsView.ItemsSource = items;
             masterDetailsView.SelectedIndex = 5;            
             masterDetailsView.SelectedIndex = -1;
@@ -60,7 +60,7 @@ public void Test_UnselectUsingIndex()
         public void Test_UnselectUsingItem()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
+            var masterDetailsView = new ListDetailsView();
             masterDetailsView.ItemsSource = items;
             masterDetailsView.SelectedItem = items[5];
             masterDetailsView.SelectedItem = null;
@@ -72,7 +72,7 @@ public void Test_UnselectUsingItem()
         public void Test_SelectedItem_Syncs_SelectedIndex()
         {
             var items = Enumerable.Range(0, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
+            var masterDetailsView = new ListDetailsView();
             masterDetailsView.ItemsSource = items;
             masterDetailsView.SelectedItem = items[3];
             Assert.AreEqual(3, masterDetailsView.SelectedIndex);

From d7ba28479bfa6468f2db6534117cd481d0e14b7c Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 16:07:02 -0500
Subject: [PATCH 41/84] Rename all the master things in MasterDetailsView to
 list

---
 .../ListDetailsView/BackButtonBehavior.cs     |  2 +-
 .../ListDetailsView/ListDetailsView.Events.cs |  2 +-
 .../ListDetailsView.Properties.cs             | 90 +++++++++----------
 .../ListDetailsView/ListDetailsView.cs        | 44 ++++-----
 .../ListDetailsView/ListDetailsView.xaml      | 34 +++----
 .../ListDetailsView/ListDetailsViewState.cs   |  6 +-
 ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj |  2 +-
 7 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
index 96fe2bd6f87..165d9409af8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// The behavior to use for navigating between the <see cref="ListDetailsView"/> master and details views
+    /// The behavior to use for navigating between the <see cref="ListDetailsView"/> list and details views
     /// </summary>
     public enum BackButtonBehavior
     {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
index ab4ee4dcfce..efbad14e5e0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Panel that allows for a Master/Details pattern.
+    /// Panel that allows for a List/Details pattern.
     /// </summary>
     /// <seealso cref="Windows.UI.Xaml.Controls.ItemsControl" />
     public partial class ListDetailsView
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
index 0531b2c96a7..73c8b92f77f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Panel that allows for a Master/Details pattern.
+    /// Panel that allows for a List/Details pattern.
     /// </summary>
     /// <seealso cref="Windows.UI.Xaml.Controls.ItemsControl" />
     public partial class ListDetailsView
@@ -46,31 +46,31 @@ public partial class ListDetailsView
             new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="MasterPaneBackground"/> dependency property.
+        /// Identifies the <see cref="ListPaneBackground"/> dependency property.
         /// </summary>
-        /// <returns>The identifier for the <see cref="MasterPaneBackground"/> dependency property.</returns>
-        public static readonly DependencyProperty MasterPaneBackgroundProperty = DependencyProperty.Register(
-            nameof(MasterPaneBackground),
+        /// <returns>The identifier for the <see cref="ListPaneBackground"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneBackgroundProperty = DependencyProperty.Register(
+            nameof(ListPaneBackground),
             typeof(Brush),
             typeof(ListDetailsView),
             new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="MasterHeader"/> dependency property.
+        /// Identifies the <see cref="ListHeader"/> dependency property.
         /// </summary>
-        /// <returns>The identifier for the <see cref="MasterHeader"/> dependency property.</returns>
-        public static readonly DependencyProperty MasterHeaderProperty = DependencyProperty.Register(
-            nameof(MasterHeader),
+        /// <returns>The identifier for the <see cref="ListHeader"/> dependency property.</returns>
+        public static readonly DependencyProperty ListHeaderProperty = DependencyProperty.Register(
+            nameof(ListHeader),
             typeof(object),
             typeof(ListDetailsView),
-            new PropertyMetadata(null, OnMasterHeaderChanged));
+            new PropertyMetadata(null, OnListHeaderChanged));
 
         /// <summary>
-        /// Identifies the <see cref="MasterHeaderTemplate"/> dependency property.
+        /// Identifies the <see cref="ListHeaderTemplate"/> dependency property.
         /// </summary>
-        /// <returns>The identifier for the <see cref="MasterHeaderTemplate"/> dependency property.</returns>
-        public static readonly DependencyProperty MasterHeaderTemplateProperty = DependencyProperty.Register(
-            nameof(MasterHeaderTemplate),
+        /// <returns>The identifier for the <see cref="ListHeaderTemplate"/> dependency property.</returns>
+        public static readonly DependencyProperty ListHeaderTemplateProperty = DependencyProperty.Register(
+            nameof(ListHeaderTemplate),
             typeof(DataTemplate),
             typeof(ListDetailsView),
             new PropertyMetadata(null));
@@ -96,11 +96,11 @@ public partial class ListDetailsView
             new PropertyMetadata(null));
 
         /// <summary>
-        /// Identifies the <see cref="MasterPaneWidth"/> dependency property.
+        /// Identifies the <see cref="ListPaneWidth"/> dependency property.
         /// </summary>
-        /// <returns>The identifier for the <see cref="MasterPaneWidth"/> dependency property.</returns>
-        public static readonly DependencyProperty MasterPaneWidthProperty = DependencyProperty.Register(
-            nameof(MasterPaneWidth),
+        /// <returns>The identifier for the <see cref="ListPaneWidth"/> dependency property.</returns>
+        public static readonly DependencyProperty ListPaneWidthProperty = DependencyProperty.Register(
+            nameof(ListPaneWidth),
             typeof(double),
             typeof(ListDetailsView),
             new PropertyMetadata(320d));
@@ -136,14 +136,14 @@ public partial class ListDetailsView
             new PropertyMetadata(default(ListDetailsViewState)));
 
         /// <summary>
-        /// Identifies the <see cref="MasterCommandBar"/> dependency property
+        /// Identifies the <see cref="ListCommandBar"/> dependency property
         /// </summary>
-        /// <returns>The identifier for the <see cref="MasterCommandBar"/> dependency property.</returns>
-        public static readonly DependencyProperty MasterCommandBarProperty = DependencyProperty.Register(
-            nameof(MasterCommandBar),
+        /// <returns>The identifier for the <see cref="ListCommandBar"/> dependency property.</returns>
+        public static readonly DependencyProperty ListCommandBarProperty = DependencyProperty.Register(
+            nameof(ListCommandBar),
             typeof(CommandBar),
             typeof(ListDetailsView),
-            new PropertyMetadata(null, OnMasterCommandBarChanged));
+            new PropertyMetadata(null, OnListCommandBarChanged));
 
         /// <summary>
         /// Identifies the <see cref="DetailsCommandBar"/> dependency property
@@ -206,34 +206,34 @@ public DataTemplate DetailsTemplate
         /// Gets or sets the Brush to apply to the background of the list area of the control.
         /// </summary>
         /// <returns>The Brush to apply to the background of the list area of the control.</returns>
-        public Brush MasterPaneBackground
+        public Brush ListPaneBackground
         {
-            get { return (Brush)GetValue(MasterPaneBackgroundProperty); }
-            set { SetValue(MasterPaneBackgroundProperty, value); }
+            get { return (Brush)GetValue(ListPaneBackgroundProperty); }
+            set { SetValue(ListPaneBackgroundProperty, value); }
         }
 
         /// <summary>
-        /// Gets or sets the content for the master pane's header
+        /// Gets or sets the content for the list pane's header
         /// </summary>
         /// <returns>
-        /// The content of the master pane's header. The default is null.
+        /// The content of the list pane's header. The default is null.
         /// </returns>
-        public object MasterHeader
+        public object ListHeader
         {
-            get { return GetValue(MasterHeaderProperty); }
-            set { SetValue(MasterHeaderProperty, value); }
+            get { return GetValue(ListHeaderProperty); }
+            set { SetValue(ListHeaderProperty, value); }
         }
 
         /// <summary>
-        /// Gets or sets the DataTemplate used to display the content of the master pane's header.
+        /// Gets or sets the DataTemplate used to display the content of the list pane's header.
         /// </summary>
         /// <returns>
-        /// The template that specifies the visualization of the master pane header object. The default is null.
+        /// The template that specifies the visualization of the list pane header object. The default is null.
         /// </returns>
-        public DataTemplate MasterHeaderTemplate
+        public DataTemplate ListHeaderTemplate
         {
-            get { return (DataTemplate)GetValue(MasterHeaderTemplateProperty); }
-            set { SetValue(MasterHeaderTemplateProperty, value); }
+            get { return (DataTemplate)GetValue(ListHeaderTemplateProperty); }
+            set { SetValue(ListHeaderTemplateProperty, value); }
         }
 
         /// <summary>
@@ -261,20 +261,20 @@ public DataTemplate DetailsHeaderTemplate
         }
 
         /// <summary>
-        /// Gets or sets the width of the master pane when the view is expanded.
+        /// Gets or sets the width of the list pane when the view is expanded.
         /// </summary>
         /// <returns>
         /// The width of the SplitView pane when it's fully expanded. The default is 320
         /// device-independent pixel (DIP).
         /// </returns>
-        public double MasterPaneWidth
+        public double ListPaneWidth
         {
-            get { return (double)GetValue(MasterPaneWidthProperty); }
-            set { SetValue(MasterPaneWidthProperty, value); }
+            get { return (double)GetValue(ListPaneWidthProperty); }
+            set { SetValue(ListPaneWidthProperty, value); }
         }
 
         /// <summary>
-        /// Gets or sets the content to dsiplay when there is no item selected in the master list.
+        /// Gets or sets the content to dsiplay when there is no item selected in the list list.
         /// </summary>
         public object NoSelectionContent
         {
@@ -305,12 +305,12 @@ public ListDetailsViewState ViewState
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="CommandBar"/> for the master section.
+        /// Gets or sets the <see cref="CommandBar"/> for the list section.
         /// </summary>
-        public CommandBar MasterCommandBar
+        public CommandBar ListCommandBar
         {
-            get { return (CommandBar)GetValue(MasterCommandBarProperty); }
-            set { SetValue(MasterCommandBarProperty, value); }
+            get { return (CommandBar)GetValue(ListCommandBarProperty); }
+            set { SetValue(ListCommandBarProperty, value); }
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
index df14152ed54..2b117bf37c7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Panel that allows for a Master/Details pattern.
+    /// Panel that allows for a List/Details pattern.
     /// </summary>
     [TemplatePart(Name = PartDetailsPresenter, Type = typeof(ContentPresenter))]
     [TemplatePart(Name = PartDetailsPanel, Type = typeof(FrameworkElement))]
@@ -29,7 +29,7 @@ public partial class ListDetailsView : ItemsControl
     {
         private const string PartDetailsPresenter = "DetailsPresenter";
         private const string PartDetailsPanel = "DetailsPanel";
-        private const string PartBackButton = "MasterDetailsBackButton";
+        private const string PartBackButton = "ListDetailsBackButton";
         private const string PartHeaderContentPresenter = "HeaderContentPresenter";
         private const string NarrowState = "NarrowState";
         private const string WideState = "WideState";
@@ -85,12 +85,12 @@ protected override void OnApplyTemplate()
             _detailsPresenter = (ContentPresenter)GetTemplateChild(PartDetailsPresenter);
             SetDetailsContent();
 
-            SetMasterHeaderVisibility();
+            SetListHeaderVisibility();
             OnDetailsCommandBarChanged();
-            OnMasterCommandBarChanged();
+            OnListCommandBarChanged();
 
-            SizeChanged -= MasterDetailsView_SizeChanged;
-            SizeChanged += MasterDetailsView_SizeChanged;
+            SizeChanged -= ListDetailsView_SizeChanged;
+            SizeChanged += ListDetailsView_SizeChanged;
 
             UpdateView(true);
         }
@@ -142,14 +142,14 @@ private static void OnSelectedItemChanged(DependencyObject d, DependencyProperty
         }
 
         /// <summary>
-        /// Fired when the <see cref="MasterHeader"/> is changed.
+        /// Fired when the <see cref="ListHeader"/> is changed.
         /// </summary>
         /// <param name="d">The sender</param>
         /// <param name="e">The event args</param>
-        private static void OnMasterHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnListHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var view = (ListDetailsView)d;
-            view.SetMasterHeaderVisibility();
+            view.SetListHeaderVisibility();
         }
 
         /// <summary>
@@ -180,14 +180,14 @@ private static void OnBackButtonBehaviorChanged(DependencyObject d, DependencyPr
         }
 
         /// <summary>
-        /// Fired when the MasterCommandBar changes.
+        /// Fired when the <see cref="ListCommandBar"/> changes.
         /// </summary>
         /// <param name="d">The sender</param>
         /// <param name="e">The event args</param>
-        private static void OnMasterCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnListCommandBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var view = (ListDetailsView)d;
-            view.OnMasterCommandBarChanged();
+            view.OnListCommandBarChanged();
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -236,7 +236,7 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
             }
         }
 
-        private void MasterDetailsView_SizeChanged(object sender, SizeChangedEventArgs e)
+        private void ListDetailsView_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             // if size is changing
             if ((e.PreviousSize.Width < CompactModeThresholdWidth && e.NewSize.Width >= CompactModeThresholdWidth) ||
@@ -308,11 +308,11 @@ private void OnBackRequested(object sender, BackRequestedEventArgs args)
             }
         }
 
-        private void SetMasterHeaderVisibility()
+        private void SetListHeaderVisibility()
         {
             if (GetTemplateChild(PartHeaderContentPresenter) is FrameworkElement headerPresenter)
             {
-                headerPresenter.Visibility = MasterHeader != null
+                headerPresenter.Visibility = ListHeader != null
                     ? Visibility.Visible
                     : Visibility.Collapsed;
             }
@@ -406,7 +406,7 @@ private void UpdateViewState()
 
             if (ActualWidth < CompactModeThresholdWidth)
             {
-                ViewState = SelectedItem == null ? ListDetailsViewState.Master : ListDetailsViewState.Details;
+                ViewState = SelectedItem == null ? ListDetailsViewState.List : ListDetailsViewState.Details;
             }
             else
             {
@@ -475,9 +475,9 @@ private void SetDetailsContent()
             }
         }
 
-        private void OnMasterCommandBarChanged()
+        private void OnListCommandBarChanged()
         {
-            OnCommandBarChanged("MasterCommandBarPanel", MasterCommandBar);
+            OnCommandBarChanged("ListCommandBarPanel", ListCommandBar);
         }
 
         private void OnDetailsCommandBarChanged()
@@ -521,9 +521,9 @@ private void SetListSelectionWithKeyboardFocusOnVisualStateChanged(ListDetailsVi
         /// </summary>
         private void SetListSelectionWithKeyboardFocus(bool singleSelectionFollowsFocus)
         {
-            if (GetTemplateChild("MasterList") is Windows.UI.Xaml.Controls.ListViewBase masterList)
+            if (GetTemplateChild("List") is Windows.UI.Xaml.Controls.ListViewBase list)
             {
-                masterList.SingleSelectionFollowsFocus = singleSelectionFollowsFocus;
+                list.SingleSelectionFollowsFocus = singleSelectionFollowsFocus;
             }
         }
 
@@ -575,9 +575,9 @@ private void FocusFirstFocusableElementInDetails()
         /// </summary>
         private void FocusItemList()
         {
-            if (GetTemplateChild("MasterList") is Control masterList)
+            if (GetTemplateChild("List") is Control list)
             {
-                masterList.Focus(FocusState.Programmatic);
+                list.Focus(FocusState.Programmatic);
             }
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
index dd276236b68..02c8025fa94 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
@@ -15,14 +15,14 @@
                             BorderThickness="{TemplateBinding BorderThickness}">
                         <Grid x:Name="RootPanel">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="MasterColumn"
+                                <ColumnDefinition x:Name="ListColumn"
                                                   Width="Auto" />
                                 <ColumnDefinition x:Name="DetailsColumn"
                                                   Width="*" />
                             </Grid.ColumnDefinitions>
-                            <Grid x:Name="MasterPanel"
-                                  Width="{TemplateBinding MasterPaneWidth}"
-                                  Background="{TemplateBinding MasterPaneBackground}"
+                            <Grid x:Name="ListPanel"
+                                  Width="{TemplateBinding ListPaneWidth}"
+                                  Background="{TemplateBinding ListPaneBackground}"
                                   BorderBrush="{TemplateBinding BorderBrush}"
                                   BorderThickness="0,0,1,0">
                                 <Grid.RowDefinitions>
@@ -33,10 +33,10 @@
                                 <ContentPresenter x:Name="HeaderContentPresenter"
                                                   Margin="12,0"
                                                   x:DeferLoadStrategy="Lazy"
-                                                  Content="{TemplateBinding MasterHeader}"
-                                                  ContentTemplate="{TemplateBinding MasterHeaderTemplate}"
+                                                  Content="{TemplateBinding ListHeader}"
+                                                  ContentTemplate="{TemplateBinding ListHeaderTemplate}"
                                                   Visibility="Collapsed" />
-                                <ListView x:Name="MasterList"
+                                <ListView x:Name="List"
                                           Grid.Row="1"
                                           IsTabStop="False"
                                           ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
@@ -45,7 +45,7 @@
                                           ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
                                           ItemsSource="{TemplateBinding ItemsSource}"
                                           SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
-                                <Grid x:Name="MasterCommandBarPanel" Grid.Row="2"></Grid>
+                                <Grid x:Name="ListCommandBarPanel" Grid.Row="2"></Grid>
                             </Grid>
                             <Grid x:Name="DetailsPanel"
                                   Grid.Column="1">
@@ -63,7 +63,7 @@
                                             <ColumnDefinition Width="Auto"/>
                                             <ColumnDefinition Width="*"/>
                                         </Grid.ColumnDefinitions>
-                                        <Button x:Name="MasterDetailsBackButton"
+                                        <Button x:Name="ListDetailsBackButton"
                                                 Background="Transparent"
                                                 Height="44" 
                                                 Width="48" 
@@ -149,7 +149,7 @@
                                                 </DoubleAnimation.EasingFunction>
                                             </DoubleAnimation>
                                             <DoubleAnimation BeginTime="0:0:0.0"
-                                                             Storyboard.TargetName="MasterPanel"
+                                                             Storyboard.TargetName="ListPanel"
                                                              Storyboard.TargetProperty="Opacity"
                                                              From="0"
                                                              To="1"
@@ -164,18 +164,18 @@
                                 <VisualState x:Name="NoSelectionWide">
                                     <VisualState.Setters>
                                         <Setter Target="SelectionDetailsPanel.Visibility" Value="Collapsed" />
-                                        <Setter Target="MasterPanel.Visibility" Value="Visible" />
+                                        <Setter Target="ListPanel.Visibility" Value="Visible" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="HasSelectionWide">
                                     <VisualState.Setters>
                                         <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
-                                        <Setter Target="MasterPanel.Visibility" Value="Visible" />
+                                        <Setter Target="ListPanel.Visibility" Value="Visible" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="HasSelectionNarrow">
                                     <VisualState.Setters>
-                                        <Setter Target="MasterPanel.Visibility" Value="Collapsed" />
+                                        <Setter Target="ListPanel.Visibility" Value="Collapsed" />
                                         <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
                                     </VisualState.Setters>
                                 </VisualState>
@@ -183,19 +183,19 @@
                                     <VisualState.Setters>
                                         <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
                                         <Setter Target="SelectionDetailsPanel.Visibility" Value="Collapsed" />
-                                        <Setter Target="MasterPanel.Visibility" Value="Visible" />
+                                        <Setter Target="ListPanel.Visibility" Value="Visible" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="WidthStates">
                                 <VisualState x:Name="NarrowState">
                                     <VisualState.Setters>
-                                        <Setter Target="MasterColumn.Width" Value="*" />
+                                        <Setter Target="ListColumn.Width" Value="*" />
                                         <Setter Target="DetailsColumn.Width" Value="0" />
                                         <Setter Target="DetailsPanel.(Grid.Column)" Value="0" />
                                         <Setter Target="NoSelectionPresenter.Visibility" Value="Collapsed" />
-                                        <Setter Target="MasterPanel.BorderThickness" Value="0" />
-                                        <Setter Target="MasterPanel.Width" Value="NaN" />
+                                        <Setter Target="ListPanel.BorderThickness" Value="0" />
+                                        <Setter Target="ListPanel.Width" Value="NaN" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="WideState">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
index 4dc02d3cde8..316bc0ad692 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
@@ -10,9 +10,9 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     public enum ListDetailsViewState
     {
         /// <summary>
-        /// Only the Master view is shown
+        /// Only the List view is shown
         /// </summary>
-        Master,
+        List,
 
         /// <summary>
         /// Only the Details view is shown
@@ -20,7 +20,7 @@ public enum ListDetailsViewState
         Details,
 
         /// <summary>
-        /// Both the Master and Details views are shown
+        /// Both the List and Details views are shown
         /// </summary>
         Both
     }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index 179a1c4a8ac..4bd7b04b0a0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -20,7 +20,7 @@
         - InAppNotification: Show local notifications in your application.
         - LayoutTransformControl: Support for transformations as if applied by LayoutTransform.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
-        - MasterDetailsView: Implements the Master/Details design pattern.
+        - ListDetailsView: Implements the List/Details design pattern.
         - OrbitView: Positions items in a circle around a center element and supports orbits and anchors.
         - RadialGauge: Displays a value within a range, using a needle on a circular face.
         - RadialProgressBar: Displays progress as a circle getting filled.

From 150795dab4b9ca261d4971ef6a125ec97361affa Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 17:40:08 -0500
Subject: [PATCH 42/84] Update PackageTags to List and ListDetail

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index 4bd7b04b0a0..4537d59aaf6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -31,7 +31,7 @@
         - TileControl: A ContentControl that show an image repeated many times.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
+    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas List Details ListDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>

From a85f88069ecbf02ae7664f15a6a0ae3fbeb3ba79 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 17:53:26 -0500
Subject: [PATCH 43/84] Sample: Ref ListDetailView

---
 .../SamplePages/MasterDetailsView/MasterDetailsView.bind      | 4 ++--
 .../SamplePages/MasterDetailsView/MasterDetailsViewCode.bind  | 2 +-
 Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
index 7667e0edd21..322de4b0167 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
@@ -72,7 +72,7 @@
                     </StackPanel>
                 </DataTemplate>
             </controls:ListDetailsView.NoSelectionContentTemplate>
-            <controls:ListDetailsView.MasterCommandBar>
+            <controls:ListDetailsView.ListCommandBar>
                 <CommandBar>
                     <AppBarButton Icon="Back" Label="Back"/>
                     <AppBarButton Icon="Forward" Label="Forward"/>
@@ -84,7 +84,7 @@
             </TextBlock>
           </CommandBar.Content>
         </CommandBar>
-      </controls:ListDetailsView.MasterCommandBar>
+      </controls:ListDetailsView.ListCommandBar>
       <controls:ListDetailsView.DetailsCommandBar>
         <CommandBar>
           <AppBarButton Icon="MailReply" Label="Reply" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
index f28e7c75ecc..2ab0931a400 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
@@ -1,4 +1,4 @@
-// Example of POCO to use with MasterDetailsView
+// Example of POCO to use with ListDetailsView
 
 public class Email
 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index b727ea5ea6e..ef05de7ed62 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -99,7 +99,7 @@
         "Type": "MasterDetailsViewPage",
         "Subcategory": "Layout",
         "About": "The MasterDetailsView control allows the user to implement the Master/Details design pattern.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ListDetailsView",
         "XamlCodeFile": "MasterDetailsView.bind",
         "CodeFile": "MasterDetailsViewCode.bind",
         "Icon": "/SamplePages/MasterDetailsView/MasterDetailsView.png",

From 2a5718ca5857e0a3aece84fce231f31814fb5194 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 18:08:41 -0500
Subject: [PATCH 44/84] Smaple: rename MasterDetailView folder to
 ListDetialView

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj          |  12 ++++++------
 .../MasterDetailsView.bind                          |   0
 .../MasterDetailsView.png                           | Bin
 .../MasterDetailsViewCode.bind                      |   0
 .../MasterDetailsViewPage.xaml                      |   0
 .../MasterDetailsViewPage.xaml.cs                   |   2 +-
 .../OneDriveLogo.png                                | Bin
 .../SamplePages/samples.json                        |   4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{MasterDetailsView => ListDetailsView}/MasterDetailsView.bind (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{MasterDetailsView => ListDetailsView}/MasterDetailsView.png (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{MasterDetailsView => ListDetailsView}/MasterDetailsViewCode.bind (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{MasterDetailsView => ListDetailsView}/MasterDetailsViewPage.xaml (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{MasterDetailsView => ListDetailsView}/MasterDetailsViewPage.xaml.cs (98%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/{MasterDetailsView => ListDetailsView}/OneDriveLogo.png (100%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 77d1b2ee9c8..1f0ae56e334 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -333,8 +333,8 @@
     <Content Include="SamplePages\LiveTile\LiveTile.png" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.png" />
     <Content Include="SamplePages\Loading\Loading.png" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.png" />
-    <Content Include="SamplePages\MasterDetailsView\OneDriveLogo.png" />
+    <Content Include="SamplePages\ListDetailsView\MasterDetailsView.png" />
+    <Content Include="SamplePages\ListDetailsView\OneDriveLogo.png" />
     <Content Include="SamplePages\Menu\Menu.png" />
     <Content Include="SamplePages\Microsoft Translator Service\TranslatorService.png" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelper.png" />
@@ -403,7 +403,7 @@
     <Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
     <Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
     <Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.bind" />
+    <Content Include="SamplePages\ListDetailsView\MasterDetailsView.bind" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
     <Content Include="SamplePages\PrintHelper\PrintHelperCode.bind" />
     <Content Include="SamplePages\SystemInformation\SystemInformationCode.bind" />
@@ -418,7 +418,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsViewCode.bind" />
+    <Content Include="SamplePages\ListDetailsView\MasterDetailsViewCode.bind" />
     <Content Include="SamplePages\Microsoft Translator Service\MicrosoftTranslatorCode.bind" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.bind" />
     <Content Include="SamplePages\MarkdownTextBlock\InitialContent.md" />
@@ -860,7 +860,7 @@
     <Compile Include="SamplePages\Loading\LoadingPage.xaml.cs">
       <DependentUpon>LoadingPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml.cs">
+    <Compile Include="SamplePages\ListDetailsView\MasterDetailsViewPage.xaml.cs">
       <DependentUpon>MasterDetailsViewPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\ImageCache\ImageCachePage.xaml.cs">
@@ -1305,7 +1305,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml">
+    <Page Include="SamplePages\ListDetailsView\MasterDetailsViewPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewCode.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewCode.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml.cs
index 378c3093cf5..3d3a2e41713 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml.cs
@@ -38,7 +38,7 @@ public MasterDetailsViewPage()
                     From = "OneDrive",
                     Subject = "Check out your event recap",
                     Body = "Your new album.\r\nYou uploaded some photos to your OneDrive and automatically created an album for you.",
-                    Thumbnail = new Uri("ms-appx:///SamplePages/MasterDetailsView/OneDriveLogo.png")
+                    Thumbnail = new Uri("ms-appx:///SamplePages/ListDetailsView/OneDriveLogo.png")
                 },
                 new Email
                 {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/OneDriveLogo.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/OneDriveLogo.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/OneDriveLogo.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/OneDriveLogo.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index ef05de7ed62..eda18faa3a0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -95,14 +95,14 @@
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
       },
       {
-        "Name": "MasterDetailsView",
+        "Name": "ListDetailsView",
         "Type": "MasterDetailsViewPage",
         "Subcategory": "Layout",
         "About": "The MasterDetailsView control allows the user to implement the Master/Details design pattern.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ListDetailsView",
         "XamlCodeFile": "MasterDetailsView.bind",
         "CodeFile": "MasterDetailsViewCode.bind",
-        "Icon": "/SamplePages/MasterDetailsView/MasterDetailsView.png",
+        "Icon": "/SamplePages/ListDetailsView/MasterDetailsView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/MasterDetailsView.md"
       },
       {

From 831b0d5c6bed4a9589f572bc0661009584103977 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 22 Jan 2021 10:54:39 -0500
Subject: [PATCH 45/84] Smaples: Rename MasterDetailViewPage ->
 ListDetailsViewPage

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj        |  14 +++++++-------
 ...asterDetailsView.bind => ListDetailsView.bind} |   0
 ...{MasterDetailsView.png => ListDetailsView.png} | Bin
 ...ailsViewCode.bind => ListDetailsViewCode.bind} |   0
 ...ilsViewPage.xaml.cs => ListDetailsViewPage.cs} |   4 ++--
 ...ailsViewPage.xaml => ListDetailsViewPage.xaml} |   2 +-
 .../SamplePages/samples.json                      |  10 +++++-----
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/{MasterDetailsView.bind => ListDetailsView.bind} (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/{MasterDetailsView.png => ListDetailsView.png} (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/{MasterDetailsViewCode.bind => ListDetailsViewCode.bind} (100%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/{MasterDetailsViewPage.xaml.cs => ListDetailsViewPage.cs} (95%)
 rename Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/{MasterDetailsViewPage.xaml => ListDetailsViewPage.xaml} (85%)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 1f0ae56e334..512146ac2fb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -333,7 +333,7 @@
     <Content Include="SamplePages\LiveTile\LiveTile.png" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.png" />
     <Content Include="SamplePages\Loading\Loading.png" />
-    <Content Include="SamplePages\ListDetailsView\MasterDetailsView.png" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsView.png" />
     <Content Include="SamplePages\ListDetailsView\OneDriveLogo.png" />
     <Content Include="SamplePages\Menu\Menu.png" />
     <Content Include="SamplePages\Microsoft Translator Service\TranslatorService.png" />
@@ -403,7 +403,7 @@
     <Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
     <Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
     <Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
-    <Content Include="SamplePages\ListDetailsView\MasterDetailsView.bind" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsView.bind" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
     <Content Include="SamplePages\PrintHelper\PrintHelperCode.bind" />
     <Content Include="SamplePages\SystemInformation\SystemInformationCode.bind" />
@@ -418,7 +418,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
-    <Content Include="SamplePages\ListDetailsView\MasterDetailsViewCode.bind" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsViewCode.bind" />
     <Content Include="SamplePages\Microsoft Translator Service\MicrosoftTranslatorCode.bind" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.bind" />
     <Content Include="SamplePages\MarkdownTextBlock\InitialContent.md" />
@@ -860,8 +860,8 @@
     <Compile Include="SamplePages\Loading\LoadingPage.xaml.cs">
       <DependentUpon>LoadingPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\ListDetailsView\MasterDetailsViewPage.xaml.cs">
-      <DependentUpon>MasterDetailsViewPage.xaml</DependentUpon>
+    <Compile Include="SamplePages\ListDetailsView\ListDetailsViewPage.cs">
+      <DependentUpon>ListDetailsViewPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\ImageCache\ImageCachePage.xaml.cs">
       <DependentUpon>ImageCachePage.xaml</DependentUpon>
@@ -1305,7 +1305,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\ListDetailsView\MasterDetailsViewPage.xaml">
+    <Page Include="SamplePages\ListDetailsView\ListDetailsViewPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -1587,4 +1587,4 @@
     <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
     <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f | findstr /v /b &quot;#pragma&quot; &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsView.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewCode.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs
similarity index 95%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml.cs
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs
index 3d3a2e41713..d97f6297f6e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs
@@ -13,9 +13,9 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class MasterDetailsViewPage : Page, IXamlRenderListener
+    public sealed partial class ListDetailsViewPage : Page, IXamlRenderListener
     {
-        public MasterDetailsViewPage()
+        public ListDetailsViewPage()
         {
             Emails = new List<Email>
             {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml
similarity index 85%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml
index e86bba58882..e5ee9d4364d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/MasterDetailsViewPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml
@@ -1,4 +1,4 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MasterDetailsViewPage"
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ListDetailsViewPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index eda18faa3a0..6b463091418 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -96,13 +96,13 @@
       },
       {
         "Name": "ListDetailsView",
-        "Type": "MasterDetailsViewPage",
+        "Type": "ListDetailsViewPage",
         "Subcategory": "Layout",
-        "About": "The MasterDetailsView control allows the user to implement the Master/Details design pattern.",
+        "About": "The ListDetailsView control allows the user to implement the List/Details design pattern.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ListDetailsView",
-        "XamlCodeFile": "MasterDetailsView.bind",
-        "CodeFile": "MasterDetailsViewCode.bind",
-        "Icon": "/SamplePages/ListDetailsView/MasterDetailsView.png",
+        "XamlCodeFile": "ListDetailsView.bind",
+        "CodeFile": "ListDetailsViewCode.bind",
+        "Icon": "/SamplePages/ListDetailsView/ListDetailsView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/MasterDetailsView.md"
       },
       {

From b4e018d29769c097e9f0013a57a40083ac4a0ef4 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 22 Jan 2021 11:08:04 -0500
Subject: [PATCH 46/84] Core.Design: Rename MasterDetailView Files

---
 ...terDetailsView.Metadata.cs => ListDetailsView.Metadata.cs} | 0
 ...terDetailsView.Typedata.cs => ListDetailsView.Typedata.cs} | 0
 .../Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/{MasterDetailsView.Metadata.cs => ListDetailsView.Metadata.cs} (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/{MasterDetailsView.Typedata.cs => ListDetailsView.Typedata.cs} (100%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/MasterDetailsView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index de47247a39f..15efdf42dd4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -99,8 +99,8 @@
     <Compile Include="Controls\LayoutTransitionControl.Typedata.cs" />
     <Compile Include="Controls\Loading.Metadata.cs" />
     <Compile Include="Controls\Loading.Typedata.cs" />
-    <Compile Include="Controls\MasterDetailsView.Metadata.cs" />
-    <Compile Include="Controls\MasterDetailsView.Typedata.cs" />
+    <Compile Include="Controls\ListDetailsView.Metadata.cs" />
+    <Compile Include="Controls\ListDetailsView.Typedata.cs" />
     <Compile Include="Controls\Menu.Metadata.cs" />
     <Compile Include="Controls\Menu.Typedata.cs" />
     <Compile Include="Controls\MenuItem.Metadata.cs" />

From d5cb0af425d8d794ff1000e6e62d79c82aefba4a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 22 Jan 2021 11:11:31 -0500
Subject: [PATCH 47/84] Core.Design: Change metadata to relfect ListDetailView

---
 .../Controls/ListDetailsView.Metadata.cs      | 28 +++++++++----------
 .../Controls/ListDetailsView.Typedata.cs      | 14 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
index 65c755e9fba..324cf736a21 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
@@ -11,34 +11,34 @@
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
-    internal class MasterDetailsViewMetadata : AttributeTableBuilder
+    internal class ListDetailsViewMetadata : AttributeTableBuilder
     {
-        public MasterDetailsViewMetadata()
+        public ListDetailsViewMetadata()
             : base()
         {
-            AddCallback(ControlTypes.MasterDetailsView,
+            AddCallback(ControlTypes.ListDetailsView,
                 b =>
                 {
-                    b.AddCustomAttributes(nameof(MasterDetailsView.SelectedItem), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.DetailsTemplate),
+                    b.AddCustomAttributes(nameof(ListDetailsView.SelectedItem), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.DetailsTemplate),
                         new CategoryAttribute(Resources.CategoryAppearance),
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
-                    b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneBackground), new CategoryAttribute(Resources.CategoryBrush));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.MasterHeader), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.MasterHeaderTemplate),
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListPaneBackground), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListHeader), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListHeaderTemplate),
                         new CategoryAttribute(Resources.CategoryAppearance),
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
-                    b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneWidth), new CategoryAttribute(Resources.CategoryAppearance));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContent), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContentTemplate),
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListPaneWidth), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(ListDetailsView.NoSelectionContent), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.NoSelectionContentTemplate),
                         new CategoryAttribute(Resources.CategoryCommon),
                         new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
                     );
-                    b.AddCustomAttributes(nameof(MasterDetailsView.ViewState), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.MasterCommandBar), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.DetailsCommandBar), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ViewState), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListCommandBar), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.DetailsCommandBar), new CategoryAttribute(Resources.CategoryCommon));
                     b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
                 }
             );
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs
index cc68d0b2f71..15c2bcb7d65 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs
@@ -8,18 +8,18 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
     internal static partial class ControlTypes
     {
-        internal const string MasterDetailsView = RootNamespace + "." + nameof(MasterDetailsView);
+        internal const string ListDetailsView = RootNamespace + "." + nameof(ListDetailsView);
     }
 
-    internal static class MasterDetailsView
+    internal static class ListDetailsView
     {
         internal const string DetailsCommandBar = nameof(DetailsCommandBar);
         internal const string DetailsTemplate = nameof(DetailsTemplate);
-        internal const string MasterCommandBar = nameof(MasterCommandBar);
-        internal const string MasterHeader = nameof(MasterHeader);
-        internal const string MasterHeaderTemplate = nameof(MasterHeaderTemplate);
-        internal const string MasterPaneBackground = nameof(MasterPaneBackground);
-        internal const string MasterPaneWidth = nameof(MasterPaneWidth);
+        internal const string ListCommandBar = nameof(ListCommandBar);
+        internal const string ListHeader = nameof(ListHeader);
+        internal const string ListHeaderTemplate = nameof(ListHeaderTemplate);
+        internal const string ListPaneBackground = nameof(ListPaneBackground);
+        internal const string ListPaneWidth = nameof(ListPaneWidth);
         internal const string NoSelectionContent = nameof(NoSelectionContent);
         internal const string NoSelectionContentTemplate = nameof(NoSelectionContentTemplate);
         internal const string SelectedItem = nameof(SelectedItem);

From a96150deac1d5264a4e588d0cb736c2a3be11efb Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 22 Jan 2021 11:18:42 -0500
Subject: [PATCH 48/84] UnitTest: Use ListDetailsView where posible

---
 .../UI/Controls/Test_MasterDetailsView.cs     | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
index bcb88b98f27..1ad14e3fd77 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
@@ -10,72 +10,72 @@
 namespace UnitTests.UI.Controls
 {
     [TestClass]
-    public class Test_MasterDetailsView
+    public class Test_ListDetailsView
     {
-        [TestCategory("MasterDetailsView")]
+        [TestCategory("ListDetailsView")]
         [UITestMethod]
         public void Test_SelectedIndex_Default()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new ListDetailsView();
-            masterDetailsView.ItemsSource = items;
-            Assert.AreEqual(-1, masterDetailsView.SelectedIndex);
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            Assert.AreEqual(-1, listDetailsView.SelectedIndex);
         }
 
-        [TestCategory("MasterDetailsView")]
+        [TestCategory("ListDetailsView")]
         [UITestMethod]
         public void Test_SelectedItem_Default()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new ListDetailsView();
-            masterDetailsView.ItemsSource = items;
-            Assert.IsNull(masterDetailsView.SelectedItem);
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            Assert.IsNull(listDetailsView.SelectedItem);
         }
 
-        [TestCategory("MasterDetailsView")]
+        [TestCategory("ListDetailsView")]
         [UITestMethod]
         public void Test_SelectedIndex_Syncs_SelectedItem()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new ListDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedIndex = 6;
-            Assert.AreEqual(items[6], masterDetailsView.SelectedItem);
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedIndex = 6;
+            Assert.AreEqual(items[6], listDetailsView.SelectedItem);
         }
 
-        [TestCategory("MasterDetailsView")]
+        [TestCategory("ListDetailsView")]
         [UITestMethod]
         public void Test_UnselectUsingIndex()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new ListDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedIndex = 5;            
-            masterDetailsView.SelectedIndex = -1;
-            Assert.IsNull(masterDetailsView.SelectedItem);
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedIndex = 5;            
+            listDetailsView.SelectedIndex = -1;
+            Assert.IsNull(listDetailsView.SelectedItem);
         }
 
-        [TestCategory("MasterDetailsView")]
+        [TestCategory("ListDetailsView")]
         [UITestMethod]
         public void Test_UnselectUsingItem()
         {
             var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new ListDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedItem = items[5];
-            masterDetailsView.SelectedItem = null;
-            Assert.AreEqual(-1, masterDetailsView.SelectedIndex);
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedItem = items[5];
+            listDetailsView.SelectedItem = null;
+            Assert.AreEqual(-1, listDetailsView.SelectedIndex);
         }
 
-        [TestCategory("MasterDetailsView")]
+        [TestCategory("ListDetailsView")]
         [UITestMethod]
         public void Test_SelectedItem_Syncs_SelectedIndex()
         {
             var items = Enumerable.Range(0, 10).ToArray();
-            var masterDetailsView = new ListDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedItem = items[3];
-            Assert.AreEqual(3, masterDetailsView.SelectedIndex);
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedItem = items[3];
+            Assert.AreEqual(3, listDetailsView.SelectedIndex);
         }
     }
 }

From 6fc1bd827017a77d3e2510ba64c3eb8a411a95e9 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 22 Jan 2021 11:19:44 -0500
Subject: [PATCH 49/84] UnitTest: Rename Test_MasterDetailsView.cs ->
 Test_ListDetailsView.cs

---
 .../{Test_MasterDetailsView.cs => Test_ListDetailsView.cs}      | 0
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename UnitTests/UnitTests.UWP/UI/Controls/{Test_MasterDetailsView.cs => Test_ListDetailsView.cs} (100%)

diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
similarity index 100%
rename from UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
rename to UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 11820c049c6..001599c2dd2 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -182,7 +182,7 @@
     <Compile Include="UI\Controls\Test_InfiniteCanvas_Regression.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_General.cs" />
     <Compile Include="UI\Controls\Test_TokenizingTextBox_InterspersedCollection.cs" />
-    <Compile Include="UI\Controls\Test_MasterDetailsView.cs" />
+    <Compile Include="UI\Controls\Test_ListDetailsView.cs" />
     <Compile Include="UI\Controls\Test_UniformGrid_AutoLayout.cs" />
     <Compile Include="UI\Controls\Test_UniformGrid_RowColDefinitions.cs" />
     <Compile Include="UI\Controls\Test_UniformGrid_FreeSpots.cs" />

From 24a32eda1eaa3a7c7f0ada16ebdcc6c7b9683f82 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 25 Jan 2021 12:56:52 -0500
Subject: [PATCH 50/84] Fix: put Controls.Core Desin assemblies in correct
 folder.

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index 15efdf42dd4..fbf81b0de37 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -16,14 +16,14 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.17763\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Debug\uap10.0.17763\Design\</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\uap10.0.17763\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Release\uap10.0.17763\Design\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <Optimize>true</Optimize>

From c2a56eabf4290f54849bd99b71d3e8efd899ee25 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 21 Jan 2021 17:24:19 -0500
Subject: [PATCH 51/84] Sample: update CodeUrl props in samples.json

---
 .../SamplePages/samples.json                  | 69 +++++++++----------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 6b463091418..3e500284001 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -8,7 +8,7 @@
         "Type": "TextToolbarPage",
         "Subcategory": "Menus and Toolbars",
         "About": "A Toolbar for Editing Text attached to a RichEditBox. It can format RTF and Markdown, or use a Custom Formatter, and specify your own Formatter with Buttons and Actions.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar",
         "XamlCodeFile": "TextToolbar.bind",
         "CodeFile": "TextToolbarCode.bind",
         "Icon": "/SamplePages/TextToolbar/TextToolbar.png",
@@ -29,7 +29,7 @@
         "Type": "CarouselPage",
         "Subcategory": "Layout",
         "About": "Presents items in a carousel control. It reacts to changes in the layout as well as the content so it can adapt to different form factors automatically.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Carousel",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel",
         "XamlCodeFile": "CarouselCode.bind",
         "Icon": "/SamplePages/Carousel/Carousel.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Carousel.md"
@@ -39,7 +39,7 @@
         "Type": "ColorPickerPage",
         "Subcategory": "Input",
         "About": "An improved color picker control providing more options to select colors.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker",
         "XamlCodeFile": "ColorPickerXaml.bind",
         "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPicker.md"
@@ -49,7 +49,7 @@
         "Type": "ColorPickerButtonPage",
         "Subcategory": "Input",
         "About": "A color picker within a flyout opened by pressing a dropdown button containing the selected color.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker",
         "XamlCodeFile": "/SamplePages/ColorPicker/ColorPickerButtonXaml.bind",
         "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPickerButton.md"
@@ -59,7 +59,7 @@
         "Type": "AdaptiveGridViewPage",
         "Subcategory": "Layout",
         "About": "Presents items in a evenly-spaced set of columns to fill the total available display space. It reacts to changes in the layout as well as the content so it can adapt to different form factors automatically.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView",
         "XamlCodeFile": "AdaptiveGridViewCode.bind",
         "Icon": "/SamplePages/AdaptiveGridView/AdaptiveGridView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/AdaptiveGridView.md"
@@ -69,7 +69,7 @@
         "Type": "UniformGridPage",
         "Subcategory": "Layout",
         "About": "Presents items in a evenly-spaced set of rows or columns to fill the total available display space. It reacts to changes in the layout as well as the content so it can adapt to different form factors automatically.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid",
         "XamlCodeFile": "UniformGridXaml.bind",
         "Icon": "/SamplePages/UniformGrid/UniformGrid.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/UniformGrid.md"
@@ -79,7 +79,7 @@
         "Type": "RangeSelectorPage",
         "Subcategory": "Input",
         "About": "The RangeSelector is a \"double slider\" control for range values.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector",
         "XamlCodeFile": "RangeSelectorCode.bind",
         "Icon": "/SamplePages/RangeSelector/RangeSelector.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RangeSelector.md"
@@ -89,7 +89,7 @@
         "Type": "ImageExPage",
         "Subcategory": "Media",
         "About": "Images are downloaded asynchronously showing a load indicator. Source images are then stored in the App local cache to preserve resources and load time.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx",
         "XamlCodeFile": "ImageExCode.bind",
         "Icon": "/SamplePages/ImageEx/ImageEx.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
@@ -99,7 +99,7 @@
         "Type": "ListDetailsViewPage",
         "Subcategory": "Layout",
         "About": "The ListDetailsView control allows the user to implement the List/Details design pattern.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ListDetailsView",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView",
         "XamlCodeFile": "ListDetailsView.bind",
         "CodeFile": "ListDetailsViewCode.bind",
         "Icon": "/SamplePages/ListDetailsView/ListDetailsView.png",
@@ -110,7 +110,7 @@
         "Type": "MarkdownTextBlockPage",
         "Subcategory": "Input",
         "About": "An efficient and extensible control that can parse and render markdown.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock",
         "XamlCodeFile": "MarkdownTextBlock.bind",
         "CodeFile": "MarkdownTextBlockCode.bind",
         "Icon": "/SamplePages/MarkdownTextBlock/MarkdownTextBlock.png",
@@ -121,7 +121,7 @@
         "Type": "RadialGaugePage",
         "Subcategory": "Status and Info",
         "About": "The radial gauge displays a value within a range, using a needle on a circular face.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge",
         "XamlCodeFile": "RadialGaugeCode.bind",
         "Icon": "/SamplePages/RadialGauge/RadialGauge.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RadialGauge.md"
@@ -131,7 +131,7 @@
         "Type": "RadialProgressBarPage",
         "Subcategory": "Status and Info",
         "About": "The radial progress bar displays progress as a circle getting filled.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar",
         "XamlCodeFile": "RadialProgressBarCode.bind",
         "Icon": "/SamplePages/RadialProgressBar/RadialProgressBar.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RadialProgressBar.md"
@@ -141,7 +141,7 @@
         "Type": "RotatorTilePage",
         "Subcategory": "Media",
         "About": "RotatorTile is an ItemsControl that rotates through a set of items one-by-one. It enables you to show multiple items of data in a live-tile like way.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile",
         "XamlCodeFile": "RotatorTileCode.bind",
         "Icon": "/SamplePages/RotatorTile/RotatorTile.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RotatorTile.md"
@@ -151,7 +151,7 @@
         "Type": "BladePage",
         "Subcategory": "Layout",
         "About": "BladeView provides a horizontal collection of blades for master-detail scenarios. The control is based on the experience demonstrated by the Azure Portal.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/BladeView",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView",
         "XamlCodeFile": "BladeCode.bind",
         "Icon": "/SamplePages/BladeView/BladeView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/BladeView.md"
@@ -161,7 +161,6 @@
         "Type": "ScrollHeaderPage",
         "Subcategory": "Layout",
         "About": "A UI control that works as a ListView or GridView header control with quick return, sticky and fade behavior.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader",
         "XamlCodeFile": "ScrollHeaderCode.bind",
         "Icon": "/SamplePages/ScrollHeader/ScrollHeader.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ScrollHeader.md"
@@ -171,7 +170,7 @@
         "Type": "GridSplitterPage",
         "Subcategory": "Layout",
         "About": "GridSplitter represents the control that redistributes space between columns or rows of a Grid control.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter",
         "XamlCodeFile": "GridSplitter.bind",
         "Icon": "/SamplePages/GridSplitter/GridSplitter.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/GridSplitter.md"
@@ -181,7 +180,7 @@
         "Type": "DropShadowPanelPage",
         "Subcategory": "Media",
         "About": "DropShadowPanel contol allows the creation of a DropShadow for any Xaml FrameworkElement in markup.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel",
         "XamlCodeFile": "DropShadowPanelXaml.bind",
         "Icon": "/SamplePages/DropShadowPanel/DropShadowPanel.png",
         "BadgeUpdateVersionRequired": "Anniversary Update required",
@@ -192,7 +191,7 @@
         "Type": "LoadingPage",
         "Subcategory": "Status and Info",
         "About": "LoadingControl helps to show content with animation to the user while the app is doing some calculation.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Loading",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading",
         "XamlCodeFile": "LoadingCode.bind",
         "Icon": "/SamplePages/Loading/Loading.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Loading.md"
@@ -202,7 +201,7 @@
         "Type": "ExpanderPage",
         "Subcategory": "Layout",
         "About": "Expander control allows user to show/hide content based on a boolean state.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Expander",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander",
         "XamlCodeFile": "ExpanderXaml.bind",
         "Icon": "/SamplePages/Expander/Expander.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Expander.md"
@@ -212,7 +211,7 @@
         "Type": "TileControlPage",
         "Subcategory": "Layout",
         "About": "A ContentControl that show an image repeated many times.The control can be synchronized with a Scrollviewer and animated easily",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TileControl",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl",
         "XamlCodeFile": "TileControl.bind",
         "Icon": "/SamplePages/TileControl/TileControl.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TileControl.md"
@@ -222,7 +221,7 @@
         "Type": "WrapPanelPage",
         "Subcategory": "Layout",
         "About": "The WrapPanel Control positions child elements in sequential position from left to right, breaking content to the next line at the edge of the containing box.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel",
         "XamlCodeFile": "WrapPanel.bind",
         "Icon": "/SamplePages/WrapPanel/WrapPanel.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/WrapPanel.md"
@@ -242,7 +241,7 @@
         "Type": "OrbitViewPage",
         "Subcategory": "Layout",
         "About": "The OrbitView Control positions items in a circle around a center element and supports orbits and anchors.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView",
         "XamlCodeFile": "OrbitViewXaml.bind",
         "Icon": "/SamplePages/OrbitView/OrbitView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/OrbitView.md"
@@ -254,7 +253,7 @@
         "About": "This control will be removed in a future major release. Please use the MenuBar control from the WinUI Library instead.",
         "BadgeUpdateVersionRequired": "DEPRECATED",
         "DeprecatedWarning": "This control will be removed in a future major release. Please use the MenuBar control from the WinUI Library instead.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Menu",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu",
         "XamlCodeFile": "Menu.bind",
         "Icon": "/SamplePages/Menu/Menu.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Menu.md"
@@ -264,7 +263,7 @@
         "Type": "InAppNotificationPage",
         "Subcategory": "Status and Info",
         "About": "The In App Notification control offers the ability to show local notifications in your application.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification",
         "XamlCodeFile": "InAppNotificationXaml.bind",
         "CodeFile": "InAppNotificationCode.bind",
         "Icon": "/SamplePages/InAppNotification/InAppNotification.png",
@@ -275,7 +274,7 @@
         "Type": "DockPanelPage",
         "Subcategory": "Layout",
         "About": "Defines an area where you can arrange child elements either horizontally or vertically, relative to each other.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel",
         "XamlCodeFile": "DockPanel.bind",
         "Icon": "/SamplePages/DockPanel/DockPanel.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/DockPanel.md"
@@ -285,7 +284,7 @@
         "Type": "HeaderedContentControlPage",
         "Subcategory": "Layout",
         "About": "Allows content to be displayed with a specified header.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl",
         "XamlCodeFile": "HeaderedContentControlXaml.bind",
         "Icon": "/SamplePages/HeaderedContentControl/HeaderedContentControl.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/HeaderedContentControl.md"
@@ -295,7 +294,7 @@
         "Type": "HeaderedItemsControlPage",
         "Subcategory": "Layout",
         "About": "Allows items to be displayed with a specified header.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl",
         "XamlCodeFile": "HeaderedItemsControlXaml.bind",
         "Icon": "/SamplePages/HeaderedItemsControl/HeaderedItemsControl.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/HeaderedItemsControl.md"
@@ -305,7 +304,7 @@
         "Type": "StaggeredPanelPage",
         "Subcategory": "Layout",
         "About": "The StaggeredPanel allows for layout of items in a column approach where an item will be added to whichever column has used the least amount of space.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/StaggeredPanel",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel",
         "XamlCodeFile": "StaggeredPanel.bind",
         "Icon": "/SamplePages/StaggeredPanel/StaggeredPanel.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/StaggeredPanel.md"
@@ -325,7 +324,7 @@
         "Type": "LayoutTransformControlPage",
         "Subcategory": "Layout",
         "About": "Control that implements support for transformations as if applied by LayoutTransform.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl",
         "XamlCodeFile": "LayoutTransformControlXaml.bind",
         "Icon": "/SamplePages/LayoutTransformControl/LayoutTransformControl.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/LayoutTransformControl.md"
@@ -335,7 +334,7 @@
         "Type": "CameraPreviewPage",
         "Subcategory": "Media",
         "About": "Allows to easily preview video from available camera frame source groups and also get realtime video frames/ software bitmaps from the selected source.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview",
         "XamlCodeFile": "CameraPreviewXaml.bind",
         "CodeFile": "CameraPreviewCode.bind",
         "Icon": "/SamplePages/CameraPreview/CameraPreview.png",
@@ -348,7 +347,7 @@
         "Type": "InfiniteCanvasPage",
         "Subcategory": "Media",
         "About": "InfiniteCanvas is a canvas that supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export canvas data, Import canvas data.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas",
         "XamlCodeFile": "InfiniteCanvas.bind",
         "Icon": "/SamplePages/InfiniteCanvas/InfiniteCanvas.png",
         "ApiCheck": "Windows.UI.Xaml.Controls.ColorPicker",
@@ -360,7 +359,7 @@
         "Type": "RemoteDevicePickerControlPage",
         "Subcategory": "Input",
         "About": "Remote Device Picker Control for Project Rome.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker",
         "CodeFile": "RemoteDevicePickerCode.bind",
         "Icon": "/SamplePages/RemoteDevicePicker/RemoteDevicePicker.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RemoteDevicePicker.md"
@@ -370,7 +369,7 @@
         "Type": "ImageCropperPage",
         "Subcategory": "Input",
         "About": "ImageCropper control allows user to crop image freely.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper",
         "XamlCodeFile": "ImageCropperXaml.bind",
         "CodeFile": "ImageCropperCode.bind",
         "Icon": "/SamplePages/ImageCropper/ImageCropper.png",
@@ -381,7 +380,7 @@
         "Type": "EyedropperPage",
         "Subcategory": "Input",
         "About": "Eyedropper can pick up a color from anywhere in your application.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper",
         "XamlCodeFile": "EyedropperXaml.bind",
         "CodeFile": "EyedropperCode.bind",
         "Icon": "/SamplePages/Eyedropper/Eyedropper.png",
@@ -450,7 +449,7 @@
         "Type": "TokenizingTextBoxPage",
         "Subcategory": "Input",
         "About": "A text input control that makes suggestions and keeps track of data token items",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox",
         "CodeFile": "TokenizingTextBoxCode.bind",
         "XamlCodeFile": "TokenizingTextBoxXaml.bind",
         "Icon": "/SamplePages/TokenizingTextBox/TokenizingTextBox.png",

From 765090603203d7c6f97c52418a9ff3829cc3ff89 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 1 Feb 2021 16:50:55 -0500
Subject: [PATCH 52/84] Move StaggeredLayout and WrapLayout to Primitives

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj           | 4 ----
 .../Properties/AssemblyInfo.cs                                | 1 -
 .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj       | 4 ++++
 .../Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml   | 2 +-
 .../StaggeredLayout/StaggeredColumnLayout.cs                  | 0
 .../StaggeredLayout/StaggeredItem.cs                          | 0
 .../StaggeredLayout/StaggeredLayout.cs                        | 0
 .../StaggeredLayout/StaggeredLayoutState.cs                   | 0
 .../WrapLayout/UvBounds.cs                                    | 0
 .../WrapLayout/UvMeasure.cs                                   | 0
 .../WrapLayout/WrapItem.cs                                    | 0
 .../WrapLayout/WrapLayout.cs                                  | 0
 .../WrapLayout/WrapLayoutState.cs                             | 0
 13 files changed, 5 insertions(+), 6 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml => Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml (68%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredColumnLayout.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredLayout.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredLayoutState.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/UvBounds.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/UvMeasure.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/WrapItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/WrapLayout.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/WrapLayoutState.cs (100%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index dd10bade86a..35bf0f9683c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -14,10 +14,6 @@
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.4.2" />
-  </ItemGroup>
-
   <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs
index 64a4e43ebc0..c24479258df 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs
@@ -8,5 +8,4 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: InternalsVisibleTo("UnitTests")]
 [assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index aad78b95e6b..bc7372a702b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -24,6 +24,10 @@
 		<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.UI.Xaml" Version="2.4.2" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
 		<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml
similarity index 68%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml
index 342912dbe1c..9d262a0cde6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Microsoft.Toolkit.Uwp.UI.Controls.Layout">
+  <Library Name="Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
   </Library>
 </Directives>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredColumnLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredColumnLayout.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredColumnLayout.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredColumnLayout.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayout.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayoutState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayoutState.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayoutState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayoutState.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvBounds.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvBounds.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvBounds.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvBounds.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvMeasure.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvMeasure.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvMeasure.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvMeasure.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayout.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayout.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayout.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayoutState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayoutState.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayoutState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayoutState.cs

From 049e26cf91223a4e858c26ef0849925e9fa46471 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 1 Feb 2021 17:10:48 -0500
Subject: [PATCH 53/84] Move Layout controls to Layout Package

---
 ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj |   1 +
 .../Strings/en-US/Resources.resw              |  14 +-
 .../BladeView/BladeItem.Events.cs             |   0
 .../BladeView/BladeItem.Properties.cs         |   0
 .../BladeView/BladeItem.cs                    |   0
 .../BladeView/BladeItemAutomationPeer.cs      |   0
 .../BladeView/BladeMode.cs                    |   0
 .../BladeView/BladeView.Events.cs             |   0
 .../BladeView/BladeView.Properties.cs         |   0
 .../BladeView/BladeView.cs                    |   0
 .../BladeView/BladeView.xaml                  |   0
 .../BladeView/BladeViewAutomationPeer.cs      |   0
 .../Carousel/Carousel.cs                      |   0
 .../Carousel/Carousel.xaml                    |   0
 .../Carousel/CarouselItem.cs                  |   0
 .../Carousel/CarouselPanel.cs                 |   0
 .../Expander/ExpandDirection.cs               |   0
 .../Expander/Expander.Constants.cs            |   0
 .../Expander/Expander.Events.cs               |   0
 .../Expander/Expander.Properties.cs           |   0
 .../Expander/Expander.cs                      |   0
 .../Expander/Expander.xaml                    |   0
 .../Expander/ExpanderAutomationPeer.cs        |   0
 .../GridSplitter/GridSplitter.Data.cs         |   0
 .../GridSplitter/GridSplitter.Events.cs       |   0
 .../GridSplitter/GridSplitter.Helper.cs       |   0
 .../GridSplitter/GridSplitter.Options.cs      |   0
 .../GridSplitter/GridSplitter.cs              |   0
 .../GridSplitter/GridSplitter.xaml            |   0
 .../GridSplitter/GripperHoverWrapper.cs       |   0
 .../HeaderedContentControl.cs                 |   0
 .../HeaderedContentControl.xaml               |   0
 .../HeaderedItemsControl.cs                   |   0
 .../HeaderedItemsControl.xaml                 |   0
 .../LayoutTransformControl.Properties.cs      |   0
 .../LayoutTransformControl.cs                 |   0
 .../LayoutTransformControl.xaml               |   0
 .../PropertyChangeEventSource.cs              |   0
 .../ListDetailsView/BackButtonBehavior.cs     |   0
 .../ListDetailsView/ListDetailsView.Events.cs |   0
 .../ListDetailsView.Properties.cs             |   0
 .../ListDetailsView/ListDetailsView.cs        |   0
 .../ListDetailsView/ListDetailsView.xaml      |   0
 .../ListDetailsView/ListDetailsViewState.cs   |   0
 ...soft.Toolkit.Uwp.UI.Controls.Layout.csproj |  14 +-
 .../OrbitView/OrbitView.cs                    |   0
 .../OrbitView/OrbitView.xaml                  |   0
 .../OrbitView/OrbitViewDataItem.cs            |   0
 .../OrbitView/OrbitViewDataItemCollection.cs  |   0
 .../OrbitView/OrbitViewElementProperties.cs   |   0
 .../OrbitView/OrbitViewItem.cs                |   0
 .../OrbitViewItemClickedEventArgs.cs          |   0
 .../OrbitView/OrbitViewPanel.cs               |   0
 .../OrbitViewPanelItemArrangedArgs.cs         |   0
 .../OrbitViewPanelItemsArrangedArgs.cs        |   0
 .../Strings/en-US/Resources.resw              | 132 ++++++++++++++++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |   4 +
 57 files changed, 150 insertions(+), 15 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItem.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItem.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItemAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeMode.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeViewAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/Carousel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/Carousel.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/CarouselItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/CarouselPanel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/ExpandDirection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.Constants.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/ExpanderAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Data.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Helper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Options.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GripperHoverWrapper.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedContentControl/HeaderedContentControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedContentControl/HeaderedContentControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedItemsControl/HeaderedItemsControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedItemsControl/HeaderedItemsControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/LayoutTransformControl.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/LayoutTransformControl.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/LayoutTransformControl.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/PropertyChangeEventSource.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/BackButtonBehavior.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsViewState.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitView.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitView.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewDataItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewDataItemCollection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewElementProperties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewItemClickedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewPanel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewPanelItemArrangedArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewPanelItemsArrangedArgs.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index 4537d59aaf6..a53c32f0ce1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -39,6 +39,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
index bcad38e26ee..484e3eb498b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
@@ -193,18 +193,6 @@
     <value>Warning</value>
     <comment>Label for TextToolbar Control Warning message.</comment>
   </data>
-  <data name="WCT_BladeView_ExpandButton_Collapsed" xml:space="preserve">
-    <value>Collapse Blade</value>
-    <comment>Narrator Resource for BladeView collapsed status</comment>
-  </data>
-  <data name="WCT_BladeView_ExpandButton_Expanded" xml:space="preserve">
-    <value>Expand Blade</value>
-    <comment>Narrator Resource for BladeView expanded status</comment>
-  </data>
-  <data name="WCT_GridSplitter_AutomationName" xml:space="preserve">
-    <value>GridSplitter</value>
-    <comment>Narrator Resource for GridSplitter control</comment>
-  </data>
   <data name="WCT_InAppNotification_DismissButton_AutomationName" xml:space="preserve">
     <value>Dismiss</value>
     <comment>The automation name for the dismiss button of the InAppNotification control.</comment>
@@ -221,4 +209,4 @@
     <value>Select All</value>
     <comment>Label for TokenizingTextBox MenuFlyout 'Select All' option.</comment>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index 35bf0f9683c..bb6df0fe9b1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -2,19 +2,29 @@
 
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
-    <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <Title>Windows Community Toolkit Layout</Title>
     <Description>
       This library provides XAML layout controls. It is part of the Windows Community Toolkit.
     </Description>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
+    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
+    <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
+  <ItemGroup>
+    <PRIResource Include="Strings\en-us\Resources.resw" />
+  </ItemGroup>
 
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
   <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw
new file mode 100644
index 00000000000..604178d003e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="WCT_BladeView_ExpandButton_Collapsed" xml:space="preserve">
+    <value>Collapse Blade</value>
+    <comment>Narrator Resource for BladeView collapsed status</comment>
+  </data>
+  <data name="WCT_BladeView_ExpandButton_Expanded" xml:space="preserve">
+    <value>Expand Blade</value>
+    <comment>Narrator Resource for BladeView expanded status</comment>
+  </data>
+  <data name="WCT_GridSplitter_AutomationName" xml:space="preserve">
+    <value>GridSplitter</value>
+    <comment>Narrator Resource for GridSplitter control</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index c562fd33b91..7aca26493a3 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -249,6 +249,10 @@
       <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
       <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj">
+      <Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj">
       <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>

From 3fb8b94611f23f78a2ae9cc2593c164cb729896c Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 1 Feb 2021 15:22:42 -0800
Subject: [PATCH 54/84] Fix Generic.xaml for Layout package test

---
 .../Themes/Generic.xaml                            |  9 ---------
 ...Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj | 10 ++++++++++
 .../Themes/Generic.xaml                            | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
index d6c4cc4e660..9f6079cea14 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -1,24 +1,15 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index bb6df0fe9b1..60d209f7ce6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -22,10 +22,20 @@
     <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Themes\Generic.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <PRIResource Include="Strings\en-us\Resources.resw" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
   <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
     <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml
new file mode 100644
index 00000000000..d6c7b6cd203
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>

From 01ad1bdef98662c1387f29ba5e7db5af94a48c72 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 1 Feb 2021 15:47:00 -0800
Subject: [PATCH 55/84] Clean-up Project Files and remove link from Core to
 Layout package for Menu.

---
 .../Menu/MenuItem.cs                          | 85 +++++++++++++------
 .../Menu/MenuItem.xaml                        | 18 ++++
 ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj |  1 -
 ...soft.Toolkit.Uwp.UI.Controls.Layout.csproj | 10 ---
 4 files changed, 77 insertions(+), 37 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
index 4dbe5a80025..d07bd6e574e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// Menu Item is the items main container for Class Menu control
     /// </summary>
     [Obsolete("This control will be removed in a future major release. Please use the MenuBar control from the WinUI Library instead.")]
-    public class MenuItem : HeaderedItemsControl
+    public class MenuItem : ItemsControl
     {
         private const string FlyoutButtonName = "FlyoutButton";
         private const char UnderlineCharacter = '^';
@@ -38,7 +38,6 @@ public class MenuItem : HeaderedItemsControl
         internal Button FlyoutButton { get; private set; }
 
         private Rect _bounds;
-
         private object InternalHeader
         {
             set
@@ -49,6 +48,39 @@ private object InternalHeader
             }
         }
 
+        /// <summary>
+        /// Gets or sets the header of each control.
+        /// </summary>
+        public object Header
+        {
+            get { return (object)GetValue(HeaderProperty); }
+            set { SetValue(HeaderProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Header"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderProperty =
+            DependencyProperty.Register(nameof(Header), typeof(object), typeof(MenuItem), new PropertyMetadata(null, OnHeaderChanged));
+
+        /// <summary>
+        /// Gets or sets the template used to display the content of the control's header.
+        /// </summary>
+        public DataTemplate HeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
+            set { SetValue(HeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+            nameof(HeaderTemplate),
+            typeof(DataTemplate),
+            typeof(MenuItem),
+            new PropertyMetadata(null));
+
         /// <summary>
         /// Gets a value indicating whether the menu is opened or not
         /// </summary>
@@ -498,39 +530,40 @@ internal void Underline()
         }
 
         /// <inheritdoc />
-        protected override void OnHeaderChanged(object oldValue, object newValue)
+        private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            base.OnHeaderChanged(oldValue, newValue);
-
-            if (_isInternalHeaderUpdate)
+            if (d is MenuItem menuitem)
             {
-                return;
-            }
+                if (menuitem._isInternalHeaderUpdate)
+                {
+                    return;
+                }
 
-            _originalHeader = null;
+                menuitem._originalHeader = null;
 
-            var headerString = newValue as string;
+                var headerString = e.NewValue as string;
 
-            if (string.IsNullOrEmpty(headerString))
-            {
-                return;
-            }
+                if (string.IsNullOrEmpty(headerString))
+                {
+                    return;
+                }
 
-            var underlineCharacterIndex = headerString.IndexOf(UnderlineCharacter);
+                var underlineCharacterIndex = headerString.IndexOf(UnderlineCharacter);
 
-            if (underlineCharacterIndex == -1)
-            {
-                return;
-            }
+                if (underlineCharacterIndex == -1)
+                {
+                    return;
+                }
 
-            if (underlineCharacterIndex == headerString.Length - 1)
-            {
-                InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty);
-                return;
-            }
+                if (underlineCharacterIndex == headerString.Length - 1)
+                {
+                    menuitem.InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty);
+                    return;
+                }
 
-            _originalHeader = headerString;
-            InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty);
+                menuitem._originalHeader = headerString;
+                menuitem.InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty);
+            }
         }
 
         internal void RemoveUnderline()
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml
new file mode 100644
index 00000000000..aff05ea89b6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
+    <Style TargetType="controls:MenuItem">
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:MenuItem">
+                    <StackPanel>
+                        <ContentPresenter Content="{TemplateBinding Header}"
+                                          ContentTemplate="{TemplateBinding HeaderTemplate}" />
+                        <ItemsPresenter Margin="{TemplateBinding Padding}" />
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index a53c32f0ce1..4537d59aaf6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -39,7 +39,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index 60d209f7ce6..bb6df0fe9b1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -22,20 +22,10 @@
     <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Themes\Generic.xaml" />
-  </ItemGroup>
-
   <ItemGroup>
     <PRIResource Include="Strings\en-us\Resources.resw" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Update="Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-
   <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
   <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
     <ItemGroup>

From 439b505a0df46c24fe18494fd584019881391651 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:25:32 -0800
Subject: [PATCH 56/84] Fix Stylecop Issues

---
 Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
index d07bd6e574e..3f8f8a3a5ac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
@@ -38,6 +38,7 @@ public class MenuItem : ItemsControl
         internal Button FlyoutButton { get; private set; }
 
         private Rect _bounds;
+
         private object InternalHeader
         {
             set
@@ -529,7 +530,6 @@ internal void Underline()
             InternalHeader = text;
         }
 
-        /// <inheritdoc />
         private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is MenuItem menuitem)

From e0be87ff18133e3e2f95f10243d2ccb1f8c44032 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 2 Feb 2021 11:38:51 -0500
Subject: [PATCH 57/84] fix smoke tests for moved controls.

---
 .../MainPage.xaml                             | 115 +-----------------
 .../MainPage.xaml                             |  73 ++++++-----
 .../MainPage.xaml.cs                          |  22 ----
 3 files changed, 46 insertions(+), 164 deletions(-)

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
index d628d8c1bc0..2ad0f30edd2 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
@@ -1,5 +1,4 @@
-<Page
-    x:Class="SmokeTest.MainPage"
+<Page x:Class="SmokeTest.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
@@ -7,117 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <Page.Resources>
-        <Style x:Key="BladeStyle" TargetType="controls:BladeItem">
-            <Setter Property="Header" Value="Default Blade" />
-            <Setter Property="Width" Value="400" />
-            <Setter Property="IsOpen" Value="True" />
-        </Style>
-    </Page.Resources>
-
     <Grid>
-        <controls:BladeView x:Name="BladeView"
-                        Margin="0"
-                        Padding="0"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        BladeMode="Normal"
-                        AutoCollapseCountThreshold="4">
-            <controls:BladeItem x:Name="FirstBlade"
-                          Header="Test"
-                          Style="{StaticResource BladeStyle}"
-                          TitleBarVisibility="Collapsed">
-                <StackPanel Margin="24">
-                    <TextBlock Text="This first blade has a hidden TitleBar, so you can't close it."
-                     TextWrapping="WrapWholeWords" />
-
-                    <TextBlock Margin="0,12,0,0"
-                     Text="The buttons below toggle more blades on and off. The blades appear in the order that they're opened."
-                     TextWrapping="WrapWholeWords" />
-                    <ToggleButton Margin="0,24,0,0"
-                        Content="Default Blade"
-                        IsChecked="{Binding IsOpen, Mode=TwoWay, ElementName=SecondBlade}" />
-                    <ToggleButton Margin="0,24,0,0"
-                        Content="Custom Titlebar"
-                        IsChecked="{Binding IsOpen, Mode=TwoWay, ElementName=ThirdBlade}" />
-                    <ToggleButton Margin="0,24,0,0"
-                        Content="Custom Close Button"
-                        IsChecked="{Binding IsOpen, Mode=TwoWay, ElementName=FourthBlade}" />
-                    <Button  x:Name="AddBlade"
-                   Margin="0,24,0,0"
-                   Content="Add Blade" />
-                </StackPanel>
-            </controls:BladeItem>
-
-            <controls:BladeItem x:Name="SecondBlade"
-                          Header="Default blade"
-                          IsOpen="False"
-                          Style="{StaticResource BladeStyle}">
-                <TextBlock Margin="24"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Style="{StaticResource SubtitleTextBlockStyle}"
-                   Text="This is a blade with all settings set to default." />
-            </controls:BladeItem>
-
-            <controls:BladeItem x:Name="ThirdBlade"
-                          Header="Custom title bar"
-                          Style="{StaticResource BladeStyle}"
-                          IsOpen="False"
-                          TitleBarBackground="DarkSlateGray"
-                          CloseButtonForeground="White">
-                <controls:BladeItem.HeaderTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" Foreground="White" />
-                    </DataTemplate>
-                </controls:BladeItem.HeaderTemplate>
-                <TextBlock Margin="24"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Style="{StaticResource SubtitleTextBlockStyle}"
-                   Text="This is a blade with custom titlebar colors." />
-            </controls:BladeItem>
-
-            <controls:BladeItem x:Name="FourthBlade"
-                          Header="Custom close button color"
-                          Style="{StaticResource BladeStyle}"
-                          CloseButtonBackground="DarkSlateGray"
-                          CloseButtonForeground="White"
-                          IsOpen="False">
-                <TextBlock Margin="24"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Style="{StaticResource SubtitleTextBlockStyle}"
-                   Text="This is a blade with a custom close button color." />
-            </controls:BladeItem>
-        </controls:BladeView>
-
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup>
-                <VisualState x:Name="Full">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="600" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState x:Name="Small">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-
-                    <VisualState.Setters>
-                        <Setter Target="BladeView.Padding" Value="12" />
-                        <Setter Target="FirstBlade.Width" Value="280" />
-                        <Setter Target="FirstBlade.FontSize" Value="12" />
-                        <Setter Target="SecondBlade.Width" Value="280" />
-                        <Setter Target="SecondBlade.FontSize" Value="12" />
-                        <Setter Target="ThirdBlade.Width" Value="280" />
-                        <Setter Target="ThirdBlade.FontSize" Value="12" />
-                        <Setter Target="FourthBlade.Width" Value="280" />
-                        <Setter Target="FourthBlade.FontSize" Value="12" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
+        <controls:Loading/>
     </Grid>
 </Page>
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
index 4cb117351cd..8473a6174b8 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
@@ -2,40 +2,55 @@
     x:Class="SmokeTest.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SmokeTest"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    xmlns:winui="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Page.Resources>
-        <DataTemplate x:Key="WrapTemplate">
-            <Border Width="{Binding Width}" Height="50">
-                <Border.Background>
-                    <SolidColorBrush Color="{Binding Color}"/>
-                </Border.Background>
-                <TextBlock Text="{Binding Index}" FontSize="20"/>
-            </Border>
-        </DataTemplate>
-    </Page.Resources>
+  <Page.Resources>
+    <SolidColorBrush Color="{ThemeResource SystemChromeLowColor}" x:Key="SystemControlForegroundChromeLowBrush"/>
+  </Page.Resources>
 
-    <Grid Padding="48">
-        <winui:ItemsRepeaterScrollHost>
-            <!-- Needed for 1803 and below -->
-            <ScrollViewer x:Name="WrapScrollParent">
-                <winui:ItemsRepeater x:Name="WrapRepeater"
-                             Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-                             ItemsSource="{x:Bind Items}"
-                             ItemTemplate="{StaticResource WrapTemplate}">
-                    <winui:ItemsRepeater.Layout>
-                        <controls:WrapLayout x:Name="Wrap"
-                                 VerticalSpacing="5"
-                                 HorizontalSpacing="5"/>
-                    </winui:ItemsRepeater.Layout>
-                </winui:ItemsRepeater>
-            </ScrollViewer>
-        </winui:ItemsRepeaterScrollHost>
-    </Grid>
+  <Grid>
+    <ScrollViewer>
+      <StackPanel Margin="20">
+        <controls:Expander x:Name="Expander1" VerticalAlignment="Top" Margin="0,0,0,10"
+                           Header="This is the header - expander 1"
+                           HorizontalContentAlignment="Stretch"
+                           IsExpanded="@[IsExpanded1:Bool:False]@"
+                           ExpandDirection="@[ExpandDirection1:Enum:ExpandDirection.Down]">
+          <Grid>
+            <TextBlock HorizontalAlignment="Center"
+                       TextWrapping="Wrap"
+                       Text="This is the expanded content"
+                       VerticalAlignment="Center" />
+          </Grid>
+
+          <controls:Expander.ContentOverlay>
+            <Grid Height="120">
+              <TextBlock Text="This is the content overlay"
+                         HorizontalAlignment="Center"
+                         VerticalAlignment="Center" />
+            </Grid>
+          </controls:Expander.ContentOverlay>
+        </controls:Expander>
+
+        <controls:Expander x:Name="Expander2" VerticalAlignment="Top" Margin="0"
+                           Header="This is the header - expander 2"
+                           HorizontalContentAlignment="Stretch"
+                           IsExpanded="@[IsExpanded2:Bool:True]@"
+                           ExpandDirection="@[ExpandDirection2:Enum:ExpandDirection.Right]">
+          <Grid Height="256"
+                Background="{ThemeResource SystemControlBackgroundBaseHighBrush}">
+            <TextBlock HorizontalAlignment="Center"
+                       TextWrapping="Wrap"
+                       Text="This is the expanded content without a content overlay"
+                       VerticalAlignment="Center"
+                       Foreground="{ThemeResource SystemControlForegroundChromeLowBrush}" />
+          </Grid>
+        </controls:Expander>
+      </StackPanel>
+    </ScrollViewer>
+  </Grid>
 </Page>
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml.cs
index 2be17a0892c..c6a46aad13a 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml.cs
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml.cs
@@ -10,31 +10,9 @@ namespace SmokeTest
 {
     public sealed partial class MainPage
     {
-        public ObservableCollection<Item> Items { get; } = new ObservableCollection<Item>();
-
-        private readonly Random _random;
-
-        public class Item
-        {
-            public int Index { get; internal set; }
-
-            public int Width { get; internal set; }
-
-            public int Height { get; internal set; }
-
-            public Color Color { get; internal set; }
-        }
-
         public MainPage()
         {
             InitializeComponent();
-
-            _random = new Random(DateTime.Now.Millisecond);
-            for (int i = 0; i < _random.Next(1000, 5000); i++)
-            {
-                var item = new Item { Index = i, Width = _random.Next(50, 250), Height = _random.Next(50, 250), Color = Color.FromArgb(255, (byte)_random.Next(0, 255), (byte)_random.Next(0, 255), (byte)_random.Next(0, 255)) };
-                Items.Add(item);
-            }
         }
     }
 }

From b040f864f618ec8bbffe3c2ad9e1c85d2bd82491 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 2 Feb 2021 12:51:51 -0500
Subject: [PATCH 58/84] simplify and fix layout smoke test

---
 .../MainPage.xaml                             | 42 +------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
index 8473a6174b8..f6eb627701f 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
@@ -13,44 +13,6 @@
   </Page.Resources>
 
   <Grid>
-    <ScrollViewer>
-      <StackPanel Margin="20">
-        <controls:Expander x:Name="Expander1" VerticalAlignment="Top" Margin="0,0,0,10"
-                           Header="This is the header - expander 1"
-                           HorizontalContentAlignment="Stretch"
-                           IsExpanded="@[IsExpanded1:Bool:False]@"
-                           ExpandDirection="@[ExpandDirection1:Enum:ExpandDirection.Down]">
-          <Grid>
-            <TextBlock HorizontalAlignment="Center"
-                       TextWrapping="Wrap"
-                       Text="This is the expanded content"
-                       VerticalAlignment="Center" />
-          </Grid>
-
-          <controls:Expander.ContentOverlay>
-            <Grid Height="120">
-              <TextBlock Text="This is the content overlay"
-                         HorizontalAlignment="Center"
-                         VerticalAlignment="Center" />
-            </Grid>
-          </controls:Expander.ContentOverlay>
-        </controls:Expander>
-
-        <controls:Expander x:Name="Expander2" VerticalAlignment="Top" Margin="0"
-                           Header="This is the header - expander 2"
-                           HorizontalContentAlignment="Stretch"
-                           IsExpanded="@[IsExpanded2:Bool:True]@"
-                           ExpandDirection="@[ExpandDirection2:Enum:ExpandDirection.Right]">
-          <Grid Height="256"
-                Background="{ThemeResource SystemControlBackgroundBaseHighBrush}">
-            <TextBlock HorizontalAlignment="Center"
-                       TextWrapping="Wrap"
-                       Text="This is the expanded content without a content overlay"
-                       VerticalAlignment="Center"
-                       Foreground="{ThemeResource SystemControlForegroundChromeLowBrush}" />
-          </Grid>
-        </controls:Expander>
-      </StackPanel>
-    </ScrollViewer>
-  </Grid>
+    <controls:Expander />
+  <Grid/>
 </Page>

From 61ec403f99fd3ad9afa5683d732f86708a9f05b3 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 2 Feb 2021 13:19:01 -0500
Subject: [PATCH 59/84] fix typeo

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
index f6eb627701f..78a6ff87afd 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
@@ -14,5 +14,5 @@
 
   <Grid>
     <controls:Expander />
-  <Grid/>
+  </Grid>
 </Page>

From 24843b4d5c6b4b5a05c41758cd157ead677b1071 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 2 Feb 2021 16:00:24 -0500
Subject: [PATCH 60/84] Layout: remove Primitivs dep pull in Uwp.UI

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index bb6df0fe9b1..a1571e148d3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -12,8 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
   </ItemGroup>
 
   <ItemGroup>

From 2f0dbf42ac6377dbe20184b8e7afca0dce9208c1 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 3 Feb 2021 16:06:42 -0500
Subject: [PATCH 61/84] Move over over some more refrences to layout controls

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj   | 11 +----------
 ....Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings |  2 --
 .../VisualStudioToolsManifest.xml                   | 13 -------------
 .../Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj | 12 ++++++++++++
 ...oolkit.Uwp.UI.Controls.Layout.csproj.DotSettings |  3 ++-
 .../VisualStudioToolsManifest.xml                   | 13 +++++++++++++
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index 4537d59aaf6..c246a32ec0c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -7,21 +7,12 @@
       This library provides XAML templated controls. It is part of the Windows Community Toolkit.
 
       Controls:
-        - BladeView: Provides a horizontal collection of blades for master-detail scenarios.
         - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
-        - Carousel: Presents items in a carousel control.
         - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version.
         - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
-        - Expander: Expander allows user to show/hide content based on a boolean state.
-        - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
-        - HeaderedContentControl: Provides a header to content.
-        - HeaderedItemsControl: Provides a header to items.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
-        - LayoutTransformControl: Support for transformations as if applied by LayoutTransform.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
-        - ListDetailsView: Implements the List/Details design pattern.
-        - OrbitView: Positions items in a circle around a center element and supports orbits and anchors.
         - RadialGauge: Displays a value within a range, using a needle on a circular face.
         - RadialProgressBar: Displays progress as a circle getting filled.
         - RangeSelector: "Double slider" control for range values.
@@ -31,7 +22,7 @@
         - TileControl: A ContentControl that show an image repeated many times.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas List Details ListDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
+    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
index fefa011eb69..781434d32a7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
@@ -1,7 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=bladeview/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=dropshadowpanel/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gridsplitter/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu_005Cmenuitems/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imageex/@EntryIndexedValue">True</s:Boolean>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 5a84cf2dbac..69e15c84e1c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -1,27 +1,14 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Core.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CameraPreview" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Expander" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedContentControl" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedItemsControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageEx" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ImageExBase" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ListDetailsView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitView" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitViewItem" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitViewPanel" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index a1571e148d3..43b411b41a7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -5,7 +5,19 @@
     <Title>Windows Community Toolkit Layout</Title>
     <Description>
       This library provides XAML layout controls. It is part of the Windows Community Toolkit.
+
+      Controls:
+        - BladeView: Provides a horizontal collection of blades for master-detail scenarios.
+        - Carousel: Presents items in a carousel control.
+        - Expander: Expander allows user to show/hide content based on a boolean state.
+        - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.
+        - HeaderedContentControl: Provides a header to content.
+        - HeaderedItemsControl: Provides a header to items.
+        - LayoutTransformControl: Support for transformations as if applied by LayoutTransform.
+        - ListDetailsView: Implements the List/Details design pattern.
+        - OrbitView: Positions items in a circle around a center element and supports orbits and anchors.
     </Description>
+    <PackageTags>BladeView Blade Carousel Expander GridSplitter HeaderedContent List Details ListDetails Orbit</PackageTags>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings
index 65848b5a192..c3f3d0a590b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj.DotSettings
@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=bladeview/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gridsplitter/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
index 8d2ad7fe8bf..f8ae329c03d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml
@@ -1,6 +1,19 @@
 <FileList>
   <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Layout.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Carousel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.CarouselPanel" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Expander" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedContentControl" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.HeaderedItemsControl" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ListDetailsView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitViewItem" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitViewPanel" />
     </ToolboxItems>
   </File>
 </FileList>
\ No newline at end of file

From 6b54cf8d7548e63d1985eb7d5f119f8c0f251c70 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 3 Feb 2021 18:19:34 -0500
Subject: [PATCH 62/84] Split out Contorls.Layout.Design

---
 ...it.Uwp.UI.Controls.Core.DesignTools.csproj |  16 --
 .../Properties/Resources.Designer.cs          |  72 -----
 .../Properties/Resources.resx                 |  24 --
 .../Common/Constants.cs                       |  28 ++
 .../Common/MetadataRegistrationBase.cs        | 253 ++++++++++++++++++
 .../Common/PlatformTypes.cs                   |  41 +++
 .../Controls/BladeItem.Metadata.cs            |   0
 .../Controls/BladeItem.Typedata.cs            |   0
 .../Controls/BladeView.Metadata.cs            |   0
 .../Controls/BladeView.Typedata.cs            |   0
 .../Controls/Carousel.Metadata.cs             |   0
 .../Controls/Carousel.Typedata.cs             |   0
 .../Controls/Expander.Metadata.cs             |   0
 .../Controls/Expander.Typedata.cs             |   0
 .../Controls/GridSplitter.Metadata.cs         |   0
 .../Controls/GridSplitter.Typedata.cs         |   0
 .../LayoutTransitionControl.Metadata.cs       |   0
 .../LayoutTransitionControl.Typedata.cs       |   0
 .../Controls/ListDetailsView.Metadata.cs      |   0
 .../Controls/ListDetailsView.Typedata.cs      |   0
 .../Controls/OrbitView.Metadata.cs            |   0
 .../Controls/OrbitView.Typedata.cs            |   0
 .../MetadataRegistration.cs                   |  37 +++
 ....Uwp.UI.Controls.Layout.DesignTools.csproj | 122 +++++++++
 .../Properties/AssemblyInfo.cs                |  32 +++
 .../Properties/Resources.Designer.cs          |  90 +++++++
 .../Properties/Resources.resx                 | 129 +++++++++
 Windows Community Toolkit.sln                 |  18 ++
 28 files changed, 750 insertions(+), 112 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/BladeItem.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/BladeItem.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/BladeView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/BladeView.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/Carousel.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/Carousel.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/Expander.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/Expander.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/GridSplitter.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/GridSplitter.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/LayoutTransitionControl.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/LayoutTransitionControl.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/ListDetailsView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/ListDetailsView.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/OrbitView.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design}/Controls/OrbitView.Typedata.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index fbf81b0de37..be59d8d8b9c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -79,34 +79,18 @@
     <Compile Include="Common\Constants.cs" />
     <Compile Include="Common\MetadataRegistrationBase.cs" />
     <Compile Include="Common\PlatformTypes.cs" />
-    <Compile Include="Controls\BladeItem.Metadata.cs" />
-    <Compile Include="Controls\BladeItem.Typedata.cs" />
-    <Compile Include="Controls\BladeView.Metadata.cs" />
-    <Compile Include="Controls\BladeView.Typedata.cs" />
-    <Compile Include="Controls\Carousel.Metadata.cs" />
-    <Compile Include="Controls\Carousel.Typedata.cs" />
     <Compile Include="Controls\DropShadowPanel.Metadata.cs" />
     <Compile Include="Controls\DropShadowPanel.Typedata.cs" />
-    <Compile Include="Controls\Expander.Metadata.cs" />
-    <Compile Include="Controls\Expander.Typedata.cs" />
-    <Compile Include="Controls\GridSplitter.Metadata.cs" />
-    <Compile Include="Controls\GridSplitter.Typedata.cs" />
     <Compile Include="Controls\ImageEx.Metadata.cs" />
     <Compile Include="Controls\ImageEx.Typedata.cs" />
     <Compile Include="Controls\InAppNotification.Metadata.cs" />
     <Compile Include="Controls\InAppNotification.Typedata.cs" />
-    <Compile Include="Controls\LayoutTransitionControl.Metadata.cs" />
-    <Compile Include="Controls\LayoutTransitionControl.Typedata.cs" />
     <Compile Include="Controls\Loading.Metadata.cs" />
     <Compile Include="Controls\Loading.Typedata.cs" />
-    <Compile Include="Controls\ListDetailsView.Metadata.cs" />
-    <Compile Include="Controls\ListDetailsView.Typedata.cs" />
     <Compile Include="Controls\Menu.Metadata.cs" />
     <Compile Include="Controls\Menu.Typedata.cs" />
     <Compile Include="Controls\MenuItem.Metadata.cs" />
     <Compile Include="Controls\MenuItem.Typedata.cs" />
-    <Compile Include="Controls\OrbitView.Metadata.cs" />
-    <Compile Include="Controls\OrbitView.Typedata.cs" />
     <Compile Include="Controls\RadialGauge.Metadata.cs" />
     <Compile Include="Controls\RadialGauge.Typedata.cs" />
     <Compile Include="Controls\RadialProgressBar.Metadata.cs" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
index 092409a1a4a..15da20fa9e5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
@@ -95,77 +95,5 @@ internal static string CategoryDropShadow {
                 return ResourceManager.GetString("CategoryDropShadow", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Interactions.
-        /// </summary>
-        internal static string CategoryInteractions {
-            get {
-                return ResourceManager.GetString("CategoryInteractions", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Markdown Style - Code.
-        /// </summary>
-        internal static string CategoryMarkdownCodeStyle {
-            get {
-                return ResourceManager.GetString("CategoryMarkdownCodeStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Markdown Style - Header {0}.
-        /// </summary>
-        internal static string CategoryMarkdownHeaderStyle {
-            get {
-                return ResourceManager.GetString("CategoryMarkdownHeaderStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Markdown Style - List.
-        /// </summary>
-        internal static string CategoryMarkdownListStyle {
-            get {
-                return ResourceManager.GetString("CategoryMarkdownListStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Markdown Style - Quote.
-        /// </summary>
-        internal static string CategoryMarkdownQuoteStyle {
-            get {
-                return ResourceManager.GetString("CategoryMarkdownQuoteStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Markdown Style.
-        /// </summary>
-        internal static string CategoryMarkdownStyle {
-            get {
-                return ResourceManager.GetString("CategoryMarkdownStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Markdown Style - Table.
-        /// </summary>
-        internal static string CategoryMarkdownTableStyle {
-            get {
-                return ResourceManager.GetString("CategoryMarkdownTableStyle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Text.
-        /// </summary>
-        internal static string CategoryText {
-            get {
-                return ResourceManager.GetString("CategoryText", resourceCulture);
-            }
-        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
index 56bca35d53f..aeb265b2d63 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
@@ -129,28 +129,4 @@
   <data name="CategoryDropShadow" xml:space="preserve">
     <value>Drop Shadow</value>
   </data>
-  <data name="CategoryInteractions" xml:space="preserve">
-    <value>Interactions</value>
-  </data>
-  <data name="CategoryMarkdownCodeStyle" xml:space="preserve">
-    <value>Markdown Style - Code</value>
-  </data>
-  <data name="CategoryMarkdownHeaderStyle" xml:space="preserve">
-    <value>Markdown Style - Header {0}</value>
-  </data>
-  <data name="CategoryMarkdownListStyle" xml:space="preserve">
-    <value>Markdown Style - List</value>
-  </data>
-  <data name="CategoryMarkdownQuoteStyle" xml:space="preserve">
-    <value>Markdown Style - Quote</value>
-  </data>
-  <data name="CategoryMarkdownStyle" xml:space="preserve">
-    <value>Markdown Style</value>
-  </data>
-  <data name="CategoryMarkdownTableStyle" xml:space="preserve">
-    <value>Markdown Style - Table</value>
-  </data>
-  <data name="CategoryText" xml:space="preserve">
-    <value>Text</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs
new file mode 100644
index 00000000000..8236858858c
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")]
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    internal static partial class ControlTypes
+    {
+        // HACK: Don't forget to update, if the namespace changes.
+        public const string RootNamespace = "Microsoft.Toolkit.Uwp.UI.Controls";
+    }
+
+    /// <summary>
+    /// Names for ToolboxCategoryAttribute.
+    /// </summary>
+    internal static class ToolboxCategoryPaths
+    {
+        /// <summary>
+        /// Basic Controls category.
+        /// </summary>
+        public const string Toolkit = "Windows Community Toolkit";
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs
new file mode 100644
index 00000000000..024529d9fe9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs
@@ -0,0 +1,253 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
+
+using Microsoft.Toolkit.Uwp.Design.Types;
+
+using Microsoft.VisualStudio.DesignTools.Extensibility;
+using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+
+namespace Microsoft.Toolkit.Uwp.Design.Common
+{
+    public abstract class MetadataRegistrationBase : IProvideAttributeTable
+    {
+        private AttributeTable masterMetadataTable;
+
+        internal MetadataRegistrationBase() { }
+
+        /// <summary>
+        /// Build design time metadata attribute table.
+        /// </summary>
+        /// <returns>Custom attribute table.</returns>
+        protected virtual AttributeTable BuildAttributeTable()
+        {
+            var builder = new AttributeTableBuilder();
+
+            AddDescriptions(builder);
+            AddAttributes(builder);
+            AddTables(builder, this);
+
+            masterMetadataTable = builder.CreateTable();
+            return masterMetadataTable;
+        }
+
+        #region IProvideAttributeTable Members
+
+        /// <summary>
+        /// Gets the AttributeTable for design time metadata.
+        /// </summary>
+        public AttributeTable AttributeTable => BuildAttributeTable();
+
+        #endregion
+
+        /// <summary>
+        /// Find all AttributeTableBuilder subclasses in the assembly
+        /// and add their attributes to the assembly attribute table.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")]
+        private void AddTables(AttributeTableBuilder builder, object parent)
+        {
+            Debug.Assert(builder != null, "AddTables is called with null parameter!");
+
+            Assembly asm = parent.GetType().Assembly;
+            foreach (Type t in asm.GetTypes())
+            {
+                if (t.IsSubclassOf(typeof(AttributeTableBuilder)))
+                {
+                    try
+                    {
+                        var atb = (AttributeTableBuilder)Activator.CreateInstance(t);
+                        builder.AddTable(atb.CreateTable());
+                    }
+                    catch (Exception)
+                    {
+                        //error loading design assembly
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the case sensitive resource name of the embedded XML file.
+        /// </summary>
+        protected string XmlResourceName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the FullName of the corresponding run time assembly.
+        /// </summary>
+        protected string AssemblyFullName { get; set; }
+
+        /// <summary>
+        /// Create description attribute from run time assembly XML file.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")]
+        private void AddDescriptions(AttributeTableBuilder builder)
+        {
+            Debug.Assert(builder != null, "AddDescriptions is called with null parameter!");
+
+            if (string.IsNullOrEmpty(XmlResourceName) || string.IsNullOrEmpty(AssemblyFullName)) return;
+
+            XDocument xDoc;
+            try
+            {
+                xDoc = XDocument.Load(Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName));
+            }
+            catch
+            {
+                return;
+            }
+
+            if (xDoc == null) return;
+
+            foreach (XElement member in xDoc.Descendants("member"))
+            {
+                try
+                {
+                    string name = (string)member.Attribute("name");
+
+                    if (name == null) continue;
+
+                    bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase);
+                    bool isProperty = name.StartsWith("P:", StringComparison.OrdinalIgnoreCase);
+
+                    if (isType || isProperty)
+                    {
+                        int lastDot = name.Length;
+                        string typeName;
+
+                        if (isType)
+                        {
+                            typeName = name.Substring(2); // skip leading "T:"
+                        }
+                        else
+                        {
+                            lastDot = name.LastIndexOf('.');
+                            typeName = name.Substring(2, lastDot - 2);
+                        }
+
+                        var type = Type.GetType(typeName + ", " + AssemblyFullName);
+
+                        if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject))
+                        {
+                            string desc = ParseDescription(member);
+
+                            if (desc == null) continue;
+
+                            desc = string.Join(" ", desc.Trim().Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries));
+
+                            if (isType)
+                            {
+                                if (IsBrowsable(type))
+                                {
+                                    builder.AddCustomAttributes(typeName, new DescriptionAttribute(desc));
+                                }
+                                else //Hide from intellisense
+                                {
+                                    builder.AddCustomAttributes(typeName,
+                                        new BrowsableAttribute(false),
+                                        new ToolboxBrowsableAttribute(false),
+                                        new ToolboxItemAttribute(false));
+                                }
+                            }
+                            else
+                            {
+                                var propertyName = name.Substring(lastDot + 1);
+                                PropertyInfo pi = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+                                if (pi != null)
+                                {
+                                    if (IsBrowsable(type))
+                                    {
+                                        builder.AddCustomAttributes(typeName, propertyName, new DescriptionAttribute(desc));
+                                    }
+                                    else //Hide from intellisense
+                                    {
+                                        builder.AddCustomAttributes(typeName, new BrowsableAttribute(false));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        private static bool IsBrowsable(MemberInfo typeOrMember)
+        {
+            EditorBrowsableAttribute attribute;
+            try
+            {
+                attribute = typeOrMember.GetCustomAttribute<EditorBrowsableAttribute>(false);
+            }
+            catch
+            {
+                return true; // If there is no [EditorBrowsable] attribute present, we'll show it by default.
+            }
+            return attribute.State != EditorBrowsableState.Never;
+        }
+
+        /// <summary>
+        /// Create description string from XML doc summary tag.
+        /// </summary>
+        /// <param name="member">A single node of the XML doc.</param>
+        /// <returns>Description string.</returns>
+        private static string ParseDescription(XElement member)
+        {
+            string desc = null;
+            XElement memberDesc = member.Descendants("summary").FirstOrDefault();
+
+            if (memberDesc != null)
+            {
+                IEnumerable<XNode> nodes = memberDesc.DescendantNodes();
+
+                if (nodes != null)
+                {
+                    foreach (XNode node in nodes)
+                    {
+                        if (node.NodeType == System.Xml.XmlNodeType.Text)
+                        {
+                            desc += node.ToString();
+                        }
+                        else
+                        {
+                            string s = node.ToString();
+                            int i = s.LastIndexOf('.');
+                            int j = s.LastIndexOf('"');
+
+                            if ((i != -1 || j != -1) && j - i - 1 > 0)
+                            {
+                                try
+                                {
+                                    desc += s.Substring(i + 1, j - i - 1);
+                                }
+                                catch { }
+                            }
+                        }
+                    }
+                }
+            }
+            return desc;
+        }
+
+        /// <summary>
+        /// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass.
+        /// </summary>
+        /// <param name="builder">The assembly attribute table builder.</param>
+        protected virtual void AddAttributes(AttributeTableBuilder builder)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs
new file mode 100644
index 00000000000..57ecf3ec226
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Microsoft.VisualStudio.DesignTools.Extensibility;
+using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+
+namespace Microsoft.Toolkit.Uwp.Design.Types
+{
+    internal class PlatformTypes
+    {
+        public static readonly Type DependencyObject = typeof(DependencyObject);
+        public static readonly Type UIElement = typeof(UIElement);
+        public static readonly Type FrameworkElement = typeof(FrameworkElement);
+        public static readonly Type Control = typeof(Control);
+    }
+
+    internal class XamlTypes
+    {
+        public static class FrameworkElement
+        {
+            public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement");
+            public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin");
+            public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment");
+            public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment");
+            public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height");
+            public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width");
+        }
+
+        public static class Control
+        {
+            public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control");
+            public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background");
+            public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush");
+            public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness");
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeItem.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/BladeView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Carousel.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/Expander.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/GridSplitter.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/OrbitView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs
new file mode 100644
index 00000000000..2b755e8893f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Reflection;
+using Microsoft.Toolkit.Uwp.Design.Common;
+using Microsoft.Toolkit.Uwp.UI.Controls.Design;
+
+using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+
+[assembly: ProvideMetadata(typeof(MetadataRegistration))]
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    public class MetadataRegistration : MetadataRegistrationBase
+    {
+        public MetadataRegistration() : base()
+        {
+            // Note:
+            // The default constructor sets value of 'AssemblyFullName' and
+            // 'XmlResourceName' used by 'MetadataRegistrationBase.AddDescriptions()'.
+            // The convention here is that the <RootNamespace> in '.DesignTools.csproj'
+            // (or Default namespace in Project -> Properties -> Application tab)
+            // must be the same as runtime assembly's main namespace plus ".Design".
+            Type thisType = this.GetType();
+            AssemblyName designLib = thisType.Assembly.GetName();
+
+            string annexString = ".DesignTools";
+            int annexStart = designLib.Name.LastIndexOf(annexString);
+            string controlLibName = designLib.Name.Remove(annexStart, annexString.Length);
+
+            AssemblyFullName = designLib.FullName;
+            XmlResourceName = $"{thisType.Namespace}{controlLibName}.xml";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
new file mode 100644
index 00000000000..b3dbfced410
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
+    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Debug\uap10.0.17763\Design\</OutputPath>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Release\uap10.0.17763\Design\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.ObjectModel" />
+    <Reference Include="System.Runtime.WindowsRuntime" />
+    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
+    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup Label="WinRT References">
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="Controls\BladeItem.Metadata.cs" />
+    <Compile Include="Controls\BladeItem.Typedata.cs" />
+    <Compile Include="Controls\BladeView.Metadata.cs" />
+    <Compile Include="Controls\BladeView.Typedata.cs" />
+    <Compile Include="Controls\Carousel.Metadata.cs" />
+    <Compile Include="Controls\Carousel.Typedata.cs" />
+    <Compile Include="Controls\Expander.Metadata.cs" />
+    <Compile Include="Controls\Expander.Typedata.cs" />
+    <Compile Include="Controls\GridSplitter.Metadata.cs" />
+    <Compile Include="Controls\GridSplitter.Typedata.cs" />
+    <Compile Include="Controls\LayoutTransitionControl.Metadata.cs" />
+    <Compile Include="Controls\LayoutTransitionControl.Typedata.cs" />
+    <Compile Include="Controls\ListDetailsView.Metadata.cs" />
+    <Compile Include="Controls\ListDetailsView.Typedata.cs" />
+    <Compile Include="Controls\OrbitView.Metadata.cs" />
+    <Compile Include="Controls\OrbitView.Typedata.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Layout.xml">
+      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Layout.xml</Link>
+      <Visible>False</Visible>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- No-op to avoid build error when packing solution from commandline -->
+  <Target Name="Pack" />
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..bfa162fde30
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")]
+[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Windows Community Toolkit")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US English
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..a17591769f6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Appearance.
+        /// </summary>
+        internal static string CategoryAppearance {
+            get {
+                return ResourceManager.GetString("CategoryAppearance", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Brush.
+        /// </summary>
+        internal static string CategoryBrush {
+            get {
+                return ResourceManager.GetString("CategoryBrush", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Common.
+        /// </summary>
+        internal static string CategoryCommon {
+            get {
+                return ResourceManager.GetString("CategoryCommon", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx
new file mode 100644
index 00000000000..8a8f1b3f3ba
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CategoryAppearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="CategoryBrush" xml:space="preserve">
+    <value>Brush</value>
+  </data>
+  <data name="CategoryCommon" xml:space="preserve">
+    <value>Common</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index cde9430b45f..da613e31f51 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -146,6 +146,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design\Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj", "{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CB444381-18BA-4A51-BB32-3A498BCC1E99} = {CB444381-18BA-4A51-BB32-3A498BCC1E99}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -1039,6 +1044,18 @@ Global
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|x86
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|x86
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.Build.0 = Release|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.ActiveCfg = Debug|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.ActiveCfg = Debug|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.ActiveCfg = Debug|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.ActiveCfg = Debug|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.Build.0 = Debug|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.ActiveCfg = Release|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.ActiveCfg = Release|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.ActiveCfg = Release|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|x86
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1084,6 +1101,7 @@ Global
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 7c7d1ef48eec9821e31333cc8f0a4569dc1234ea Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 22:03:17 -0800
Subject: [PATCH 63/84] Fix Layout package Resource Strings

---
 .../BladeView/BladeItem.cs                                    | 4 ++--
 .../GridSplitter/GridSplitter.cs                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
index b6683199794..9ea1d37f811 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
@@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args)
             {
                 Width = _normalModeWidth;
                 VisualStateManager.GoToState(this, "Expanded", true);
-                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
+                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
@@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args)
             {
                 Width = double.NaN;
                 VisualStateManager.GoToState(this, "Collapsed", true);
-                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
+                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
index edc0bab90c1..6b62580b8bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
@@ -168,7 +168,7 @@ public GridSplitter()
         {
             DefaultStyleKey = typeof(GridSplitter);
             Loaded += GridSplitter_Loaded;
-            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
+            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources");
             AutomationProperties.SetName(this, automationName);
         }
 

From c76731474a686af0d77abd32910f2ba9a1318960 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 3 Feb 2021 16:40:59 -0500
Subject: [PATCH 64/84] Split out input controls from core

---
 ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj |   7 +-
 ...it.Uwp.UI.Controls.Core.csproj.DotSettings |   2 -
 .../Strings/en-US/Resources.resw              |  10 +-
 .../Themes/Generic.xaml                       |   7 -
 .../VisualStudioToolsManifest.xml             |   2 -
 .../ColorPicker/ColorChannel.cs               |   0
 .../ColorPicker/ColorPicker.Properties.cs     |   0
 .../ColorPicker/ColorPicker.cs                |   0
 .../ColorPicker/ColorPicker.xaml              |   0
 .../ColorPicker/ColorPickerButton.cs          |   0
 .../ColorPicker/ColorPickerButton.xaml        |   0
 .../ColorPickerRenderingHelpers.cs            |   0
 .../ColorPickerSlider.Properties.cs           |   0
 .../ColorPicker/ColorPickerSlider.cs          |   0
 .../ColorPicker/ColorPickerSlider.xaml        |   0
 .../ColorPicker/ColorRepresentation.cs        |   0
 .../ColorPicker/ColorToColorShadeConverter.cs |   0
 .../ColorPicker/ColorToHexConverter.cs        |   0
 .../ColorPicker/ContrastBrushConverter.cs     |   0
 .../ColorPicker/FluentColorPalette.cs         |   0
 .../ColorPicker/IColorPalette.cs              |   0
 ...osoft.Toolkit.Uwp.UI.Controls.Input.csproj |  45 ++++++
 ...t.Uwp.UI.Controls.Input.csproj.DotSettings |   3 +
 .../Properties/AssemblyInfo.cs                |  13 ++
 .../RadialGauge/RadialGauge.cs                |   0
 .../RadialGauge/RadialGauge.xaml              |   0
 .../RadialGauge/RadialGaugeAutomationPeer.cs  |   0
 .../RangeSelector/RangeChangedEventArgs.cs    |   0
 .../RangeSelector/RangeSelector.cs            |   0
 .../RangeSelector/RangeSelector.xaml          |   0
 .../RemoteDevicePicker/RemoteDevicePicker.cs  |   0
 .../RemoteDevicePicker.xaml                   |   0
 .../RemoteDeviceSelectionMode.cs              |   0
 .../RemoteSystemKindToSymbolConverter.cs      |   0
 .../Strings/en-US/Resources.resw              | 128 ++++++++++++++++++
 .../Themes/Generic.xaml                       |  12 ++
 .../ITokenStringContainer.cs                  |   0
 .../InterspersedObservableCollection.cs       |   0
 .../PretokenStringContainer.cs                |   0
 .../TokenItemAddingEventArgs.cs               |   0
 .../TokenItemRemovingEventArgs.cs             |   0
 .../TokenizingTextBox.Events.cs               |   0
 .../TokenizingTextBox.Properties.cs           |   0
 .../TokenizingTextBox.Selection.cs            |   0
 .../TokenizingTextBox/TokenizingTextBox.cs    |   0
 .../TokenizingTextBox/TokenizingTextBox.xaml  |   0
 .../TokenizingTextBoxItem.AutoSuggestBox.cs   |   0
 .../TokenizingTextBoxItem.AutoSuggestBox.xaml |   0
 .../TokenizingTextBoxItem.Token.xaml          |   0
 .../TokenizingTextBoxItem.cs                  |   0
 .../TokenizingTextBoxStyleSelector.cs         |   0
 .../VisualStudioToolsManifest.xml             |   8 ++
 Windows Community Toolkit.sln                 |  23 ++++
 53 files changed, 234 insertions(+), 26 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorChannel.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPicker.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPicker.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPicker.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPickerButton.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPickerButton.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPickerRenderingHelpers.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPickerSlider.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPickerSlider.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorPickerSlider.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorRepresentation.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorToColorShadeConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ColorToHexConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/ContrastBrushConverter.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/FluentColorPalette.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/ColorPicker/IColorPalette.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RadialGauge/RadialGauge.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RadialGauge/RadialGauge.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RadialGauge/RadialGaugeAutomationPeer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RangeSelector/RangeChangedEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RangeSelector/RangeSelector.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RangeSelector/RangeSelector.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RemoteDevicePicker/RemoteDevicePicker.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RemoteDevicePicker/RemoteDevicePicker.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RemoteDevicePicker/RemoteDeviceSelectionMode.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/ITokenStringContainer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/InterspersedObservableCollection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/PretokenStringContainer.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenItemAddingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenItemRemovingEventArgs.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBox.Events.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBox.Properties.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBox.Selection.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBox.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBoxItem.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Input}/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index c246a32ec0c..b604c5a7219 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -8,21 +8,16 @@
 
       Controls:
         - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
-        - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version.
         - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
         - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
         - InAppNotification: Show local notifications in your application.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
-        - RadialGauge: Displays a value within a range, using a needle on a circular face.
         - RadialProgressBar: Displays progress as a circle getting filled.
-        - RangeSelector: "Double slider" control for range values.
-        - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
         - RotatorTile: Rotates through a set of items one-by-one like a live-tile.
         - TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter.
         - TileControl: A ContentControl that show an image repeated many times.
-        - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
+    <PackageTags>UWP Toolkit Windows Controls XAML Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial RadialProgressBar Scroll ScrollHeader Tile</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
index 781434d32a7..617208d52cd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
@@ -4,7 +4,5 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu_005Cmenuitems/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imageex/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=pulltorefreshlistview/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=radialgauge/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rangeselector/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rotatortile/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=slidablelistitem/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
index 484e3eb498b..3ea9beab48c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
@@ -201,12 +201,4 @@
     <value>Notification</value>
     <comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
   </data>
-  <data name="WCT_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
-    <value>Remove</value>
-    <comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
-  </data>
-  <data name="WCT_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
-    <value>Select All</value>
-    <comment>Label for TokenizingTextBox MenuFlyout 'Select All' option.</comment>
-  </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
index 9f6079cea14..948dca8dc42 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -2,21 +2,14 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 69e15c84e1c..34f1bc813a9 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -9,9 +9,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorChannel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorChannel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerRenderingHelpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerRenderingHelpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorRepresentation.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorRepresentation.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/FluentColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/FluentColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/IColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/IColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
new file mode 100644
index 00000000000..c7460d5c776
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <Title>Windows Community Toolkit Controls</Title>
+    <Description>
+      This library provides XAML templated controls. It is part of the Windows Community Toolkit.
+
+      Controls:
+        - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version.
+        - RadialGauge: Displays a value within a range, using a needle on a circular face.
+        - RangeSelector: "Double slider" control for range values.
+        - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
+        - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
+    </Description>
+    <PackageTags>UWP Toolkit Windows Controls XAML Range Radial Gauge RadiaGauge Tokenizing TextBox</PackageTags>
+    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
+    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.Composition.cs" Link="ControlHelpers.Composition.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
+    <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
+    <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Include="Strings\en-us\Resources.resw" />
+  </ItemGroup>
+
+  <!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
+  <Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
+    <ItemGroup>
+      <GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
+    </ItemGroup>
+    <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
+    <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
+  </Target>
+</Project>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings
new file mode 100644
index 00000000000..645b28a5324
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=radialgauge/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rangeselector/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..cd5fbb60e47
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Resources;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: InternalsVisibleTo("UnitTests.UWP")]
+[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")]
+[assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGaugeAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGaugeAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeChangedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeChangedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw
new file mode 100644
index 00000000000..09770976e63
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="WCT_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
+    <value>Remove</value>
+    <comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
+  </data>
+  <data name="WCT_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
+    <value>Select All</value>
+    <comment>Label for TokenizingTextBox MenuFlyout 'Select All' option.</comment>
+  </data>
+</root>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
new file mode 100644
index 00000000000..bd1e105b652
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/ITokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/ITokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/PretokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/PretokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
new file mode 100644
index 00000000000..c6f210468c2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml
@@ -0,0 +1,8 @@
+<FileList>
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Input.dll">
+    <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
+    </ToolboxItems>
+  </File>
+</FileList>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index da613e31f51..d8e572dec71 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -151,6 +151,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99} = {CB444381-18BA-4A51-BB32-3A498BCC1E99}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input", "Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj", "{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -1056,6 +1058,26 @@ Global
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|x86
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|x86
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.Build.0 = Release|x86
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x64.Build.0 = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x86.Build.0 = Debug|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM.Build.0 = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM64.Build.0 = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x64.ActiveCfg = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x64.Build.0 = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.ActiveCfg = Release|Any CPU
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1102,6 +1124,7 @@ Global
 		{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 1293b2c0eebda992fe45e675c244d4ee3bd1dd9e Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 3 Feb 2021 12:34:21 -0500
Subject: [PATCH 65/84] Include Controls.Input in Tests and Sample App proejcts

---
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj                    | 4 ++++
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj                  | 4 ++++
 .../UnitTests.XamlIslands.UWPApp.csproj                       | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 512146ac2fb..23cb14bd7ac 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1463,6 +1463,10 @@
       <Project>{daeb9cec-c817-33b2-74b2-bc379380db72}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj">
+      <Project>{af1be4e9-e2e1-4729-b076-b3725d8e21ee}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Input</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj">
       <Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 7aca26493a3..c6504940378 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -253,6 +253,10 @@
       <Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj">
+      <Project>{af1be4e9-e2e1-4729-b076-b3725d8e21ee}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Input</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj">
       <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 3067971ab21..80e14268a0c 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -187,6 +187,10 @@
       <Project>{5bf75694-798a-43a0-8150-415de195359c}</Project>
       <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj">
+      <Project>{af1be4e9-e2e1-4729-b076-b3725d8e21ee}</Project>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Input</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj">
       <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>

From 1f70b687830edb6ff68cea637538c64d635d7c76 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 16:17:12 -0800
Subject: [PATCH 66/84] Update
 Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml to Input from
 Core

---
 .../Themes/Generic.xaml                            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
index bd1e105b652..85ed781a95e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

From f9a0f0b33540cf85ccf5fc12b7d18717180a3e8b Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 21:57:32 -0800
Subject: [PATCH 67/84] Update TokenizingTextBoxItem locations to correct
 assembly

---
 .../TokenizingTextBox/TokenizingTextBox.xaml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
index dca7c0f5617..7f81a6d8fbb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
@@ -3,8 +3,8 @@
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Resources for TokenizingTextBox  -->

From d456a537f14989af8a33301e470c21bda7d92cb9 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 22:03:08 -0800
Subject: [PATCH 68/84] Fix TokenizingTextBox Resource Strings

---
 .../TokenizingTextBox/TokenizingTextBox.cs                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
index d46f9f24b17..2b47f16b2f6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
@@ -185,7 +185,7 @@ protected override void OnApplyTemplate()
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
             var menuFlyout = new MenuFlyout();
@@ -349,7 +349,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var removeMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
+                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources")
             };
             removeMenuItem.Click += (s, e) => TokenizingTextBoxItem_ClearClicked(tokenitem, null);
 
@@ -361,7 +361,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
 

From c67193de7bd5b61da3281018f390d758b02a9b5a Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 23:36:30 -0800
Subject: [PATCH 69/84] Add Input package to Smoke Tests

---
 .../MainPage.xaml                                  | 12 ++++++++++++
 .../MainPage.xaml.cs                               | 14 ++++++++++++++
 SmokeTests/SmokeTests.proj                         |  3 ++-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml
new file mode 100644
index 00000000000..ee5ee98d8c9
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml
@@ -0,0 +1,12 @@
+<Page x:Class="SmokeTest.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid>
+        <controls:TokenizingTextBox/>
+    </Grid>
+</Page>
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs
new file mode 100644
index 00000000000..65e09322217
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace SmokeTest
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index c421f2b3e71..aa028c5375b 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -22,9 +22,10 @@
       Microsoft.Toolkit.Uwp.UI.Controls.Core;
       Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
       Microsoft.Toolkit.Uwp.UI.Controls.Layout;
+      Microsoft.Toolkit.Uwp.UI.Controls.Input;
       Microsoft.Toolkit.Uwp.UI.Controls.Markdown;
       Microsoft.Toolkit.Uwp.UI.Controls.Media;
-      Microsoft.Toolkit.Uwp.UI.Controls.Primitives;      
+      Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
       Microsoft.Toolkit.Uwp.UI.Media;
     </ToolkitPackages>
   </PropertyGroup>

From a68dd956c8b3f85a7bf6e2d5675b8f8058854df8 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 4 Feb 2021 01:51:03 -0800
Subject: [PATCH 70/84] Fix reference in Input package to Primitives package

(Otherwise we need to apply Markdown package csproj patch to be able to reference Core.)

TODO: Only thing that this leaves us though is a missing DropShadowPanel for the ColorPicker... But I think it might be ok?
---
 .../ColorPicker/ColorPicker.xaml              | 44 ++++++++++---------
 ...osoft.Toolkit.Uwp.UI.Controls.Input.csproj |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
index 3e32331d4d7..9ad61cd3e4a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters">
+                    xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
+                    xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
 
     <SolidColorBrush x:Key="CheckerboardColor0">
         <SolidColorBrush.Color>
@@ -449,7 +449,7 @@
                 </Border>
                 <!--  Main Color Preview Box at Bottom  -->
                 <!--  Must be last for drop shadow Z-index  -->
-                <controls:DropShadowPanel Grid.RowSpan="3"
+                <!--<controls:DropShadowPanel Grid.RowSpan="3"
                                           Grid.Column="2"
                                           HorizontalContentAlignment="Stretch"
                                           VerticalContentAlignment="Stretch"
@@ -457,24 +457,26 @@
                                           OffsetX="0.0"
                                           OffsetY="0.0"
                                           ShadowOpacity="0.75"
-                                          Color="Black">
-                    <Grid>
-                        <Border HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{ThemeResource FlyoutPresenterBackground}"
-                                CornerRadius="2" />
-                        <Border x:Name="CheckeredBackground3Border"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                CornerRadius="2" />
-                        <Border x:Name="PreviewBorder"
-                                CornerRadius="2">
-                            <Border.Background>
-                                <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
-                            </Border.Background>
-                        </Border>
-                    </Grid>
-                </controls:DropShadowPanel>
+                                          Color="Black"> Not too far off without it, maybe we can fake?-->
+                <Grid Grid.RowSpan="3"
+                      Grid.Column="2"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                    <Border HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{ThemeResource FlyoutPresenterBackground}"
+                            CornerRadius="2" />
+                    <Border x:Name="CheckeredBackground3Border"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            CornerRadius="2" />
+                    <Border x:Name="PreviewBorder"
+                            CornerRadius="2">
+                        <Border.Background>
+                            <SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
+                        </Border.Background>
+                    </Border>
+                </Grid>
             </Grid>
             <VisualStateManager.VisualStateGroups>
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
index c7460d5c776..628a40d06b1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
   </ItemGroup>
 
   <ItemGroup>

From f1fe78d7e8a082f11d3120dd6212fe39dcc1724a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 4 Feb 2021 13:26:48 -0500
Subject: [PATCH 71/84] Input: Split out design tools

---
 ...it.Uwp.UI.Controls.Core.DesignTools.csproj |   4 -
 .../Controls/RadialGauge.Metadata.cs          |   0
 .../Controls/RadialGauge.Typedata.cs          |   0
 .../Controls/RangeSelector.Metadata.cs        |   0
 .../Controls/RangeSelector.Typedata.cs        |   0
 ...t.Uwp.UI.Controls.Input.DesignTools.csproj | 110 +++++++++++++++
 .../Properties/AssemblyInfo.cs                |  32 +++++
 .../Properties/Resources.Designer.cs          |  90 ++++++++++++
 .../Properties/Resources.resx                 | 129 ++++++++++++++++++
 Windows Community Toolkit.sln                 |  18 +++
 10 files changed, 379 insertions(+), 4 deletions(-)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Input.Design}/Controls/RadialGauge.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Input.Design}/Controls/RadialGauge.Typedata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Input.Design}/Controls/RangeSelector.Metadata.cs (100%)
 rename {Microsoft.Toolkit.Uwp.UI.Controls.Core.Design => Microsoft.Toolkit.Uwp.UI.Controls.Input.Design}/Controls/RangeSelector.Typedata.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
index be59d8d8b9c..d4aad29f577 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
@@ -91,12 +91,8 @@
     <Compile Include="Controls\Menu.Typedata.cs" />
     <Compile Include="Controls\MenuItem.Metadata.cs" />
     <Compile Include="Controls\MenuItem.Typedata.cs" />
-    <Compile Include="Controls\RadialGauge.Metadata.cs" />
-    <Compile Include="Controls\RadialGauge.Typedata.cs" />
     <Compile Include="Controls\RadialProgressBar.Metadata.cs" />
     <Compile Include="Controls\RadialProgressBar.Typedata.cs" />
-    <Compile Include="Controls\RangeSelector.Metadata.cs" />
-    <Compile Include="Controls\RangeSelector.Typedata.cs" />
     <Compile Include="Controls\RotatorTile.Metadata.cs" />
     <Compile Include="Controls\RotatorTile.Typedata.cs" />
     <Compile Include="Controls\ScrollHeader.Metadata.cs" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
new file mode 100644
index 00000000000..2782bd400e5
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{3307BC1D-5D71-41C6-A1B3-B113B8242D08}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
+    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Debug\uap10.0.17763\Design\</OutputPath>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Release\uap10.0.17763\Design\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.ObjectModel" />
+    <Reference Include="System.Runtime.WindowsRuntime" />
+    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
+    <Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup Label="WinRT References">
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
+    <Reference Include="Windows.Foundation.FoundationContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Windows.Foundation.UniversalApiContract">
+      <HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+      <Aliases>WindowsRuntime</Aliases>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="Controls\RadialGauge.Metadata.cs" />
+    <Compile Include="Controls\RadialGauge.Typedata.cs" />
+    <Compile Include="Controls\RangeSelector.Metadata.cs" />
+    <Compile Include="Controls\RangeSelector.Typedata.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Input.xml">
+      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Input.xml</Link>
+      <Visible>False</Visible>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- No-op to avoid build error when packing solution from commandline -->
+  <Target Name="Pack" />
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..bfa162fde30
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")]
+[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Windows Community Toolkit")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US English
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs
new file mode 100644
index 00000000000..a17591769f6
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Appearance.
+        /// </summary>
+        internal static string CategoryAppearance {
+            get {
+                return ResourceManager.GetString("CategoryAppearance", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Brush.
+        /// </summary>
+        internal static string CategoryBrush {
+            get {
+                return ResourceManager.GetString("CategoryBrush", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Common.
+        /// </summary>
+        internal static string CategoryCommon {
+            get {
+                return ResourceManager.GetString("CategoryCommon", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx
new file mode 100644
index 00000000000..8a8f1b3f3ba
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CategoryAppearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="CategoryBrush" xml:space="preserve">
+    <value>Brush</value>
+  </data>
+  <data name="CategoryCommon" xml:space="preserve">
+    <value>Common</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d8e572dec71..59f6693bb00 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -153,6 +153,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input", "Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj", "{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Input.Design\Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj", "{3307BC1D-5D71-41C6-A1B3-B113B8242D08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -1078,6 +1083,18 @@ Global
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x64.Build.0 = Release|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.ActiveCfg = Release|Any CPU
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.Build.0 = Release|Any CPU
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.ActiveCfg = Debug|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.ActiveCfg = Debug|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.ActiveCfg = Debug|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.ActiveCfg = Debug|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.Build.0 = Debug|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.ActiveCfg = Release|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.ActiveCfg = Release|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.ActiveCfg = Release|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1125,6 +1142,7 @@ Global
 		{AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From bfedaa9df8c6ee27b7b4016ce61b36511c120c81 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 5 Feb 2021 16:25:02 -0500
Subject: [PATCH 72/84] Smaple.cs LookForTypeByName(string) add assmbiles to
 search in - Microsoft.Toolkit.Uwp.UI.Controls ->
 Microsoft.Toolkit.Uwp.UI.Controls.Core +
 Microsoft.Toolkit.Uwp.UI.Controls.Layout +
 Microsoft.Toolkit.Uwp.UI.Controls.Media +
 Microsoft.Toolkit.Uwp.UI.Controls.Media

---
 .../Models/Sample.cs                          | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 81244e55df0..4010016252e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -648,9 +648,9 @@ private static Type LookForTypeByName(string typeName)
                 }
             }
 
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls
-            var controlsProxyType = GridSplitter.GridResizeDirection.Auto;
-            assembly = controlsProxyType.GetType().GetTypeInfo().Assembly;
+            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Core
+            var controlsCoreProxyType = StackMode.Replace;
+            assembly = controlsCoreProxyType.GetType().GetTypeInfo().Assembly;
 
             foreach (var typeInfo in assembly.ExportedTypes)
             {
@@ -718,6 +718,18 @@ private static Type LookForTypeByName(string typeName)
                 }
             }
 
+            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Layout
+            var controlsLayoutProxyType = GridSplitter.GridResizeDirection.Auto;
+            assembly = controlsLayoutProxyType.GetType().GetTypeInfo().Assembly;
+
+            foreach (var typeInfo in assembly.ExportedTypes)
+            {
+                if (typeInfo.Name == typeName)
+                {
+                    return typeInfo;
+                }
+            }
+
             // Search in Microsoft.Toolkit.Uwp.UI.Controls.Markdown
             var markdownTextBlockType = typeof(MarkdownTextBlock);
             assembly = markdownTextBlockType.GetTypeInfo().Assembly;
@@ -730,6 +742,30 @@ private static Type LookForTypeByName(string typeName)
                 }
             }
 
+            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Media
+            var controlsMediaProxyType = BitmapFileFormat.Bmp;
+            assembly = controlsMediaProxyType.GetType().GetTypeInfo().Assembly;
+
+            foreach (var typeInfo in assembly.ExportedTypes)
+            {
+                if (typeInfo.Name == typeName)
+                {
+                    return typeInfo;
+                }
+            }
+
+            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
+            var controlsPrimitivsProxyType = StretchChild.Last;
+            assembly = controlsPrimitivsProxyType.GetType().GetTypeInfo().Assembly;
+
+            foreach (var typeInfo in assembly.ExportedTypes)
+            {
+                if (typeInfo.Name == typeName)
+                {
+                    return typeInfo;
+                }
+            }
+
             return null;
         }
 

From 99faaf351ffba1517eff0e31d36e053bb25b3320 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 8 Feb 2021 12:34:28 -0500
Subject: [PATCH 73/84] Smaple.cs: Simplfy LookForTypeByName

---
 .../Models/Sample.cs                          | 158 +++---------------
 1 file changed, 20 insertions(+), 138 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 4010016252e..530a111c902 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -629,144 +629,26 @@ public async Task PreparePropertyDescriptorAsync()
         private static Type LookForTypeByName(string typeName)
         {
             // First search locally
-            var result = System.Type.GetType(typeName);
-
-            if (result != null)
-            {
-                return result;
-            }
-
-            // Search in Windows
-            var proxyType = VerticalAlignment.Center;
-            var assembly = proxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Core
-            var controlsCoreProxyType = StackMode.Replace;
-            assembly = controlsCoreProxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // TODO Reintroduce graph controls
-            //// Search in Microsoft.Toolkit.Graph.Controls
-            //var graphControlsProxyType = typeof(UserToPersonConverter);
-            //assembly = graphControlsProxyType.GetTypeInfo().Assembly;
-
-            //foreach (var typeInfo in assembly.ExportedTypes)
-            //{
-            //    if (typeInfo.Name == typeName)
-            //    {
-            //        return typeInfo;
-            //    }
-            //}
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Animations
-            var animationsProxyType = EasingType.Default;
-            assembly = animationsProxyType.GetType().GetTypeInfo().Assembly;
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI
-            var uiProxyType = ImageBlendMode.Multiply;
-            assembly = uiProxyType.GetType().GetTypeInfo().Assembly;
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.Input.GazeInteraction
-            var gazeType = Interaction.Enabled;
-            assembly = gazeType.GetType().GetTypeInfo().Assembly;
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls.DataGrid
-            var dataGridProxyType = DataGridGridLinesVisibility.None;
-            assembly = dataGridProxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Layout
-            var controlsLayoutProxyType = GridSplitter.GridResizeDirection.Auto;
-            assembly = controlsLayoutProxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Markdown
-            var markdownTextBlockType = typeof(MarkdownTextBlock);
-            assembly = markdownTextBlockType.GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Media
-            var controlsMediaProxyType = BitmapFileFormat.Bmp;
-            assembly = controlsMediaProxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
-            var controlsPrimitivsProxyType = StretchChild.Last;
-            assembly = controlsPrimitivsProxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            return null;
+            if (System.Type.GetType(typeName) is Type systemType)
+            {
+                return systemType;
+            }
+
+            return
+                VerticalAlignment.Center.GetType().Assembly.ExportedTypes // Windows
+                .Concat(StackMode.Replace.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Core
+
+              // TODO Reintroduce graph controls
+              // .Concat(typeof(UserToPersonConverter).Assembly.ExportedTypes) // Search in Microsoft.Toolkit.Graph.Controls 
+               .Concat(EasingType.Default.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Animations
+               .Concat(ImageBlendMode.Multiply.GetType().Assembly.ExportedTypes) // Search in Microsoft.Toolkit.Uwp.UI
+               .Concat(Interaction.Enabled.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.Input.GazeInteraction
+               .Concat(DataGridGridLinesVisibility.None.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.DataGrid
+               .Concat(GridSplitter.GridResizeDirection.Auto.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Layout
+               .Concat(typeof(MarkdownTextBlock).Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Markdown
+               .Concat(BitmapFileFormat.Bmp.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Media
+               .Concat(StretchChild.Last.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
+               .FirstOrDefault(t => t.Name == typeName);
         }
 
         private static async Task<string> GetDocsSHA()

From ba5f7ff2eb3623450e26d637cdd37407d80aec25 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 8 Feb 2021 12:51:24 -0500
Subject: [PATCH 74/84] Make execution more "lazy" Should run more like the for
 loop version. Loads types from one assembly at a time.

---
 .../Models/Sample.cs                          | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 530a111c902..ea377e62513 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -634,21 +634,25 @@ private static Type LookForTypeByName(string typeName)
                 return systemType;
             }
 
-            return
-                VerticalAlignment.Center.GetType().Assembly.ExportedTypes // Windows
-                .Concat(StackMode.Replace.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Core
+            var targets = new Type[]
+            {
+                VerticalAlignment.Center.GetType(), // Windows
+                StackMode.Replace.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Core
 
               // TODO Reintroduce graph controls
-              // .Concat(typeof(UserToPersonConverter).Assembly.ExportedTypes) // Search in Microsoft.Toolkit.Graph.Controls 
-               .Concat(EasingType.Default.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Animations
-               .Concat(ImageBlendMode.Multiply.GetType().Assembly.ExportedTypes) // Search in Microsoft.Toolkit.Uwp.UI
-               .Concat(Interaction.Enabled.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.Input.GazeInteraction
-               .Concat(DataGridGridLinesVisibility.None.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.DataGrid
-               .Concat(GridSplitter.GridResizeDirection.Auto.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Layout
-               .Concat(typeof(MarkdownTextBlock).Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Markdown
-               .Concat(BitmapFileFormat.Bmp.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Media
-               .Concat(StretchChild.Last.GetType().Assembly.ExportedTypes) // Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
-               .FirstOrDefault(t => t.Name == typeName);
+              // typeof(UserToPersonConverter)) // Search in Microsoft.Toolkit.Graph.Controls
+                EasingType.Default.GetType(), // Microsoft.Toolkit.Uwp.UI.Animations
+                ImageBlendMode.Multiply.GetType(), // Search in Microsoft.Toolkit.Uwp.UI
+                Interaction.Enabled.GetType(), // Microsoft.Toolkit.Uwp.Input.GazeInteraction
+                DataGridGridLinesVisibility.None.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.DataGrid
+                GridSplitter.GridResizeDirection.Auto.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Layout
+                typeof(MarkdownTextBlock), // Microsoft.Toolkit.Uwp.UI.Controls.Markdown
+                BitmapFileFormat.Bmp.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Media
+                StretchChild.Last.GetType() // Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
+            };
+
+            return targets.SelectMany(t => t.Assembly.ExportedTypes)
+                .FirstOrDefault(t => t.Name == typeName);
         }
 
         private static async Task<string> GetDocsSHA()

From c689a513590fabfe36b760363b285a6c0a739a0d Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 26 Jan 2021 15:24:27 -0500
Subject: [PATCH 75/84] Use csporj to aggrate controls

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  | 17 ++++++++++++++
 Windows Community Toolkit.sln                 | 23 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
new file mode 100644
index 00000000000..3bbd1ecfeea
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <Title>Windows Community Toolkit Controls</Title>
+    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
+    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 59f6693bb00..ac0f68ff067 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -158,6 +158,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
@@ -1095,6 +1097,26 @@ Global
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x64.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x86.Build.0 = Debug|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|Any CPU.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM64.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.Build.0 = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.ActiveCfg = Release|Any CPU
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1143,6 +1165,7 @@ Global
 		{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 057f5fa608850f6ef21e501c8675953d04ec65f7 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 26 Jan 2021 16:19:12 -0500
Subject: [PATCH 76/84] WIP: Try to fix erros when using aggregae package

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 3bbd1ecfeea..93182e44aeb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -14,4 +14,20 @@
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
   </ItemGroup>
+  
+  <!--
+    Required workaround for ProjectReference inclusion of the Controls package
+    The UWP project system is including the Controls resources in the pri file because 
+    it doesn't know it'll be an independent package later during packing.
+    Therefore, we need to remove these extra resources in the PRI pipeline so the 
+    Markdown pri file is properly generated and doesn't include duplicate references to Control resources.
+  -->
+  <Target Name="RemoveUnwantedPri" AfterTargets="GetPackagingOutputs">
+    <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
+    <ItemGroup>
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
+    </ItemGroup>
+    <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
+  </Target>
 </Project>

From bb49ce062ef9ed330b8bd041f032a122a845982d Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 2 Feb 2021 15:53:21 -0500
Subject: [PATCH 77/84] Controls: remove unwanted pri files.

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 93182e44aeb..268213c7f2c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -26,7 +26,17 @@
     <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
     <ItemGroup>
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Primitives.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Media.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Markdown.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Primitives\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Media\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Markdown\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Layout\'))" />
     </ItemGroup>
     <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
   </Target>

From da272cb6401d5bcb001faaf5e802013cbb3bec0a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 8 Feb 2021 15:18:06 -0500
Subject: [PATCH 78/84] Add Controls.Input to meta package

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 268213c7f2c..b6511b4f19c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -13,6 +13,7 @@
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj" />
   </ItemGroup>
   
   <!--
@@ -31,12 +32,14 @@
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.pri'" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Markdown.pri'" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout.pri'" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Input.pri'" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Primitives\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Media\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Markdown\'))" />
       <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Layout\'))" />
+      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Input\'))" />
     </ItemGroup>
     <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
   </Target>

From 14df8de9865abf7fa61fc13b56c9486e1d9d5045 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 8 Feb 2021 16:16:04 -0500
Subject: [PATCH 79/84] Added meta package smoke test

---
 .../MainPage.xaml                                  | 12 ++++++++++++
 .../MainPage.xaml.cs                               | 14 ++++++++++++++
 SmokeTests/SmokeTest.csproj                        |  2 +-
 SmokeTests/SmokeTests.proj                         |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
 create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs

diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
new file mode 100644
index 00000000000..2ad0f30edd2
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
@@ -0,0 +1,12 @@
+<Page x:Class="SmokeTest.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid>
+        <controls:Loading/>
+    </Grid>
+</Page>
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
new file mode 100644
index 00000000000..65e09322217
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace SmokeTest
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index 065f2d84af3..3b481d98be5 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -4,7 +4,7 @@
   <!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
   <PropertyGroup Condition="'$(CurrentProject)' == ''">
     <!-- When writting the SmokeTests, change this to whichever Toolkit project you want to build a test to, then reload the project -->
-    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls.Core</CurrentProject>
+    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls</CurrentProject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NuGetPackageVersion)' == ''">
     <NuGetPackageVersion>To Fill In With Local Version Number</NuGetPackageVersion>
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index aa028c5375b..dcd2c11e3e0 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -19,6 +19,7 @@
       Microsoft.Toolkit.Uwp.UI;
       Microsoft.Toolkit.Uwp.UI.Animations;
       Microsoft.Toolkit.Uwp.UI.Behaviors;
+      Microsoft.Toolkit.Uwp.UI.Controls;
       Microsoft.Toolkit.Uwp.UI.Controls.Core;
       Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
       Microsoft.Toolkit.Uwp.UI.Controls.Layout;

From 248274540a9944eaf894e1571a267a558ae298ba Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 9 Feb 2021 13:50:23 -0500
Subject: [PATCH 80/84] Remove UI.Controls project build output from package
 Only include depedencies in package.

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index b6511b4f19c..d6b7cd2b745 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -4,6 +4,7 @@
     <Title>Windows Community Toolkit Controls</Title>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>

From 70928b4821619869a16d3ef11c06123085d39475 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 10 Feb 2021 11:30:54 -0500
Subject: [PATCH 81/84] Remove custom RemoveUnwantedPri build target, not
 needed

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index d6b7cd2b745..53e3bd2f6c4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -16,32 +16,4 @@
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj" />
   </ItemGroup>
-  
-  <!--
-    Required workaround for ProjectReference inclusion of the Controls package
-    The UWP project system is including the Controls resources in the pri file because 
-    it doesn't know it'll be an independent package later during packing.
-    Therefore, we need to remove these extra resources in the PRI pipeline so the 
-    Markdown pri file is properly generated and doesn't include duplicate references to Control resources.
-  -->
-  <Target Name="RemoveUnwantedPri" AfterTargets="GetPackagingOutputs">
-    <!--<Message Text="Files Before: @(PackagingOutputs)" Importance="high" />-->
-    <ItemGroup>
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Core.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Primitives.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Media.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Markdown.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'Microsoft.Toolkit.Uwp.UI.Controls.Input.pri'" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Primitives\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Core\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Media\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Markdown\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Layout\'))" />
-      <PackagingOutputs Remove="@(PackagingOutputs)" Condition="$([System.String]::new('%(PackagingOutputs.TargetPath)').StartsWith('Microsoft.Toolkit.Uwp.UI.Controls.Input\'))" />
-    </ItemGroup>
-    <!--<Message Text="Files After: @(PackagingOutputs)" Importance="high" />-->
-  </Target>
 </Project>

From 61c08f2764e7df56babc678e433c020a791b511b Mon Sep 17 00:00:00 2001
From: Rosario Pulella <Rosariopulella@gmail.com>
Date: Thu, 11 Feb 2021 16:49:20 -0500
Subject: [PATCH 82/84] Remove `EnableTypeInfoReflection`

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 53e3bd2f6c4..0ab3e6fa898 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Controls</Title>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
-    <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

From ae3c91474ac9eaedf5c7ab7acf0a24d841267315 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <Rosariopulella@gmail.com>
Date: Thu, 11 Feb 2021 16:49:56 -0500
Subject: [PATCH 83/84] Remove `EnableTypeInfoReflection` comment

---
 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 0ab3e6fa898..598a2c37390 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Controls</Title>
-    <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

From c36cccc7470d07b39e631cf5e91b4e43d716a9e3 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:56:20 -0800
Subject: [PATCH 84/84] Add missing category for Controls.Core.Design Merge

---
 .../Properties/Resources.Designer.cs                     | 9 +++++++++
 .../Properties/Resources.resx                            | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
index 15da20fa9e5..954ae670563 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
@@ -95,5 +95,14 @@ internal static string CategoryDropShadow {
                 return ResourceManager.GetString("CategoryDropShadow", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Layout.
+        /// </summary>
+        internal static string CategoryLayout {
+            get {
+                return ResourceManager.GetString("CategoryLayout", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
index aeb265b2d63..55cac3ca36f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
@@ -129,4 +129,7 @@
   <data name="CategoryDropShadow" xml:space="preserve">
     <value>Drop Shadow</value>
   </data>
+  <data name="CategoryLayout" xml:space="preserve">
+    <value>Layout</value>
+  </data>
 </root>
\ No newline at end of file