diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 823656b6e3b..d55194bd8b5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -112,6 +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>
@@ -279,8 +284,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 +305,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\FocusTracker\FocusTracker.png" />
     <Content Include="SamplePages\BladeView\BladeView.png" />
@@ -326,8 +335,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\ListDetailsView.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" />
@@ -396,7 +405,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\ListDetailsView.bind" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
     <Content Include="SamplePages\PrintHelper\PrintHelperCode.bind" />
     <Content Include="SamplePages\SystemInformation\SystemInformationCode.bind" />
@@ -411,7 +420,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
-    <Content Include="SamplePages\MasterDetailsView\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" />
@@ -470,9 +479,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>
@@ -654,12 +665,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>
@@ -700,9 +713,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>
@@ -851,8 +866,8 @@
     <Compile Include="SamplePages\Loading\LoadingPage.xaml.cs">
       <DependentUpon>LoadingPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\MasterDetailsView\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>
@@ -1039,6 +1054,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>
@@ -1047,6 +1063,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    -->
     <Page Include="SamplePages\BackdropGammaTransferBrush\BackdropGammaTransferBrushPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1131,10 +1148,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>
@@ -1299,7 +1318,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml">
+    <Page Include="SamplePages\ListDetailsView\ListDetailsViewPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -1457,6 +1476,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>
@@ -1465,9 +1488,17 @@
       <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.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.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.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/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index 157caa2114b..ea377e62513 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -16,6 +16,9 @@
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+// 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;
@@ -626,107 +629,30 @@ public async Task PreparePropertyDescriptorAsync()
         private static Type LookForTypeByName(string typeName)
         {
             // First search locally
-            var result = System.Type.GetType(typeName);
-
-            if (result != null)
+            if (System.Type.GetType(typeName) is Type systemType)
             {
-                return result;
+                return systemType;
             }
 
-            // Search in Windows
-            var proxyType = VerticalAlignment.Center;
-            var assembly = proxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
+            var targets = new Type[]
             {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // Search in Microsoft.Toolkit.Uwp.UI.Controls
-            var controlsProxyType = GridSplitter.GridResizeDirection.Auto;
-            assembly = controlsProxyType.GetType().GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            // 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.Markdown
-            var markdownTextBlockType = typeof(MarkdownTextBlock);
-            assembly = markdownTextBlockType.GetTypeInfo().Assembly;
-
-            foreach (var typeInfo in assembly.ExportedTypes)
-            {
-                if (typeInfo.Name == typeName)
-                {
-                    return typeInfo;
-                }
-            }
-
-            return null;
+                VerticalAlignment.Center.GetType(), // Windows
+                StackMode.Replace.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Core
+
+              // TODO Reintroduce graph controls
+              // 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()
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.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
similarity index 86%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
index 44436fe8278..322de4b0167 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.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.ListCommandBar>
                 <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.ListCommandBar>
+      <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/MasterDetailsView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.bind
similarity index 94%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.bind
index f28e7c75ecc..2ab0931a400 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.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/MasterDetailsView/MasterDetailsViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs
similarity index 93%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs
index 378c3093cf5..d97f6297f6e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/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>
             {
@@ -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/MasterDetailsViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml
similarity index 75%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml
index 017805b8326..e5ee9d4364d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/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"
@@ -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.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/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index c354b2293be..7877c1590c9 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -55,6 +55,7 @@
         <interactivity:Interaction.Behaviors>
             <interactions:EventTriggerBehavior EventName="Loaded">
                 <interactions:ChangePropertyAction />
+                <interactions:InvokeCommandAction />
                 <mediaactions:PlaySoundAction />
             </interactions:EventTriggerBehavior>
         </interactivity:Interaction.Behaviors>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index dc9b13392eb..760cffb9d42 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,20 +89,20 @@
         "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"
       },
       {
-        "Name": "MasterDetailsView",
-        "Type": "MasterDetailsViewPage",
+        "Name": "ListDetailsView",
+        "Type": "ListDetailsViewPage",
         "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",
-        "XamlCodeFile": "MasterDetailsView.bind",
-        "CodeFile": "MasterDetailsViewCode.bind",
-        "Icon": "/SamplePages/MasterDetailsView/MasterDetailsView.png",
+        "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.Core/ListDetailsView",
+        "XamlCodeFile": "ListDetailsView.bind",
+        "CodeFile": "ListDetailsViewCode.bind",
+        "Icon": "/SamplePages/ListDetailsView/ListDetailsView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/MasterDetailsView.md"
       },
       {
@@ -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,12 +380,13 @@
         "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",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Eyedropper.md"
       },
+      /* TODO Reintroduce graph controls
       {
         "Name": "LoginButton",
         "Type": "LoginButtonPage",
@@ -423,6 +423,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",
@@ -448,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",
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/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/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/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/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/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/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/TabbedCommandBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBar.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBar.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBarItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBarItem.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBarItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TabbedCommandBarItem.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.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.Core.DesignTools.csproj
similarity index 78%
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.Core.DesignTools.csproj
index 7e97912875b..8ddeb05d50a 100644
--- 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.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>
@@ -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>
@@ -79,42 +79,20 @@
     <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" />
-    <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\MasterDetailsView.Metadata.cs" />
-    <Compile Include="Controls\MasterDetailsView.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" />
     <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" />
@@ -127,8 +105,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>
@@ -145,8 +121,8 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\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.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 62%
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
index e160035a377..954ae670563 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
@@ -96,15 +96,6 @@ internal static string CategoryDropShadow {
             }
         }
         
-        /// <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 Layout.
         /// </summary>
@@ -113,68 +104,5 @@ internal static string CategoryLayout {
                 return ResourceManager.GetString("CategoryLayout", 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.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
similarity index 87%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
index e8903ef43b7..55cac3ca36f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
@@ -129,31 +129,7 @@
   <data name="CategoryDropShadow" xml:space="preserve">
     <value>Drop Shadow</value>
   </data>
-  <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>
-  <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/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/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/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 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
index 7f2fd97cbfc..3ccdb9020b4 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml
index 852ffaf2a63..8be0b25da05 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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/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/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 87%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
index 4dbe5a80025..3f8f8a3a5ac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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 = '^';
@@ -49,6 +49,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>
@@ -497,40 +530,40 @@ internal void Underline()
             InternalHeader = text;
         }
 
-        /// <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
new file mode 100644
index 00000000000..b604c5a7219
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -0,0 +1,48 @@
+<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:
+        - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
+        - 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.
+        - RadialProgressBar: Displays progress as a circle getting filled.
+        - 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.
+    </Description>
+    <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>
+  </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>
+    <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/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
similarity index 65%
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.Core.csproj.DotSettings
index 8a263d98309..617208d52cd 100644
--- 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.Core.csproj.DotSettings
@@ -1,13 +1,8 @@
 <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>
 	<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>
 	<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/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/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/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 90%
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
index bcad38e26ee..3ea9beab48c 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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>
@@ -213,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>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBar.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.xaml
similarity index 92%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBar.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.xaml
index b4bd56f371e..cceae73d733 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBar.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.xaml
@@ -3,12 +3,14 @@
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItem.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource DefaultTabbedCommandBarStyle}" TargetType="controls:TabbedCommandBar"/>
+    <Style BasedOn="{StaticResource DefaultTabbedCommandBarStyle}"
+           TargetType="controls:TabbedCommandBar" />
 
-    <Style x:Key="DefaultTabbedCommandBarStyle" TargetType="controls:TabbedCommandBar">
+    <Style x:Key="DefaultTabbedCommandBarStyle"
+           TargetType="controls:TabbedCommandBar">
         <Setter Property="MenuItemTemplateSelector" Value="{StaticResource DefaultTabbedCommandBarItemTemplateSelector}" />
         <Setter Property="PaneDisplayMode" Value="Top" />
         <Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
@@ -24,7 +26,8 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
-                        <Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
+                        <Grid x:Name="RootGrid"
+                              Background="{TemplateBinding Background}">
                             <Grid>
                                 <StackPanel x:Name="TopNavArea"
                                             Grid.Row="0"
@@ -110,21 +113,21 @@
                                                         Grid.Column="7"
                                                         HorizontalContentAlignment="Stretch"
                                                         VerticalContentAlignment="Stretch"
-                                                        IsTabStop="False"/>
+                                                        IsTabStop="False" />
                                     </Grid>
                                     <Border x:Name="TopNavContentOverlayAreaGrid"
                                             Child="{TemplateBinding ContentOverlay}" />
                                 </StackPanel>
                                 <SplitView x:Name="RootSplitView"
                                            Grid.Row="1"
+                                           x:Load="False"
                                            Background="{TemplateBinding Background}"
                                            CompactPaneLength="{TemplateBinding CompactPaneLength}"
                                            DisplayMode="Inline"
                                            IsPaneOpen="{Binding IsPaneOpen, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                                            IsTabStop="False"
                                            OpenPaneLength="{TemplateBinding OpenPaneLength}"
-                                           PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}"
-                                           x:Load="False">
+                                           PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}">
                                     <SplitView.Pane>
                                         <Grid x:Name="PaneContentGrid"
                                               Visibility="{Binding TemplateSettings.LeftPaneVisibility, RelativeSource={RelativeSource Mode=TemplatedParent}}">
@@ -246,19 +249,27 @@
                         </Grid>
 
 
-                        <Border x:Name="PART_RibbonContentBorder" Grid.Row="1" Background="{Binding ElementName=PART_RibbonContent, Path=Content.Background}"
-                                VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                            <ContentControl x:Name="PART_RibbonContent" Content="{TemplateBinding SelectedItem}"
-                                            HorizontalContentAlignment="Stretch">
+                        <Border x:Name="PART_RibbonContentBorder"
+                                Grid.Row="1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{Binding ElementName=PART_RibbonContent, Path=Content.Background}">
+                            <ContentControl x:Name="PART_RibbonContent"
+                                            HorizontalContentAlignment="Stretch"
+                                            Content="{TemplateBinding SelectedItem}">
                                 <ContentControl.Resources>
                                     <Storyboard x:Name="TabChangedStoryboard">
-                                        <PopInThemeAnimation TargetName="PART_RibbonContent"/>
+                                        <PopInThemeAnimation TargetName="PART_RibbonContent" />
                                     </Storyboard>
-                                    
-                                    <!--FIXME: Ideally, these resources would be set by the TabbedCommandBarItem,
-                                        but there isn't a way to do that without duplicating the CommandBar template.-->
-                                    <Style TargetType="AppBarElementContainer" BasedOn="{StaticResource TabbedCommandBarElementContainerStyle}"/>
-                                    <Style TargetType="SplitButton" BasedOn="{StaticResource AppBarSplitButtonStyle}"/>
+
+                                    <!--
+                                        FIXME: Ideally, these resources would be set by the TabbedCommandBarItem,
+                                        but there isn't a way to do that without duplicating the CommandBar template.
+                                    -->
+                                    <Style BasedOn="{StaticResource TabbedCommandBarElementContainerStyle}"
+                                           TargetType="AppBarElementContainer" />
+                                    <Style BasedOn="{StaticResource AppBarSplitButtonStyle}"
+                                           TargetType="SplitButton" />
                                 </ContentControl.Resources>
                             </ContentControl>
                         </Border>
@@ -268,9 +279,12 @@
         </Setter>
     </Style>
 
-    <SolidColorBrush x:Key="TabbedCommandBarAcrylicBackground" Color="{ThemeResource SystemControlChromeMediumLowAcrylicWindowMediumBrush}"/>
-    <Style x:Key="TabbedCommandBarAcrylicStyle" TargetType="controls:TabbedCommandBar" BasedOn="{StaticResource DefaultTabbedCommandBarStyle}">
+    <SolidColorBrush x:Key="TabbedCommandBarAcrylicBackground"
+                     Color="{ThemeResource SystemControlChromeMediumLowAcrylicWindowMediumBrush}" />
+    <Style x:Key="TabbedCommandBarAcrylicStyle"
+           BasedOn="{StaticResource DefaultTabbedCommandBarStyle}"
+           TargetType="controls:TabbedCommandBar">
         <Setter Property="Background" Value="{ThemeResource TabbedCommandBarAcrylicBackground}" />
     </Style>
-    
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItem.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItem.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItemTemplateSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItemTemplateSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItemTemplateSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItemTemplateSelector.cs
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 98%
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
index 9bf8ea673d4..08364b7189f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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 96%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml
index 1e9da77f34d..85c878c325b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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 90%
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
index 68bc7b5314e..8ea541e1a33 100644
--- 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
@@ -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/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs
similarity index 92%
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
index 19c782e14bc..c1ca4575682 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
new file mode 100644
index 00000000000..86346a7d1f4
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -0,0 +1,16 @@
+<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/CameraPreview/CameraPreview.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/RadialProgressBar/RadialProgressBar.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.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.MergedDictionaries>
+</ResourceDictionary>
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.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
new file mode 100644
index 00000000000..161131ea6dd
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -0,0 +1,20 @@
+<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.CameraPreview" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.DropShadowPanel" />
+      <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.Loading" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TabbedCommandBar" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TileControl" />
+    </ToolboxItems>
+  </File>
+</FileList>
\ No newline at end of file
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.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs
deleted file mode 100644
index 65c755e9fba..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs
+++ /dev/null
@@ -1,47 +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.
-
-using System.ComponentModel;
-
-using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
-
-using Microsoft.VisualStudio.DesignTools.Extensibility;
-using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
-
-namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
-{
-    internal class MasterDetailsViewMetadata : AttributeTableBuilder
-    {
-        public MasterDetailsViewMetadata()
-            : base()
-        {
-            AddCallback(ControlTypes.MasterDetailsView,
-                b =>
-                {
-                    b.AddCustomAttributes(nameof(MasterDetailsView.SelectedItem), new CategoryAttribute(Resources.CategoryCommon));
-                    b.AddCustomAttributes(nameof(MasterDetailsView.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),
-                        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),
-                        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(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
-                }
-            );
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.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.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.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.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.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.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.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.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/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorChannel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorChannel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/ColorPicker/ColorPicker.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
index 3e32331d4d7..9ad61cd3e4a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerRenderingHelpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerRenderingHelpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/ColorPicker/ColorPickerSlider.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorRepresentation.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorRepresentation.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/FluentColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/FluentColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/IColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/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..628a40d06b1
--- /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.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.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/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGaugeAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGaugeAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeChangedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeChangedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/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..85ed781a95e
--- /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.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>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/ITokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/ITokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/PretokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/PretokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/TokenizingTextBox/TokenizingTextBox.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/TokenizingTextBox/TokenizingTextBox.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/TokenizingTextBox/TokenizingTextBox.Selection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs
index 0b9576a565a..2b47f16b2f6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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/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/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
index 8245896155c..7f81a6d8fbb 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Resources for TokenizingTextBox  -->
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/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/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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.Layout.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
new file mode 100644
index 00000000000..324cf736a21
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs
@@ -0,0 +1,47 @@
+// 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.ComponentModel;
+
+using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
+
+using Microsoft.VisualStudio.DesignTools.Extensibility;
+using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    internal class ListDetailsViewMetadata : AttributeTableBuilder
+    {
+        public ListDetailsViewMetadata()
+            : base()
+        {
+            AddCallback(ControlTypes.ListDetailsView,
+                b =>
+                {
+                    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(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(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(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.Design/Controls/MasterDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
similarity index 60%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Controls/ListDetailsView.Typedata.cs
index cc68d0b2f71..15c2bcb7d65 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.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);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.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.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.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.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/Microsoft.Toolkit.Uwp.UI.Controls/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/BladeView/BladeItem.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/BladeView/BladeItem.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs
index 21202d4d9fe..9ea1d37f811 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/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/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/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/BladeView/BladeView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/BladeView/BladeView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/Expander/Expander.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/Expander/Expander.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/Expander/Expander.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/GridSplitter/GridSplitter.Data.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/GridSplitter/GridSplitter.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/GridSplitter/GridSplitter.Helper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/GridSplitter/GridSplitter.Options.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs
index facc3230bf7..6b62580b8bd 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/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/Resources");
+            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Layout/Resources");
             AutomationProperties.SetName(this, automationName);
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/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/LayoutTransformControl/LayoutTransformControl.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
similarity index 82%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs
index 694979e659d..165d9409af8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/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"/> list 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/MasterDetailsView/MasterDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
similarity index 82%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
index ab7c55a2b29..efbad14e5e0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs
@@ -8,10 +8,10 @@
 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 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/MasterDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
similarity index 73%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
index e7b7a22ca54..73c8b92f77f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs
@@ -10,10 +10,10 @@
 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 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,37 +42,37 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty DetailsTemplateProperty = DependencyProperty.Register(
             nameof(DetailsTemplate),
             typeof(DataTemplate),
-            typeof(MasterDetailsView),
+            typeof(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(MasterDetailsView),
+            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(MasterDetailsView),
-            new PropertyMetadata(null, OnMasterHeaderChanged));
+            typeof(ListDetailsView),
+            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(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,17 +92,17 @@ public partial class MasterDetailsView
         public static readonly DependencyProperty DetailsHeaderTemplateProperty = DependencyProperty.Register(
             nameof(DetailsHeaderTemplate),
             typeof(DataTemplate),
-            typeof(MasterDetailsView),
+            typeof(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(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>
@@ -131,19 +131,19 @@ 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(MasterDetailsView),
-            new PropertyMetadata(default(MasterDetailsViewState)));
+            typeof(ListDetailsViewState),
+            typeof(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(MasterDetailsView),
-            new PropertyMetadata(null, OnMasterCommandBarChanged));
+            typeof(ListDetailsView),
+            new PropertyMetadata(null, OnListCommandBarChanged));
 
         /// <summary>
         /// Identifies the <see cref="DetailsCommandBar"/> dependency property
@@ -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>
@@ -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
         {
@@ -298,19 +298,19 @@ 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); }
         }
 
         /// <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/MasterDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
similarity index 88%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
index 60ad5fdbf4e..2b117bf37c7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/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))]
@@ -25,11 +25,11 @@ 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";
-        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";
@@ -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;
@@ -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);
         }
@@ -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
@@ -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 = (MasterDetailsView)d;
-            view.SetMasterHeaderVisibility();
+            var view = (ListDetailsView)d;
+            view.SetListHeaderVisibility();
         }
 
         /// <summary>
@@ -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,24 +170,24 @@ 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();
         }
 
         /// <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 = (MasterDetailsView)d;
-            view.OnMasterCommandBarChanged();
+            var view = (ListDetailsView)d;
+            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) ||
@@ -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)
@@ -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;
             }
@@ -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.List : ListDetailsViewState.Details;
             }
             else
             {
-                ViewState = MasterDetailsViewState.Both;
+                ViewState = ListDetailsViewState.Both;
             }
 
             if (previousState != ViewState)
@@ -475,9 +475,9 @@ private void SetDetailsContent()
             }
         }
 
-        private void OnMasterCommandBarChanged()
+        private void OnListCommandBarChanged()
         {
-            OnCommandBarChanged("MasterCommandBarPanel", MasterCommandBar);
+            OnCommandBarChanged("ListCommandBarPanel", ListCommandBar);
         }
 
         private void OnDetailsCommandBarChanged()
@@ -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);
             }
@@ -521,9 +521,9 @@ private void SetListSelectionWithKeyboardFocusOnVisualStateChanged(MasterDetails
         /// </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;
             }
         }
 
@@ -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();
             }
@@ -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/MasterDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
similarity index 90%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
index dd37399662f..02c8025fa94 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml
@@ -2,27 +2,27 @@
                     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}">
                         <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/MasterDetailsView/MasterDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
similarity index 71%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
index a22d3ac678b..316bc0ad692 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs
@@ -5,14 +5,14 @@
 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
+        /// Only the List view is shown
         /// </summary>
-        Master,
+        List,
 
         /// <summary>
         /// Only the Details view is shown
@@ -20,7 +20,7 @@ public enum MasterDetailsViewState
         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.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index dd10bade86a..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
@@ -2,23 +2,40 @@
 
   <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.
+
+      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>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.4.2" />
+    <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.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/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
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.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/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>
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
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.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index 9d8dfd8aa28..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\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/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 87%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
index 19fdc0472b4..9cadfd0da35 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs
@@ -11,6 +11,9 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     internal class IDrawableConverter : JsonConverter<IDrawable>
     {
+        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);
 
         public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -40,11 +43,11 @@ 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 == OldInkDrawableDiscriminator)
             {
                 drawable = new InkDrawable();
             }
-            else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable)))
+            else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable)) || typeDiscriminator == OldTextDrawableDiscriminator)
             {
                 drawable = new TextDrawable();
             }
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..294e7524498
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <Title>Windows Community Toolkit Media Controls</Title>
+    <Description>
+      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.
+        - 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 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>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <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>
+    <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>
+
+  <!-- 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..782ee42cd95
--- /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.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
new file mode 100644
index 00000000000..31b1259a180
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml
@@ -0,0 +1,9 @@
+<FileList>
+  <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" />
+      <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.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..351fd292c13
--- /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.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" />
+    <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.Primitives.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..9fd890b71a6
--- /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 Primitive Controls (Design)")]
+[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive 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/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..bc7372a702b
--- /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>
+		<TargetFrameworks>uap10.0.17763</TargetFrameworks>
+		<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.
+
+			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.
+			- 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>
+		<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>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<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" />
+	</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..996b6308daf
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+// 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.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")]
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/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..da08ea53fd9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml
@@ -0,0 +1,12 @@
+<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.SwitchPresenter" />
+      <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.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
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 aeb9901a367..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
@@ -1,76 +1,17 @@
-<Project Sdk="MSBuild.Sdk.Extras">
-
+<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:
-        - 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.
-        - 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.
-        - 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.
-        - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
-        - RotatorTile: Rotates through a set of items one-by-one like a live-tile.
-        - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
-        - TabbedCommandBar: A ribbon-like control that displays a tabbed collection of CommandBars
-        - 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>
-    <!-- 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>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
   </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.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.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>
-
-  <ItemGroup>
-    <PRIResource Include="Strings\en-us\Resources.resw" />
+    <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" />
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj" />
   </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/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
deleted file mode 100644
index 176af58ede4..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<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/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" />
-        <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/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/TabbedCommandBar/TabbedCommandBar.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.MergedDictionaries>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
deleted file mode 100644
index 479fe150be9..00000000000
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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" />
-      <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.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" />
-      <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" />
-      <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.TabbedCommandBar" />
-      <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/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
new file mode 100644
index 00000000000..2ad0f30edd2
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/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.Core/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml.cs
new file mode 100644
index 00000000000..65e09322217
--- /dev/null
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/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/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/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
index 4cb117351cd..78a6ff87afd 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Layout/MainPage.xaml
@@ -2,40 +2,17 @@
     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>
+    <controls:Expander />
+  </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);
-            }
         }
     }
 }
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/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/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
index d628d8c1bc0..2ad0f30edd2 100644
--- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
+++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/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/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index d23ce403d2e..bb5b9a32296 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -21,9 +21,13 @@
       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.Input;
       Microsoft.Toolkit.Uwp.UI.Controls.Markdown;
+      Microsoft.Toolkit.Uwp.UI.Controls.Media;
+      Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
       Microsoft.Toolkit.Uwp.UI.Media;
     </ToolkitPackages>
   </PropertyGroup>
@@ -88,4 +92,4 @@
     <Error Condition="'@(ToolkitNugets)' == ''" Text="Directory '$(ToolkitNugets)' is empty"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 55c0c6f73c5..d91d23256fb 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\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/Assets/Samples/InfiniteCanvasExport.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json
index 08a856e87a9..68b97e43b0a 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": {
@@ -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
           }
         }
       ],
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/UI/Controls/Test_ListDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
new file mode 100644
index 00000000000..1ad14e3fd77
--- /dev/null
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
@@ -0,0 +1,81 @@
+// 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 Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using System.Linq;
+
+namespace UnitTests.UI.Controls
+{
+    [TestClass]
+    public class Test_ListDetailsView
+    {
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_SelectedIndex_Default()
+        {
+            var items = Enumerable.Range(1, 10).ToArray();
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            Assert.AreEqual(-1, listDetailsView.SelectedIndex);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_SelectedItem_Default()
+        {
+            var items = Enumerable.Range(1, 10).ToArray();
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            Assert.IsNull(listDetailsView.SelectedItem);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_SelectedIndex_Syncs_SelectedItem()
+        {
+            var items = Enumerable.Range(1, 10).ToArray();
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedIndex = 6;
+            Assert.AreEqual(items[6], listDetailsView.SelectedItem);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_UnselectUsingIndex()
+        {
+            var items = Enumerable.Range(1, 10).ToArray();
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedIndex = 5;            
+            listDetailsView.SelectedIndex = -1;
+            Assert.IsNull(listDetailsView.SelectedItem);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_UnselectUsingItem()
+        {
+            var items = Enumerable.Range(1, 10).ToArray();
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedItem = items[5];
+            listDetailsView.SelectedItem = null;
+            Assert.AreEqual(-1, listDetailsView.SelectedIndex);
+        }
+
+        [TestCategory("ListDetailsView")]
+        [UITestMethod]
+        public void Test_SelectedItem_Syncs_SelectedIndex()
+        {
+            var items = Enumerable.Range(0, 10).ToArray();
+            var listDetailsView = new ListDetailsView();
+            listDetailsView.ItemsSource = items;
+            listDetailsView.SelectedItem = items[3];
+            Assert.AreEqual(3, listDetailsView.SelectedIndex);
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
deleted file mode 100644
index 7108d74e020..00000000000
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_MasterDetailsView.cs
+++ /dev/null
@@ -1,81 +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.
-
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
-using System.Linq;
-
-namespace UnitTests.UI.Controls
-{
-    [TestClass]
-    public class Test_MasterDetailsView
-    {
-        [TestCategory("MasterDetailsView")]
-        [UITestMethod]
-        public void Test_SelectedIndex_Default()
-        {
-            var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
-            masterDetailsView.ItemsSource = items;
-            Assert.AreEqual(-1, masterDetailsView.SelectedIndex);
-        }
-
-        [TestCategory("MasterDetailsView")]
-        [UITestMethod]
-        public void Test_SelectedItem_Default()
-        {
-            var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
-            masterDetailsView.ItemsSource = items;
-            Assert.IsNull(masterDetailsView.SelectedItem);
-        }
-
-        [TestCategory("MasterDetailsView")]
-        [UITestMethod]
-        public void Test_SelectedIndex_Syncs_SelectedItem()
-        {
-            var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedIndex = 6;
-            Assert.AreEqual(items[6], masterDetailsView.SelectedItem);
-        }
-
-        [TestCategory("MasterDetailsView")]
-        [UITestMethod]
-        public void Test_UnselectUsingIndex()
-        {
-            var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedIndex = 5;            
-            masterDetailsView.SelectedIndex = -1;
-            Assert.IsNull(masterDetailsView.SelectedItem);
-        }
-
-        [TestCategory("MasterDetailsView")]
-        [UITestMethod]
-        public void Test_UnselectUsingItem()
-        {
-            var items = Enumerable.Range(1, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedItem = items[5];
-            masterDetailsView.SelectedItem = null;
-            Assert.AreEqual(-1, masterDetailsView.SelectedIndex);
-        }
-
-        [TestCategory("MasterDetailsView")]
-        [UITestMethod]
-        public void Test_SelectedItem_Syncs_SelectedIndex()
-        {
-            var items = Enumerable.Range(0, 10).ToArray();
-            var masterDetailsView = new MasterDetailsView();
-            masterDetailsView.ItemsSource = items;
-            masterDetailsView.SelectedItem = items[3];
-            Assert.AreEqual(3, masterDetailsView.SelectedIndex);
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index ce29975833b..2335990625c 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -198,7 +198,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" />
@@ -220,11 +220,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" />
@@ -262,9 +263,25 @@
       <Project>{b24a296c-b3eb-4e06-a64e-74ac2d1acc91}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Animations</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <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.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>
+    </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.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>
@@ -525,4 +542,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index cc9fc72981e..80e14268a0c 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -187,9 +187,17 @@
       <Project>{5bf75694-798a-43a0-8150-415de195359c}</Project>
       <Name>Microsoft.Toolkit.Uwp.Input.GazeInteraction</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <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>
+    </ProjectReference>
+    <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 28c7a6adf5e..4deb46bdf10 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.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
@@ -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.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
@@ -139,6 +139,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Be
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Diagnostics", "Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj", "{76F89522-CA28-458D-801D-947AB033A758}"
 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
+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
+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
+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
+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
@@ -1000,6 +1023,122 @@ Global
 		{76F89522-CA28-458D-801D-947AB033A758}.Release|x64.Build.0 = Release|Any CPU
 		{76F89522-CA28-458D-801D-947AB033A758}.Release|x86.ActiveCfg = Release|Any CPU
 		{76F89522-CA28-458D-801D-947AB033A758}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
@@ -1042,6 +1181,13 @@ Global
 		{C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
 		{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
+		{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}
+		{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}