diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 3358e6eee51..512146ac2fb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -333,8 +333,8 @@
     <Content Include="SamplePages\LiveTile\LiveTile.png" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.png" />
     <Content Include="SamplePages\Loading\Loading.png" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.png" />
-    <Content Include="SamplePages\MasterDetailsView\OneDriveLogo.png" />
+    <Content Include="SamplePages\ListDetailsView\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" />
@@ -403,7 +403,7 @@
     <Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
     <Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
     <Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.bind" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsView.bind" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
     <Content Include="SamplePages\PrintHelper\PrintHelperCode.bind" />
     <Content Include="SamplePages\SystemInformation\SystemInformationCode.bind" />
@@ -418,7 +418,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
-    <Content Include="SamplePages\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" />
@@ -860,8 +860,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>
@@ -1305,7 +1305,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>
@@ -1479,9 +1479,9 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\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>
@@ -1587,4 +1587,4 @@
     <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
     <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f | findstr /v /b &quot;#pragma&quot; &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/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/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index b727ea5ea6e..6b463091418 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -95,14 +95,14 @@
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
       },
       {
-        "Name": "MasterDetailsView",
-        "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/ListDetailsView",
+        "XamlCodeFile": "ListDetailsView.bind",
+        "CodeFile": "ListDetailsViewCode.bind",
+        "Icon": "/SamplePages/ListDetailsView/ListDetailsView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/MasterDetailsView.md"
       },
       {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistrationBase.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistrationBase.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/PlatformTypes.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/PlatformTypes.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeItem.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/BladeView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Carousel.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/DropShadowPanel.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/Expander.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/GridSplitter.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ImageEx.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/InAppNotification.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/LayoutTransitionControl.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs
new file mode 100644
index 00000000000..324cf736a21
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.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.Core.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.Core.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.Core.Design/Controls/ListDetailsView.Typedata.cs
@@ -8,18 +8,18 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
     internal static partial class ControlTypes
     {
-        internal const string MasterDetailsView = RootNamespace + "." + nameof(MasterDetailsView);
+        internal const string ListDetailsView = RootNamespace + "." + nameof(ListDetailsView);
     }
 
-    internal static class MasterDetailsView
+    internal static class ListDetailsView
     {
         internal const string DetailsCommandBar = nameof(DetailsCommandBar);
         internal const string DetailsTemplate = nameof(DetailsTemplate);
-        internal const string MasterCommandBar = nameof(MasterCommandBar);
-        internal const string MasterHeader = nameof(MasterHeader);
-        internal const string MasterHeaderTemplate = nameof(MasterHeaderTemplate);
-        internal const string MasterPaneBackground = nameof(MasterPaneBackground);
-        internal const string MasterPaneWidth = nameof(MasterPaneWidth);
+        internal const string ListCommandBar = nameof(ListCommandBar);
+        internal const string ListHeader = nameof(ListHeader);
+        internal const string ListHeaderTemplate = nameof(ListHeaderTemplate);
+        internal const string ListPaneBackground = nameof(ListPaneBackground);
+        internal const string ListPaneWidth = nameof(ListPaneWidth);
         internal const string NoSelectionContent = nameof(NoSelectionContent);
         internal const string NoSelectionContentTemplate = nameof(NoSelectionContentTemplate);
         internal const string SelectedItem = nameof(SelectedItem);
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/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/OrbitView.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialProgressBar.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RotatorTile.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ScrollHeader.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TextToolbar.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Typedata.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TileControl.Typedata.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj
similarity index 92%
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 a318c0dacc9..fbf81b0de37 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>
@@ -99,8 +99,8 @@
     <Compile Include="Controls\LayoutTransitionControl.Typedata.cs" />
     <Compile Include="Controls\Loading.Metadata.cs" />
     <Compile Include="Controls\Loading.Typedata.cs" />
-    <Compile Include="Controls\MasterDetailsView.Metadata.cs" />
-    <Compile Include="Controls\MasterDetailsView.Typedata.cs" />
+    <Compile Include="Controls\ListDetailsView.Metadata.cs" />
+    <Compile Include="Controls\ListDetailsView.Typedata.cs" />
     <Compile Include="Controls\Menu.Metadata.cs" />
     <Compile Include="Controls\Menu.Typedata.cs" />
     <Compile Include="Controls\MenuItem.Metadata.cs" />
@@ -137,8 +137,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 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.Designer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
similarity index 96%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
index 21202d4d9fe..b6683199794 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs
@@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args)
             {
                 Width = _normalModeWidth;
                 VisualStateManager.GoToState(this, "Expanded", true);
-                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
@@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args)
             {
                 Width = double.NaN;
                 VisualStateManager.GoToState(this, "Collapsed", true);
-                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
index facc3230bf7..edc0bab90c1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs
@@ -168,7 +168,7 @@ public GridSplitter()
         {
             DefaultStyleKey = typeof(GridSplitter);
             Loaded += GridSplitter_Loaded;
-            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
             AutomationProperties.SetName(this, automationName);
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs
similarity index 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/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
similarity index 82%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
index 694979e659d..165d9409af8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// The behavior to use for navigating between the <see cref="MasterDetailsView"/> master and details views
+    /// The behavior to use for navigating between the <see cref="ListDetailsView"/> 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.Core/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.Core/ListDetailsView/ListDetailsView.Events.cs
index ab7c55a2b29..efbad14e5e0 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/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.Core/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.Core/ListDetailsView/ListDetailsView.Properties.cs
index e7b7a22ca54..73c8b92f77f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/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.Core/ListDetailsView/ListDetailsView.cs
similarity index 88%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
index 60ad5fdbf4e..2b117bf37c7 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
-    /// Panel that allows for a Master/Details pattern.
+    /// Panel that allows for a List/Details pattern.
     /// </summary>
     [TemplatePart(Name = PartDetailsPresenter, Type = typeof(ContentPresenter))]
     [TemplatePart(Name = PartDetailsPanel, Type = typeof(FrameworkElement))]
@@ -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.Core/ListDetailsView/ListDetailsView.xaml
similarity index 90%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml
index dd37399662f..02c8025fa94 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/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.Core/ListDetailsView/ListDetailsViewState.cs
similarity index 71%
rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs
index a22d3ac678b..316bc0ad692 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/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/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 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
similarity index 92%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index 8e2ffab23ce..4537d59aaf6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -20,7 +20,7 @@
         - InAppNotification: Show local notifications in your application.
         - LayoutTransformControl: Support for transformations as if applied by LayoutTransform.
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
-        - MasterDetailsView: Implements the Master/Details design pattern.
+        - ListDetailsView: Implements the List/Details design pattern.
         - OrbitView: Positions items in a circle around a center element and supports orbits and anchors.
         - RadialGauge: Displays a value within a range, using a needle on a circular face.
         - RadialProgressBar: Displays progress as a circle getting filled.
@@ -31,14 +31,13 @@
         - TileControl: A ContentControl that show an image repeated many times.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
+    <PackageTags>UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas List Details ListDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
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 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs
similarity index 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/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
similarity index 55%
rename from Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
index 95de109ee45..d6c4cc4e660 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml
@@ -1,31 +1,31 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
index 0b9576a565a..d46f9f24b17 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs
@@ -185,7 +185,7 @@ protected override void OnApplyTemplate()
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
             var menuFlyout = new MenuFlyout();
@@ -349,7 +349,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var removeMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
             removeMenuItem.Click += (s, e) => TokenizingTextBoxItem_ClearClicked(tokenitem, null);
 
@@ -361,7 +361,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
             var selectAllMenuItem = new MenuFlyoutItem
             {
-                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
+                Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")
             };
             selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText();
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
index 8245896155c..dca7c0f5617 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml
@@ -3,8 +3,8 @@
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
                     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Resources for TokenizingTextBox  -->
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
similarity index 93%
rename from Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
index 754b18df839..5a84cf2dbac 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml
@@ -1,5 +1,5 @@
 <FileList>
-  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.dll">
+  <File Reference="Microsoft.Toolkit.Uwp.UI.Controls.Core.dll">
     <ToolboxItems VSCategory="Windows Community Toolkit" BlendCategory="Windows Community Toolkit">
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.BladeView" />
@@ -16,7 +16,7 @@
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
-      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView" />
+      <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ListDetailsView" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
       <Item Type="Microsoft.Toolkit.Uwp.UI.Controls.OrbitView" />
diff --git a/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.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.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index 85beee41047..294e7524498 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
     <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
     <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
   </ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
index 470bf4c5e0f..351fd292c13 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj
@@ -75,10 +75,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
-    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\Constants.cs" Link="Common\Constants.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
+    <Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
     <Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
     <Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
     <Compile Include="Controls\WrapPanel.Metadata.cs" />
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
similarity index 100%
rename from SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
rename to SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml
diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml.cs
similarity index 100%
rename from SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
rename to SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml.cs
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index 3b481d98be5..065f2d84af3 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -4,7 +4,7 @@
   <!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
   <PropertyGroup Condition="'$(CurrentProject)' == ''">
     <!-- When writting the SmokeTests, change this to whichever Toolkit project you want to build a test to, then reload the project -->
-    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls</CurrentProject>
+    <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls.Core</CurrentProject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NuGetPackageVersion)' == ''">
     <NuGetPackageVersion>To Fill In With Local Version Number</NuGetPackageVersion>
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index b7ba6ee0f16..c421f2b3e71 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -19,7 +19,7 @@
       Microsoft.Toolkit.Uwp.UI;
       Microsoft.Toolkit.Uwp.UI.Animations;
       Microsoft.Toolkit.Uwp.UI.Behaviors;
-      Microsoft.Toolkit.Uwp.UI.Controls;
+      Microsoft.Toolkit.Uwp.UI.Controls.Core;
       Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
       Microsoft.Toolkit.Uwp.UI.Controls.Layout;
       Microsoft.Toolkit.Uwp.UI.Controls.Markdown;
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index bcb7be34ecc..273b0b92955 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -226,9 +226,9 @@
       <Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\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/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 7e3cafa1683..c562fd33b91 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -192,7 +192,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" />
@@ -257,9 +257,9 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj">
       <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index bb54f37fd89..3067971ab21 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -191,9 +191,9 @@
       <Project>{43bd2a36-9e12-4788-80ae-2377e41e6d05}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Media</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj">
       <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
index d9393b8054c..3310f05c1a4 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs
@@ -44,7 +44,7 @@ await App.Dispatcher.EnqueueAsync(() =>
         [TestMethod]
         public void StringExtensions_GetLocalizedWithResourcePath()
         {
-            var str = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            var str = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
             Assert.AreEqual("Ok", str);
         }
 
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index ce6734c34cc..cde9430b45f 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