diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Icons/Extensions.png b/Microsoft.Toolkit.Uwp.SampleApp/Icons/Extensions.png
new file mode 100644
index 00000000000..9f194b5c64b
Binary files /dev/null and b/Microsoft.Toolkit.Uwp.SampleApp/Icons/Extensions.png differ
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 63b74accd1a..00686b16db1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -236,6 +236,7 @@
     <Content Include="Icons\Animations.png" />
     <Content Include="Icons\About.png" />
     <Content Include="Icons\DeveloperTools.png" />
+    <Content Include="Icons\Extensions.png" />
     <Content Include="Icons\Helpers.png" />
     <Content Include="Icons\Foundation.png" />
     <Content Include="Icons\Layouts.png" />
@@ -294,7 +295,7 @@
     <Content Include="SamplePages\Scale\ScaleBehavior.png" />
     <Content Include="SamplePages\SlidableListItem\SlidableListItem.png" />
     <Content Include="SamplePages\Object Storage\ObjectStorage.png" />
-    <Content Include="SamplePages\SurfaceDialTextboxHelper\SurfaceDialTextboxHelper.png" />
+    <Content Include="SamplePages\SurfaceDialTextbox\SurfaceDialTextbox.png" />
     <Content Include="SamplePages\TextBoxMask\TextBoxMask.png" />
     <Content Include="SamplePages\TextBoxRegex\TextBoxRegex.png" />
     <Content Include="SamplePages\Toast\icon.jpg" />
@@ -373,7 +374,7 @@
     <Content Include="SamplePages\TileControl\TileControl.bind">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="SamplePages\SurfaceDialTextboxHelper\SurfaceDialTextboxHelperCode.bind">
+    <Content Include="SamplePages\SurfaceDialTextbox\SurfaceDialTextboxCode.bind">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
@@ -398,6 +399,7 @@
     <Content Include="SamplePages\BluetoothLEHelper\BluetoothLEHelperCode.bind" />
     <Content Include="SamplePages\OrbitView\OrbitViewXaml.bind" />
     <Content Include="SamplePages\Menu\Menu.bind" />
+    <Content Include="SamplePages\ListViewBase\ListViewBaseCode.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -418,6 +420,9 @@
     <Compile Include="SamplePages\BluetoothLEHelper\BluetoothLEHelperPage.xaml.cs">
       <DependentUpon>BluetoothLEHelperPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\ListViewBase\ListViewBasePage.xaml.cs">
+      <DependentUpon>ListViewBasePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\Menu\Commands\VsCommands.cs" />
     <Compile Include="SamplePages\Menu\MenuPage.xaml.cs">
       <DependentUpon>MenuPage.xaml</DependentUpon>
@@ -558,8 +563,8 @@
     <Compile Include="SamplePages\Object Storage\ObjectStoragePage.xaml.cs">
       <DependentUpon>ObjectStoragePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\SurfaceDialTextboxHelper\SurfaceDialTextboxHelperPage.xaml.cs">
-      <DependentUpon>SurfaceDialTextboxHelperPage.xaml</DependentUpon>
+    <Compile Include="SamplePages\SurfaceDialTextbox\SurfaceDialTextboxPage.xaml.cs">
+      <DependentUpon>SurfaceDialTextboxPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\SystemInformation\SystemInformationPage.xaml.cs">
       <DependentUpon>SystemInformationPage.xaml</DependentUpon>
@@ -675,6 +680,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="SamplePages\ListViewBase\ListViewBasePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SamplePages\Menu\MenuPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -831,7 +840,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SamplePages\SurfaceDialTextboxHelper\SurfaceDialTextboxHelperPage.xaml">
+    <Page Include="SamplePages\SurfaceDialTextbox\SurfaceDialTextboxPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBaseCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBaseCode.bind
new file mode 100644
index 00000000000..6789e83e580
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBaseCode.bind
@@ -0,0 +1,32 @@
+<Page
+    x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ListViewBasePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+    mc:Ignorable="d">
+
+  <Page.Resources>
+    <DataTemplate x:Name="NormalTemplate">
+      <TextBlock Text="{Binding Title}" Foreground="Green"></TextBlock>
+    </DataTemplate>
+
+    <DataTemplate x:Name="AlternateTemplate">
+      <TextBlock Text="{Binding Title}" Foreground="Orange"></TextBlock>
+    </DataTemplate>
+  </Page.Resources>
+
+  <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <ListView
+        x:Name="SampleListView"
+        Margin="12"
+        ItemTemplate="{StaticResource NormalTemplate}"
+        extensions:ListViewBase.AlternateColor="LightGray"
+        extensions:ListViewBase.AlternateItemTemplate="{StaticResource AlternateTemplate}"
+        extensions:ListViewBase.StretchItemContainerDirection="Both">
+    </ListView>
+
+  </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBasePage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBasePage.xaml
new file mode 100644
index 00000000000..65f424645bc
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBasePage.xaml
@@ -0,0 +1,32 @@
+<Page
+    x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ListViewBasePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <DataTemplate x:Name="NormalTemplate">
+            <TextBlock Text="{Binding Title}" Foreground="Green"></TextBlock>
+        </DataTemplate>
+
+        <DataTemplate x:Name="AlternateTemplate">
+            <TextBlock Text="{Binding Title}" Foreground="Orange"></TextBlock>
+        </DataTemplate>
+    </Page.Resources>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+        <ListView 
+            x:Name="SampleListView"
+            Margin="12"
+            ItemTemplate="{StaticResource NormalTemplate}"
+            extensions:ListViewBase.AlternateColor="LightGray"
+            extensions:ListViewBase.AlternateItemTemplate="{StaticResource AlternateTemplate}"
+            extensions:ListViewBase.StretchItemContainerDirection="Both">
+        </ListView>
+
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBasePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBasePage.xaml.cs
new file mode 100644
index 00000000000..b2efa9103bd
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewBase/ListViewBasePage.xaml.cs
@@ -0,0 +1,30 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
+{
+    public sealed partial class ListViewBasePage : Page
+    {
+        public ListViewBasePage()
+        {
+            this.InitializeComponent();
+        }
+
+        protected async override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            SampleListView.ItemsSource = await new Data.PhotosDataSource().GetItemsAsync();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextbox.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextbox.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind
new file mode 100644
index 00000000000..a39c334d0f7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind
@@ -0,0 +1,29 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.SurfaceDialTextboxPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+  <Grid x:Name="Root"
+        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+
+      <TextBox HorizontalAlignment="Left" 
+               VerticalAlignment="Top" 
+               Text="0" 
+               Width="106"
+               extensions:SurfaceDialTextbox.StepValue="@[StepValue:DoubleSlider:1:0.1-10]"
+               extensions:SurfaceDialTextbox.ForceMenuItem="@[ForceMenuItem:Bool:true]"
+               extensions:SurfaceDialTextbox.EnableHapticFeedback="@[EnableHapticFeedback:Bool:true]"
+               extensions:SurfaceDialTextbox.EnableMinMaxValue="@[EnableMinMaxValue:Bool:true]"
+               extensions:SurfaceDialTextbox.MinValue="@[MinValue:DoubleSlider:0:0-100]"
+               extensions:SurfaceDialTextbox.MaxValue="@[MaxValue:DoubleSlider:100:0-100]"
+               extensions:SurfaceDialTextbox.Icon="@[Icon:Enum:RadialControllerMenuKnownIcon.Ruler]"
+               extensions:SurfaceDialTextbox.EnableTapToNextControl="@[EnableTapToNextControl:Bool:true]"/>
+    </StackPanel>
+  </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml
new file mode 100644
index 00000000000..32a73a3b44f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml
@@ -0,0 +1,29 @@
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.SurfaceDialTextboxPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+      mc:Ignorable="d">
+
+    <Grid x:Name="Root"
+          Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+
+            <TextBox Width="250"
+                     Margin="0,0,0,10"
+                     HorizontalAlignment="Left"
+                     VerticalAlignment="Top"
+                     extensions:SurfaceDialTextbox.EnableHapticFeedback="{Binding DataContext.EnableHapticFeedback.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.EnableMinMaxValue="{Binding DataContext.EnableMinMaxValue.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.EnableTapToNextControl="{Binding DataContext.EnableTapToNextControl.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.ForceMenuItem="{Binding DataContext.ForceMenuItem.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.Icon="{Binding DataContext.Icon.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.MaxValue="{Binding DataContext.MaxValue.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.MinValue="{Binding DataContext.MinValue.Value, ElementName=Root, Mode=OneWay}"
+                     extensions:SurfaceDialTextbox.StepValue="{Binding DataContext.StepValue.Value, ElementName=Root, Mode=OneWay}"
+                     Text="0" />
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml.cs
similarity index 81%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperPage.xaml.cs
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml.cs
index a9bfec729d4..061d2f06d16 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml.cs
@@ -10,15 +10,13 @@
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 
-using Microsoft.Toolkit.Uwp.SampleApp.Models;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
-    public sealed partial class SurfaceDialTextboxHelperPage : Page
+    public sealed partial class SurfaceDialTextboxPage : Page
     {
-        public SurfaceDialTextboxHelperPage()
+        public SurfaceDialTextboxPage()
         {
             InitializeComponent();
         }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperCode.bind
deleted file mode 100644
index 1f3d89a1653..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperCode.bind
+++ /dev/null
@@ -1,29 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.SurfaceDialTextboxHelperPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-  <Grid x:Name="Root"
-        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-    <StackPanel HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-
-      <TextBox HorizontalAlignment="Left" 
-               VerticalAlignment="Top" 
-               Text="0" 
-               Width="106"
-               controls:SurfaceDialTextboxHelper.StepValue="@[StepValue:DoubleSlider:1:0.1-10]"
-               controls:SurfaceDialTextboxHelper.ForceMenuItem="@[ForceMenuItem:Bool:true]"
-               controls:SurfaceDialTextboxHelper.EnableHapticFeedback="@[EnableHapticFeedback:Bool:true]"
-               controls:SurfaceDialTextboxHelper.EnableMinMaxValue="@[EnableMinMaxValue:Bool:true]"
-               controls:SurfaceDialTextboxHelper.MinValue="@[MinValue:DoubleSlider:0:0-100]"
-               controls:SurfaceDialTextboxHelper.MaxValue="@[MaxValue:DoubleSlider:100:0-100]"
-               controls:SurfaceDialTextboxHelper.Icon="@[Icon:Enum:RadialControllerMenuKnownIcon.Ruler]"
-               controls:SurfaceDialTextboxHelper.EnableTapToNextControl="@[EnableTapToNextControl:Bool:true]"/>
-    </StackPanel>
-  </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperPage.xaml
deleted file mode 100644
index c6409ca01ec..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelperPage.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.SurfaceDialTextboxHelperPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <Grid x:Name="Root"
-          Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel HorizontalAlignment="Center"
-                    VerticalAlignment="Center">
-
-            <TextBox Width="250"
-                     Margin="0,0,0,10"
-                     HorizontalAlignment="Left"
-                     VerticalAlignment="Top"
-                     controls:SurfaceDialTextboxHelper.EnableHapticFeedback="{Binding DataContext.EnableHapticFeedback.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.EnableMinMaxValue="{Binding DataContext.EnableMinMaxValue.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.EnableTapToNextControl="{Binding DataContext.EnableTapToNextControl.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.ForceMenuItem="{Binding DataContext.ForceMenuItem.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.Icon="{Binding DataContext.Icon.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.MaxValue="{Binding DataContext.MaxValue.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.MinValue="{Binding DataContext.MinValue.Value, ElementName=Root, Mode=OneWay}"
-                     controls:SurfaceDialTextboxHelper.StepValue="{Binding DataContext.StepValue.Value, ElementName=Root, Mode=OneWay}"
-                     Text="0" />
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind
index 0b169b24ef7..8ed2b51e0cb 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind
@@ -1,7 +1,7 @@
 <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextBoxMaskPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -29,21 +29,21 @@
                 <RowDefinition />
             </Grid.RowDefinitions>
 
-            <TextBox controls:TextBoxMask.Mask="9a9a-a9a*"
+            <TextBox extensions:TextBoxMask.Mask="9a9a-a9a*"
                      Header="Text box with Mask 9a9a-a9a* (9 allows from 0 to 9, a allow from a to Z and * allows both a and 9)"
                      HeaderTemplate="{StaticResource HeaderTemplate}"
                      Style="{StaticResource MaskedTextBoxStyle}" />
 
             <TextBox Grid.Row="1"
-                     controls:TextBoxMask.Mask="+1999-9999"
-                     controls:TextBoxMask.PlaceHolder=" "
+                     extensions:TextBoxMask.Mask="+1999-9999"
+                     extensions:TextBoxMask.PlaceHolder=" "
                      Header="Text box with Mask +1999-9999 and placeHolder as space (placeholder represents the characters the user can change on runtime)"
                      HeaderTemplate="{StaticResource HeaderTemplate}"
                      Style="{StaticResource MaskedTextBoxStyle}" />
 
             <TextBox Grid.Row="2"
-                     controls:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
-                     controls:TextBoxMask.Mask="a5c-5c*9"
+                     extensions:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
+                     extensions:TextBoxMask.Mask="a5c-5c*9"
                      Header="Text box with CustomMask in case you want to define your own variable character like a,9 and * , mask: a5c-5c*9, 5: [1-5], c: [a-c]"
                      HeaderTemplate="{StaticResource HeaderTemplate}"
                      Style="{StaticResource MaskedTextBoxStyle}" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml
index 3b650995071..3f50d4e8c8a 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextBoxMaskPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -36,7 +36,7 @@
                 </Grid.RowDefinitions>
                 <StackPanel>
                     <TextBox Name="AlphaTextBox"
-                             controls:TextBoxMask.Mask="9a9a--a9a*"
+                             extensions:TextBoxMask.Mask="9a9a--a9a*"
                              Header="Text box with Mask 9a9a--a9a* (9 allows from 0 to 9, a allow from a to Z and * allows both a and 9) with initial value"
                              HeaderTemplate="{StaticResource HeaderTemplate}"
                              Style="{StaticResource MaskedTextBoxStyle}"
@@ -55,15 +55,15 @@
                 </StackPanel>
 
                 <TextBox Grid.Row="1"
-                         controls:TextBoxMask.Mask="+1999-9999"
-                         controls:TextBoxMask.PlaceHolder=" "
+                         extensions:TextBoxMask.Mask="+1999-9999"
+                         extensions:TextBoxMask.PlaceHolder=" "
                          Header="Text box with Mask +1999-9999 and placeHolder as space (placeholder represents the characters the user can change on runtime)"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource MaskedTextBoxStyle}" />
 
                 <TextBox Grid.Row="2"
-                         controls:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
-                         controls:TextBoxMask.Mask="a5c-5c*9"
+                         extensions:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
+                         extensions:TextBoxMask.Mask="a5c-5c*9"
                          Header="Text box with CustomMask in case you want to define your own variable character like a,9 and * , mask: a5c-5c*9, 5: [1-5], c: [a-c]"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource MaskedTextBoxStyle}" />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind
index 1cf18698b8b..7ff1d4809af 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind
@@ -2,7 +2,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -33,13 +33,13 @@
 
       <StackPanel Margin="10,0,10,0">
         <TextBox Name="PhoneNumberValidator"
-                 controls:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
+                 extensions:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
                  Header="Text box with Regex extension for phone number, validation occurs on TextChanged"
                  HeaderTemplate="{StaticResource HeaderTemplate}"
                  Style="{StaticResource TextBoxRegexStyle}" />
         <StackPanel Orientation="Horizontal">
           <TextBlock Text="Is Valid: " />
-          <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
+          <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
         </StackPanel>
 
       </StackPanel>
@@ -47,42 +47,42 @@
       <StackPanel Grid.Row="1"
                   Margin="10,0,10,0">
         <TextBox Name="PhoneNumberValidatorForce"
-                 controls:TextBoxRegex.ValidationMode="Forced"
-                 controls:TextBoxRegex.ValidationType="PhoneNumber"
+                 extensions:TextBoxRegex.ValidationMode="Forced"
+                 extensions:TextBoxRegex.ValidationType="PhoneNumber"
                  Header="Text box with ValidationType=PhoneNumber, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force"
                  HeaderTemplate="{StaticResource HeaderTemplate}"
                  Style="{StaticResource TextBoxRegexStyle}"
                  Text="+61616161611" />
         <StackPanel Orientation="Horizontal">
           <TextBlock Text="Is Valid: " />
-          <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=PhoneNumberValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+          <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidatorForce, Converter={StaticResource StringFormatConverter}}" />
         </StackPanel>
       </StackPanel>
 
       <StackPanel Grid.Row="2"
                   Margin="10,0,10,0">
         <TextBox Name="EmailValidatorForce"
-                 controls:TextBoxRegex.ValidationType="Email"
+                 extensions:TextBoxRegex.ValidationType="Email"
                  Header="Text box with ValidationType=Email, validation occurs on TextChanged"
                  HeaderTemplate="{StaticResource HeaderTemplate}"
                  Style="{StaticResource TextBoxRegexStyle}" />
         <StackPanel Orientation="Horizontal">
           <TextBlock Text="Is Valid: " />
-          <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=EmailValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+          <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=EmailValidatorForce, Converter={StaticResource StringFormatConverter}}" />
         </StackPanel>
       </StackPanel>
 
       <StackPanel Grid.Row="3"
                   Margin="10,0,10,0">
         <TextBox Name="DecimalValidatorForce"
-                 controls:TextBoxRegex.ValidationMode="Forced"
-                 controls:TextBoxRegex.ValidationType="Decimal"
+                 extensions:TextBoxRegex.ValidationMode="Forced"
+                 extensions:TextBoxRegex.ValidationType="Decimal"
                  Header="Text box with ValidationType=Decimal, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force (333,111 or 333.111)"
                  HeaderTemplate="{StaticResource HeaderTemplate}"
                  Style="{StaticResource TextBoxRegexStyle}" />
         <StackPanel Orientation="Horizontal">
           <TextBlock Text="Is Valid: " />
-          <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=DecimalValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+          <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=DecimalValidatorForce, Converter={StaticResource StringFormatConverter}}" />
         </StackPanel>
       </StackPanel>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml
index f4ca6641fdc..d9cdef40be8 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml
@@ -2,7 +2,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -34,13 +34,13 @@
 
                 <StackPanel Margin="10,10,10,0">
                     <TextBox Name="PhoneNumberValidator"
-                         controls:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
+                         extensions:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
                          Header="Text box with Regex extension for phone number, validation occurs on TextChanged"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}" />
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="Is Valid: " />
-                        <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
+                        <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
                     </StackPanel>
 
                 </StackPanel>
@@ -48,42 +48,42 @@
                 <StackPanel Grid.Row="1"
                         Margin="10,10,10,0">
                     <TextBox Name="PhoneNumberValidatorForce"
-                         controls:TextBoxRegex.ValidationMode="Forced"
-                         controls:TextBoxRegex.ValidationType="PhoneNumber"
+                         extensions:TextBoxRegex.ValidationMode="Forced"
+                         extensions:TextBoxRegex.ValidationType="PhoneNumber"
                          Header="Text box with ValidationType=PhoneNumber, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}"
                          Text="+61616161611" />
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="Is Valid: " />
-                        <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=PhoneNumberValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+                        <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidatorForce, Converter={StaticResource StringFormatConverter}}" />
                     </StackPanel>
                 </StackPanel>
 
                 <StackPanel Grid.Row="2"
                         Margin="10,10,10,0">
                     <TextBox Name="EmailValidatorForce"
-                         controls:TextBoxRegex.ValidationType="Email"
+                         extensions:TextBoxRegex.ValidationType="Email"
                          Header="Text box with ValidationType=Email, validation occurs on TextChanged"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}" />
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="Is Valid: " />
-                        <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=EmailValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+                        <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=EmailValidatorForce, Converter={StaticResource StringFormatConverter}}" />
                     </StackPanel>
                 </StackPanel>
 
                 <StackPanel Grid.Row="3"
                         Margin="10,10,10,0">
                     <TextBox Name="DecimalValidatorForce"
-                         controls:TextBoxRegex.ValidationMode="Forced"
-                         controls:TextBoxRegex.ValidationType="Decimal"
+                         extensions:TextBoxRegex.ValidationMode="Forced"
+                         extensions:TextBoxRegex.ValidationType="Decimal"
                          Header="Text box with ValidationType=Decimal, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force (333,111 or 333.111)"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}" />
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="Is Valid: " />
-                        <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=DecimalValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+                        <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=DecimalValidatorForce, Converter={StaticResource StringFormatConverter}}" />
                     </StackPanel>
                 </StackPanel>
             </Grid>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
index ba0fdfb07a6..59cce15549b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind
@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:wrapPanel="using:Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
     <Page.Resources>
@@ -56,7 +56,7 @@
                       ItemTemplate="{StaticResource PhotoTemplate}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <wrapPanel:WrapPanel Background="LightGray" />
+                    <controls:WrapPanel Background="LightGray" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
         </ItemsControl>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
index a66b8f5f007..45d5a6d54fa 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml
@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:wrapPanel="using:Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       mc:Ignorable="d">
 
     <Page.Resources>
@@ -55,7 +55,7 @@
                       ItemTemplate="{StaticResource PhotoTemplate}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <wrapPanel:WrapPanel Background="LightGray" />
+                    <controls:WrapPanel Background="LightGray" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
         </ItemsControl>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
index 793f63cff95..cf2df80a5e1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs
@@ -14,7 +14,7 @@
 using System.Collections.ObjectModel;
 using Microsoft.Toolkit.Uwp.SampleApp.Data;
 using Microsoft.Toolkit.Uwp.UI;
-using Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 3d3c759f847..c79b7eb37b9 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -167,15 +167,6 @@
         "Icon": "/SamplePages/Loading/Loading.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/controls/Loading.md"
       },
-      {
-        "Name": "TextBoxMask",
-        "Type": "TextBoxMaskPage",
-        "About": "TextBox Mask property allows a user to more easily enter fixed width text in TextBox control where you would like them to enter the data in a certain format",
-        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask",
-        "XamlCodeFile": "TextBoxMask.bind",
-        "Icon": "/SamplePages/TextBoxMask/TextBoxMask.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/controls/TextBoxMask.md"
-      },
       {
         "Name": "Expander",
         "Type": "ExpanderPage",
@@ -194,16 +185,6 @@
         "Icon": "/SamplePages/TileControl/TileControl.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/controls/TileControl.md"
       },
-      {
-        "Name": "SurfaceDialTextboxHelper",
-        "Type": "SurfaceDialTextboxHelperPage",
-        "About": "Enables support for Surface Dial on any given Textbox. Rotate the Dial to change the numeric value of the Textbox.",
-        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/SurfaceDialTextboxHelper",
-        "XamlCodeFile": "SurfaceDialTextboxHelperCode.bind",
-        "Icon": "/SamplePages/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.png",
-        "BadgeUpdateVersionRequired": "Anniversary Update required",
-        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/controls/SurfaceDialTextboxHelper.md"
-      },
       {
         "Name": "WrapPanel",
         "Type": "WrapPanelPage",
@@ -213,15 +194,6 @@
         "Icon": "/SamplePages/WrapPanel/WrapPanel.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/controls/WrapPanel.md"
       },
-      {
-        "Name": "TextBoxRegex",
-        "Type": "TextBoxRegexPage",
-        "About": "TextBoxRegex helps developer to validate a TextBox with a regular expression using the Regex property.",
-        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex",
-        "XamlCodeFile": "TextBoxRegex.bind",
-        "Icon": "/SamplePages/TextBoxRegex/TextBoxRegex.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/controls/TextBoxRegex.md"
-      },
       {
         "Name": "OrbitView",
         "Type": "OrbitViewPage",
@@ -546,6 +518,21 @@
         "CodeFile": "AdvancedCollectionView.bind",
         "Icon": "/SamplePages/AdvancedCollectionView/AdvancedCollectionView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/helpers/AdvancedCollectionView.md"
+      }
+    ]
+  },
+  {
+    "Name": "Extensions",
+    "Icon": "Icons/Extensions.png",
+    "Samples": [
+      {
+        "Name": "ListViewBase",
+        "Type": "ListViewBasePage",
+        "About": "Extensions for all controls that inherit from ListViewBase like ListView.",
+        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase",
+        "XamlCodeFile": "ListViewBaseCode.bind",
+        "Icon": "/Assets/Helpers.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/extensions/ListViewBase.md"
       },
       {
         "Name": "ViewExtensions",
@@ -554,7 +541,35 @@
         "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/ViewExtensions",
         "XamlCodeFile": "ViewExtensionsCode.bind",
         "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/helpers/ViewExtensions.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/extensions/ViewExtensions.md"
+      },
+      {
+        "Name": "TextBoxMask",
+        "Type": "TextBoxMaskPage",
+        "About": "TextBox Mask property allows a user to more easily enter fixed width text in TextBox control where you would like them to enter the data in a certain format",
+        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask",
+        "XamlCodeFile": "TextBoxMask.bind",
+        "Icon": "/SamplePages/TextBoxMask/TextBoxMask.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/extensions/TextBoxMask.md"
+      },
+      {
+        "Name": "TextBoxRegex",
+        "Type": "TextBoxRegexPage",
+        "About": "TextBoxRegex helps developer to validate a TextBox with a regular expression using the Regex property.",
+        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegex",
+        "XamlCodeFile": "TextBoxRegex.bind",
+        "Icon": "/SamplePages/TextBoxRegex/TextBoxRegex.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/extensions/TextBoxRegex.md"
+      },
+      {
+        "Name": "SurfaceDialTextbox",
+        "Type": "SurfaceDialTextboxPage",
+        "About": "Enables support for Surface Dial on any given Textbox. Rotate the Dial to change the numeric value of the Textbox.",
+        "CodeUrl": "https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox",
+        "XamlCodeFile": "SurfaceDialTextboxCode.bind",
+        "Icon": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextbox.png",
+        "BadgeUpdateVersionRequired": "Anniversary Update required",
+        "DocumentationUrl": "https://raw.githubusercontent.com/Microsoft/UWPCommunityToolkit/dev/docs/extensions/SurfaceDialTextbox.md"
       }
     ]
   },
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
index ebf7936f8ed..a417ce1ea48 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs
@@ -194,7 +194,7 @@ private static void RemoveElementFromCache(FrameworkElement descendant)
 
         private void Menu_Loaded(object sender, RoutedEventArgs e)
         {
-            _wrapPanel = ItemsPanelRoot as WrapPanel.WrapPanel;
+            _wrapPanel = ItemsPanelRoot as WrapPanel;
             if (_wrapPanel != null)
             {
                 _wrapPanel.Orientation = Orientation;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
index 6d26f056bfb..ad08f192c1b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class Menu : ItemsControl
     {
-        private WrapPanel.WrapPanel _wrapPanel;
+        private WrapPanel _wrapPanel;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Menu"/> class.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
index 93925357737..9c99d8d8445 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
@@ -1,14 +1,14 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls"
-                    xmlns:wrapPanel="using:Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel">
+                    xmlns:controls ="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <Style TargetType="local:Menu">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <wrapPanel:WrapPanel />
+                    <controls:WrapPanel />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 4eef82c932f..559c70f8c95 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -137,10 +137,7 @@
     <Compile Include="OrbitView\OrbitViewPanelItemsArrangedArgs.cs" />
     <Compile Include="SurfaceDialTextboxHelper\SurfaceDialTextboxHelper.cs" />
     <Compile Include="TextBoxMask\TextBoxMask.cs" />
-    <Compile Include="TextBoxMask\TextBoxMask.Properties.cs" />
-    <Compile Include="TextBoxRegex\TextBoxRegex.Data.cs" />
-    <Compile Include="TextBoxRegex\TextBoxRegex.Properties.cs" />
-    <Compile Include="TextBoxRegex\TextBoxRegex.cs" />
+    <Compile Include="TextBoxRegEx\TextBoxRegex.cs" />
     <Compile Include="TileControl\TileControl.cs" />
     <Compile Include="WrapPanel\WrapPanel.cs" />
     <Compile Include="WrapPanel\WrapPanel.Data.cs" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.cs b/Microsoft.Toolkit.Uwp.UI.Controls/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.cs
index eb269014d64..e439ebce63e 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/SurfaceDialTextboxHelper/SurfaceDialTextboxHelper.cs
@@ -10,420 +10,15 @@
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 
-using System.Diagnostics;
-using Windows.Foundation.Metadata;
-using Windows.UI.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
+using System;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// Helper class that provides attached properties to enable any TextBox with the Surface Dial. Rotate to change the value by StepValue between MinValue and MaxValue, and tap to go to the Next focus element from a TextBox
     /// </summary>
-    public static class SurfaceDialTextboxHelper
+    [Obsolete("Use Microsoft.Toolkit.Uwp.UI.Extensions.SurfaceDialTextbox")]
+    public class SurfaceDialTextboxHelper : Microsoft.Toolkit.Uwp.UI.Extensions.SurfaceDialTextbox
     {
-       /// <summary>
-        /// If you provide the Controller yourself, set this to true so you won't add new menu items.
-        /// </summary>
-        public static readonly DependencyProperty ForceMenuItemProperty =
-            DependencyProperty.RegisterAttached("ForceMenuItem", typeof(bool), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(false));
-
-        /// <summary>
-        /// Set the default icon of the menu item that gets added. A user will most likely not see this. Defaults to the Ruler icon.
-        /// </summary>
-        public static readonly DependencyProperty IconProperty =
-            DependencyProperty.RegisterAttached("Icon", typeof(RadialControllerMenuKnownIcon), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(RadialControllerMenuKnownIcon.Ruler));
-
-        /// <summary>
-        /// The amount the TextBox will be modified for each rotation step on the Surface Dial. This can be any double value.
-        /// </summary>
-        public static readonly DependencyProperty StepValueProperty =
-            DependencyProperty.RegisterAttached("StepValue", typeof(double), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(0d, new PropertyChangedCallback(StepValueChanged)));
-
-        /// <summary>
-        /// A flag to enable or disable haptic feedback when rotating the dial for the give TextBox. This is enabled by default.
-        /// </summary>
-        public static readonly DependencyProperty EnableHapticFeedbackProperty =
-            DependencyProperty.RegisterAttached("EnableHapticFeedback", typeof(bool), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(true));
-
-        /// <summary>
-        /// Sets the minimum value the TextBox can have when modifying it using a Surface Dial. Default is -100.0
-        /// </summary>
-        public static readonly DependencyProperty MinValueProperty =
-            DependencyProperty.RegisterAttached("MinValue", typeof(double), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(-100d));
-
-        /// <summary>
-        /// Sets the maxium value the TextBox can have when modifying it using a Surface Dial. Default is 100.0
-        /// </summary>
-        public static readonly DependencyProperty MaxValueProperty =
-            DependencyProperty.RegisterAttached("MaxValue", typeof(double), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(100d));
-
-        /// <summary>
-        /// TapToNext is a feature you can set to automatically try to focus the next focusable element from the Surface Dial enabled TextBox. This is on dy default.
-        /// </summary>
-        public static readonly DependencyProperty EnableTapToNextControlProperty =
-            DependencyProperty.RegisterAttached("EnableTapToNextControl", typeof(bool), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(true));
-
-        /// <summary>
-        /// EnableMinMax limits the value in the textbox to your spesificed Min and Max values, see the other properties.
-        /// </summary>
-        public static readonly DependencyProperty EnableMinMaxValueProperty =
-            DependencyProperty.RegisterAttached("EnableMinMaxValue", typeof(bool), typeof(SurfaceDialTextboxHelper), new PropertyMetadata(false));
-
-        /// <summary>
-        /// Getter of the EnableMinMax property
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static bool GetEnableMinMaxValue(DependencyObject obj)
-        {
-            return (bool)obj.GetValue(EnableMinMaxValueProperty);
-        }
-
-        /// <summary>
-        /// Setter of the EnableMinMax property
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetEnableMinMaxValue(DependencyObject obj, bool value)
-        {
-            obj.SetValue(EnableMinMaxValueProperty, value);
-        }
-
-        /// <summary>
-        /// Getter of the TapToNext flag.
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static bool GetEnableTapToNextControl(DependencyObject obj)
-        {
-            return (bool)obj.GetValue(EnableTapToNextControlProperty);
-        }
-
-        /// <summary>
-        /// Setter of the TapToNext flag.
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetEnableTapToNextControl(DependencyObject obj, bool value)
-        {
-            obj.SetValue(EnableTapToNextControlProperty, value);
-        }
-
-        /// <summary>
-        /// Getter of the MaxValue
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static double GetMaxValue(DependencyObject obj)
-        {
-            return (double)obj.GetValue(MaxValueProperty);
-        }
-
-        /// <summary>
-        /// Setter of the MaxValue
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetMaxValue(DependencyObject obj, double value)
-        {
-            obj.SetValue(MaxValueProperty, value);
-        }
-
-        /// <summary>
-        /// Getter of the MinValue
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static double GetMinValue(DependencyObject obj)
-        {
-            return (double)obj.GetValue(MinValueProperty);
-        }
-
-        /// <summary>
-        /// Setter of the MinValue
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetMinValue(DependencyObject obj, double value)
-        {
-            obj.SetValue(MinValueProperty, value);
-        }
-
-        /// <summary>
-        /// Setter of the StepValue.
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static double GetStepValue(DependencyObject obj)
-        {
-            return (double)obj.GetValue(StepValueProperty);
-        }
-
-        /// <summary>
-        /// Getter of the StepValue
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetStepValue(DependencyObject obj, double value)
-        {
-            obj.SetValue(StepValueProperty, value);
-        }
-
-        /// <summary>
-        /// Getter of the Icon
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static RadialControllerMenuKnownIcon GetIcon(DependencyObject obj)
-        {
-            return (RadialControllerMenuKnownIcon)obj.GetValue(IconProperty);
-        }
-
-        /// <summary>
-        /// Setter of the Icon
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetIcon(DependencyObject obj, RadialControllerMenuKnownIcon value)
-        {
-            obj.SetValue(IconProperty, value);
-        }
-
-        /// <summary>
-        /// Setter of the Haptic Feedback property
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static bool GetEnableHapticFeedback(DependencyObject obj)
-        {
-            return (bool)obj.GetValue(EnableHapticFeedbackProperty);
-        }
-
-        /// <summary>
-        /// Getter of the Haptic Feedback property
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetEnableHapticFeedback(DependencyObject obj, bool value)
-        {
-            obj.SetValue(EnableHapticFeedbackProperty, value);
-        }
-
-        /// <summary>
-        /// Getter of the Force Menu Item flag
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <returns>Return value of property</returns>
-        public static bool GetForceMenuItem(DependencyObject obj)
-        {
-            return (bool)obj?.GetValue(ForceMenuItemProperty);
-        }
-
-        /// <summary>
-        /// Setter of the Force Menu Item flag
-        /// </summary>
-        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="value">The value to set the property to.</param>
-        public static void SetForceMenuItem(DependencyObject obj, bool value)
-        {
-            obj.SetValue(ForceMenuItemProperty, value);
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this attached proeprty is supported
-        /// </summary>
-        public static bool IsSupported
-        {
-            get
-            {
-                if (!ApiInformation.IsTypePresent("Windows.UI.Input.RadialController"))
-                {
-                    return false;
-                }
-
-                if (!RadialController.IsSupported())
-                {
-                    return false;
-                }
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// The Surface Dial controller instance itself
-        /// </summary>
-        private static RadialController _controller;
-
-        /// <summary>
-        /// A default menu item that will be used for this to function. It will automatically be cleaned up when you move away from the TextBox, and created on Focus.
-        /// </summary>
-        private static RadialControllerMenuItem _stepTextMenuItem;
-
-        /// <summary>
-        /// The textbox itself needed to refernece the current TextBox that is being modified
-        /// </summary>
-        private static TextBox _textBox;
-
-        /// <summary>
-        /// Gets or sets the controller for the Surface Dial. The RadialController can be set from your app logic in case you use Surface Dial in other custom cases than on a TextBox.
-        /// This helper class will do everything for you, but if you want to control the Menu Items and/or wish to use the same Surface Dial insta
-        /// This is the property for the static controller so you can access it if needed.
-        /// </summary>
-        public static RadialController Controller
-        {
-            get
-            {
-                return _controller;
-            }
-
-            set
-            {
-                _controller = value;
-            }
-        }
-
-        /// <summary>
-        /// This function gets called every time there is a rotational change on the connected Surface Dial while a Surface Dial enabled TextBox is in focus.
-        /// This function ensures that the TextBox stays within the set range between MinValue and MaxValue while rotating the Surface Dial.
-        /// It defaults the content of the TextBox to 0.0 if a non-numerical value is detected.
-        /// </summary>
-        /// <param name="sender">The RadialController being used.</param>
-        /// <param name="args">The arguments of the changed event.</param>
-        private static void Controller_RotationChanged(RadialController sender, RadialControllerRotationChangedEventArgs args)
-        {
-            if (_textBox == null)
-            {
-                return;
-            }
-
-            string t = _textBox.Text;
-            double nr;
-
-            if (double.TryParse(t, out nr))
-            {
-                nr += args.RotationDeltaInDegrees * GetStepValue(_textBox);
-                if (GetEnableMinMaxValue(_textBox))
-                {
-                    if (nr < GetMinValue(_textBox))
-                    {
-                        nr = GetMinValue(_textBox);
-                    }
-
-                    if (nr > GetMaxValue(_textBox))
-                    {
-                        nr = GetMaxValue(_textBox);
-                    }
-                }
-            }
-            else
-            {
-                // default to zero if content is not a number
-                nr = 0.0d;
-            }
-
-            _textBox.Text = nr.ToString("0.00");
-        }
-
-        /// <summary>
-        /// Sets up the events needed for the current TextBox so it can trigger on GotFocus and LostFocus
-        /// </summary>
-        /// <param name="d">The Depenency Object we are dealing with, like a TextBox.</param>
-        /// <param name="e">The arguments of the changed event.</param>
-        private static void StepValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (!IsSupported)
-            {
-                return;
-            }
-
-            var textBox = d as TextBox;
-
-            if (textBox == null)
-            {
-                return;
-            }
-
-            textBox.GotFocus -= TextBox_GotFocus;
-            textBox.LostFocus -= TextBox_LostFocus;
-            textBox.GotFocus += TextBox_GotFocus;
-            textBox.LostFocus += TextBox_LostFocus;
-        }
-
-        /// <summary>
-        /// When the focus of the TextBox is lost, ensure we clean up the events and Surface Dial menu item.
-        /// </summary>
-        /// <param name="sender">The TextBox in being affected.</param>
-        /// <param name="e">The event arguments.</param>
-        private static void TextBox_LostFocus(object sender, RoutedEventArgs e)
-        {
-            if (_textBox == null)
-            {
-                return;
-            }
-
-            if (GetForceMenuItem(_textBox))
-            {
-                _controller.Menu.Items.Remove(_stepTextMenuItem);
-            }
-
-            _controller.RotationChanged -= Controller_RotationChanged;
-            if (GetEnableTapToNextControl(_textBox))
-            {
-                _controller.ButtonClicked -= Controller_ButtonClicked;
-            }
-
-            _textBox = null;
-        }
-
-        /// <summary>
-        /// When a Surface Dial TextBox gets focus, ensure the proper events are setup, and connect the Surface Dial itself.
-        /// </summary>
-        /// <param name="sender">The TextBox in being affected.</param>
-        /// <param name="e">The event arguments.</param>
-        private static void TextBox_GotFocus(object sender, RoutedEventArgs e)
-        {
-            _textBox = sender as TextBox;
-
-            if (_textBox == null)
-            {
-                return;
-            }
-
-            if (!IsSupported)
-            {
-                return;
-            }
-
-            _controller = _controller ?? RadialController.CreateForCurrentView();
-
-            if (GetForceMenuItem(_textBox))
-            {
-                _stepTextMenuItem = RadialControllerMenuItem.CreateFromKnownIcon("Step Text Box", GetIcon(_textBox));
-                _controller.Menu.Items.Add(_stepTextMenuItem);
-                _controller.Menu.SelectMenuItem(_stepTextMenuItem);
-            }
-
-            _controller.UseAutomaticHapticFeedback = GetEnableHapticFeedback(_textBox);
-            _controller.RotationResolutionInDegrees = 1;
-            _controller.RotationChanged += Controller_RotationChanged;
-            if (GetEnableTapToNextControl(_textBox))
-            {
-                _controller.ButtonClicked += Controller_ButtonClicked;
-            }
-        }
-
-        /// <summary>
-        /// If the TapToNext flag is enabled, this function will try to take the focus to the next focusable element.
-        /// </summary>
-        /// <param name="sender">The RadialController being used.</param>
-        /// <param name="args">The arguments of the changed event.</param>
-        private static void Controller_ButtonClicked(RadialController sender, RadialControllerButtonClickedEventArgs args)
-        {
-            FocusManager.TryMoveFocus(FocusNavigationDirection.Next);
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.cs
index 6e03ce38022..e04f8b4b303 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.cs
@@ -11,11 +11,6 @@
 // ******************************************************************
 
 using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -23,380 +18,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// TextBox mask property allows a user to more easily enter fixed width text in TextBox control
     /// where you would like them to enter the data in a certain format
     /// </summary>
-    public partial class TextBoxMask
+    [Obsolete("Use Microsoft.Toolkit.Uwp.UI.Extensions.TextBoxMask")]
+    public class TextBoxMask : Microsoft.Toolkit.Uwp.UI.Extensions.TextBoxMask
     {
-        private const string DefaultPlaceHolder = "_";
-        private static readonly KeyValuePair<char, string> AlphaCharacterRepresentation = new KeyValuePair<char, string>('a', "[A-Za-z]");
-        private static readonly KeyValuePair<char, string> NumericCharacterRepresentation = new KeyValuePair<char, string>('9', "[0-9]");
-        private static readonly KeyValuePair<char, string> AlphaNumericRepresentation = new KeyValuePair<char, string>('*', "[A-Za-z0-9]");
-
-        private static void InitTextBoxMask(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var textbox = d as TextBox;
-
-            if (textbox == null)
-            {
-                return;
-            }
-
-            textbox.SelectionChanged -= Textbox_SelectionChanged;
-            textbox.TextChanging -= Textbox_TextChanging;
-            textbox.Paste -= Textbox_Paste;
-            textbox.Loaded -= Textbox_Loaded;
-            textbox.GotFocus -= Textbox_GotFocus;
-            textbox.Loaded += Textbox_Loaded;
-        }
-
-        private static void Textbox_Loaded(object sender, RoutedEventArgs e)
-        {
-            var textbox = (TextBox)sender;
-
-            // incase no value is provided us it as normal textbox
-            var mask = textbox.GetValue(MaskProperty) as string;
-            if (string.IsNullOrWhiteSpace(mask))
-            {
-                return;
-            }
-
-            var placeHolderValue = textbox.GetValue(PlaceHolderProperty) as string;
-            if (string.IsNullOrEmpty(placeHolderValue))
-            {
-                throw new ArgumentException("PlaceHolder can't be null or empty");
-            }
-
-            var placeHolder = placeHolderValue[0];
-
-            var representationDictionary = new Dictionary<char, string>();
-            representationDictionary.Add(AlphaCharacterRepresentation.Key, AlphaCharacterRepresentation.Value);
-            representationDictionary.Add(NumericCharacterRepresentation.Key, NumericCharacterRepresentation.Value);
-            representationDictionary.Add(AlphaNumericRepresentation.Key, AlphaNumericRepresentation.Value);
-
-            var customDictionaryValue = textbox.GetValue(CustomMaskProperty) as string;
-            if (!string.IsNullOrWhiteSpace(customDictionaryValue))
-            {
-                var customRoles = customDictionaryValue.Split(',');
-                foreach (var role in customRoles)
-                {
-                    var roleValues = role.Split(':');
-                    if (roleValues.Length != 2)
-                    {
-                        throw new ArgumentException("Invalid CustomMask property");
-                    }
-
-                    var keyValue = roleValues[0];
-                    var value = roleValues[1];
-                    char key;
-
-                    // an exception should be throw if the regex is not valid
-                    Regex.Match(string.Empty, value);
-                    if (!char.TryParse(keyValue, out key))
-                    {
-                        throw new ArgumentException("Invalid CustomMask property, please validate the mask key");
-                    }
-
-                    representationDictionary.Add(key, value);
-                }
-            }
-
-            textbox.SetValue(RepresentationDictionaryProperty, representationDictionary);
-
-            var displayText = mask;
-            foreach (var key in representationDictionary.Keys)
-            {
-                displayText = displayText.Replace(key, placeHolder);
-            }
-
-            if (string.IsNullOrEmpty(textbox.Text))
-            {
-                textbox.Text = displayText;
-            }
-            else
-            {
-                var textboxInitialValue = textbox.Text;
-                textbox.Text = displayText;
-                int oldSelectionStart = (int)textbox.GetValue(OldSelectionStartProperty);
-                SetTextBoxValue(textboxInitialValue, textbox, mask, representationDictionary, placeHolder, oldSelectionStart);
-            }
-
-            textbox.TextChanging += Textbox_TextChanging;
-            textbox.SelectionChanged += Textbox_SelectionChanged;
-            textbox.Paste += Textbox_Paste;
-            textbox.GotFocus += Textbox_GotFocus;
-            textbox.SetValue(OldTextProperty, textbox.Text);
-            textbox.SetValue(DefaultDisplayTextProperty, displayText);
-            textbox.SelectionStart = 0;
-        }
-
-        private static void Textbox_GotFocus(object sender, RoutedEventArgs e)
-        {
-            var textbox = (TextBox)sender;
-            var mask = textbox?.GetValue(MaskProperty) as string;
-            var placeHolderValue = textbox?.GetValue(PlaceHolderProperty) as string;
-            var representationDictionary = textbox?.GetValue(RepresentationDictionaryProperty) as Dictionary<char, string>;
-            if (string.IsNullOrWhiteSpace(mask) ||
-                representationDictionary == null ||
-                string.IsNullOrEmpty(placeHolderValue))
-            {
-                return;
-            }
-
-            var placeHolder = placeHolderValue[0];
-
-            // if the textbox got focus and the textbox is empty (contains only mask) set the textbox cursor at the beginning to simulate normal TextBox behavior if it is empty.
-            // if the textbox has value set the cursor to the first empty mask character
-            var textboxText = textbox.Text;
-            for (int i = 0; i < textboxText.Length; i++)
-            {
-                if (placeHolder == textboxText[i])
-                {
-                    textbox.SelectionStart = i;
-                    break;
-                }
-            }
-        }
-
-        private static async void Textbox_Paste(object sender, TextControlPasteEventArgs e)
-        {
-            e.Handled = true;
-            DataPackageView dataPackageView = Clipboard.GetContent();
-            if (!dataPackageView.Contains(StandardDataFormats.Text))
-            {
-                return;
-            }
-
-            var pasteText = await dataPackageView.GetTextAsync();
-            if (string.IsNullOrWhiteSpace(pasteText))
-            {
-                return;
-            }
-
-            var textbox = (TextBox)sender;
-            var mask = textbox.GetValue(MaskProperty) as string;
-            var representationDictionary = textbox?.GetValue(RepresentationDictionaryProperty) as Dictionary<char, string>;
-            var placeHolderValue = textbox.GetValue(PlaceHolderProperty) as string;
-            if (string.IsNullOrWhiteSpace(mask) ||
-            representationDictionary == null ||
-            string.IsNullOrEmpty(placeHolderValue))
-            {
-                return;
-            }
-
-            // to update the textbox text without triggering TextChanging text
-            int oldSelectionStart = (int)textbox.GetValue(OldSelectionStartProperty);
-            textbox.TextChanging -= Textbox_TextChanging;
-            SetTextBoxValue(pasteText, textbox, mask, representationDictionary, placeHolderValue[0], oldSelectionStart);
-            textbox.SetValue(OldTextProperty, textbox.Text);
-            textbox.TextChanging += Textbox_TextChanging;
-        }
-
-        private static void SetTextBoxValue(
-            string newValue,
-            TextBox textbox,
-            string mask,
-            Dictionary<char, string> representationDictionary,
-            char placeholder,
-            int oldSelectionStart)
-        {
-            var maxLength = (newValue.Length + oldSelectionStart) < mask.Length ? (newValue.Length + oldSelectionStart) : mask.Length;
-            var textArray = textbox.Text.ToCharArray();
-
-            for (int i = oldSelectionStart; i < maxLength; i++)
-            {
-                var maskChar = mask[i];
-                var selectedChar = newValue[i - oldSelectionStart];
-
-                // If dynamic character a,9,* or custom
-                if (representationDictionary.ContainsKey(maskChar))
-                {
-                    var pattern = representationDictionary[maskChar];
-                    if (Regex.IsMatch(selectedChar.ToString(), pattern))
-                    {
-                        textArray[i] = selectedChar;
-                    }
-                    else
-                    {
-                        textArray[i] = placeholder;
-                    }
-                }
-            }
-
-            textbox.Text = new string(textArray);
-            textbox.SelectionStart = maxLength;
-        }
-
-        private static void Textbox_SelectionChanged(object sender, RoutedEventArgs e)
-        {
-            var textbox = (TextBox)sender;
-            textbox.SetValue(OldSelectionStartProperty, textbox.SelectionStart);
-            textbox.SetValue(OldSelectionLengthProperty, textbox.SelectionLength);
-        }
-
-        private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEventArgs args)
-        {
-            var mask = textbox.GetValue(MaskProperty) as string;
-            var representationDictionary = textbox.GetValue(RepresentationDictionaryProperty) as Dictionary<char, string>;
-            var placeHolderValue = textbox?.GetValue(PlaceHolderProperty) as string;
-            var oldText = textbox.GetValue(OldTextProperty) as string;
-            var oldSelectionStart = (int)textbox.GetValue(OldSelectionStartProperty);
-            var oldSelectionLength = (int)textbox.GetValue(OldSelectionLengthProperty);
-            if (string.IsNullOrWhiteSpace(mask) ||
-                representationDictionary == null ||
-                string.IsNullOrEmpty(placeHolderValue) ||
-                oldText == null)
-            {
-                return;
-            }
-
-            var placeHolder = placeHolderValue[0];
-            var isDeleteOrBackspace = false;
-            var deleteBackspaceIndex = 0;
-
-            // Delete or backspace is triggered
-            // if the new length is less than or equal the old text - the old selection length then a delete or backspace is triggered with or without selection and no characters is added
-            if (textbox.Text.Length < oldText.Length
-                && textbox.Text.Length <= oldText.Length - oldSelectionLength)
-            {
-                isDeleteOrBackspace = true;
-                if (oldSelectionLength == 0)
-                {
-                    // backspace else delete
-                    if (oldSelectionStart != textbox.SelectionStart)
-                    {
-                        deleteBackspaceIndex++;
-                    }
-                }
-            }
-
-            // case adding data at the end of the textbox
-            if (oldSelectionStart >= oldText.Length && !isDeleteOrBackspace)
-            {
-                textbox.Text = oldText;
-                if (oldText.Length >= 0)
-                {
-                    textbox.SelectionStart = oldText.Length;
-                }
-
-                return;
-            }
-
-            var textArray = oldText.ToCharArray();
-
-            // detect if backspace or delete is triggered to handle the right removed character
-            var newSelectionIndex = oldSelectionStart - deleteBackspaceIndex;
-
-            // check if single selection
-            var isSingleSelection = oldSelectionLength != 0 && oldSelectionLength != 1;
-
-            // for handling single key click add +1 to match length for selection = 1
-            var singleOrMultiSelectionIndex = oldSelectionLength == 0 ? oldSelectionLength + 1 : oldSelectionLength;
-
-            // Case change due to Text property is assigned a value (Ex Textbox.Text="value")
-            if (textbox.SelectionStart == 0 && textbox.FocusState == FocusState.Unfocused)
-            {
-                var displayText = textbox.GetValue(DefaultDisplayTextProperty) as string ?? string.Empty;
-                if (string.IsNullOrEmpty(textbox.Text))
-                {
-                    textbox.Text = displayText;
-                }
-                else
-                {
-                    var textboxInitialValue = textbox.Text;
-                    textbox.Text = displayText;
-                    SetTextBoxValue(textboxInitialValue, textbox, mask, representationDictionary, placeHolderValue[0], 0);
-                    textbox.SetValue(OldTextProperty, textbox.Text);
-                    return;
-                }
-            }
-
-            if (!isDeleteOrBackspace)
-            {
-                // Case change happended due to user input
-                var selectedChar = textbox.SelectionStart > 0 ?
-                                    textbox.Text[textbox.SelectionStart - 1] :
-                                    placeHolder;
-
-                var maskChar = mask[newSelectionIndex];
-
-                // If dynamic character a,9,* or custom
-                if (representationDictionary.ContainsKey(maskChar))
-                {
-                    var pattern = representationDictionary[maskChar];
-                    if (Regex.IsMatch(selectedChar.ToString(), pattern))
-                    {
-                        textArray[newSelectionIndex] = selectedChar;
-
-                        // updating text box new index
-                        newSelectionIndex++;
-                    }
-
-                    // character doesn't match the pattern get the old character
-                    else
-                    {
-                        // if single press don't change
-                        if (oldSelectionLength == 0)
-                        {
-                            textArray[newSelectionIndex] = oldText[newSelectionIndex];
-                        }
-
-                        // if change in selection reset to default place holder instead of keeping the old valid to be clear for the user
-                        else
-                        {
-                            textArray[newSelectionIndex] = placeHolder;
-                        }
-                    }
-                }
-
-                // if fixed character
-                else
-                {
-                    textArray[newSelectionIndex] = oldText[newSelectionIndex];
-
-                    // updating text box new index
-                    newSelectionIndex++;
-                }
-            }
-
-            if (isSingleSelection || isDeleteOrBackspace)
-            {
-                for (int i = newSelectionIndex;
-                    i < (oldSelectionStart - deleteBackspaceIndex + singleOrMultiSelectionIndex);
-                    i++)
-                {
-                    var maskChar = mask[i];
-
-                    // If dynamic character a,9,* or custom
-                    if (representationDictionary.ContainsKey(maskChar))
-                    {
-                        textArray[i] = placeHolder;
-                    }
-
-                    // if fixed character
-                    else
-                    {
-                        textArray[i] = oldText[i];
-                    }
-                }
-            }
-
-            textbox.Text = new string(textArray);
-            textbox.SetValue(OldTextProperty, textbox.Text);
-            textbox.SelectionStart = isDeleteOrBackspace ? newSelectionIndex : GetSelectionStart(mask, newSelectionIndex, representationDictionary);
-        }
-
-        private static int GetSelectionStart(string mask, int selectionIndex, Dictionary<char, string> representationDictionary)
-        {
-            for (int i = selectionIndex; i < mask.Length; i++)
-            {
-                var maskChar = mask[i];
-
-                // If dynamic character a,9,* or custom
-                if (representationDictionary.ContainsKey(maskChar))
-                {
-                    return i;
-                }
-            }
-
-            return selectionIndex;
-        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegEx/TextBoxRegex.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegEx/TextBoxRegex.cs
new file mode 100644
index 00000000000..d74af710ea2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegEx/TextBoxRegex.cs
@@ -0,0 +1,24 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// TextBoxRegex allows text validation using a regular expression.
+    /// </summary>
+    [Obsolete("Use Microsoft.Toolkit.Uwp.UI.Extensions.TextBoxRegex")]
+    public class TextBoxRegex : Microsoft.Toolkit.Uwp.UI.Extensions.TextBoxRegex
+    {
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
index 1643a195163..cf546a6ff8f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs
@@ -12,7 +12,7 @@
 
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is recieved a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
index 6e12c58a9ab..cd88652e7dc 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs
@@ -15,7 +15,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel
+namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
     /// <summary>
     /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is recieved a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls.
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ApplicationView.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ApplicationView/ApplicationView.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI/Extensions/ApplicationView.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/ApplicationView/ApplicationView.cs
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/Hyperlink.Properties.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/Hyperlink.Properties.cs
new file mode 100644
index 00000000000..ec7c5d5abd0
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/Hyperlink.Properties.cs
@@ -0,0 +1,74 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System.Windows.Input;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> content element that allows
+    /// it to invoke a <see cref="ICommand"/> when clicked
+    /// </summary>
+    public partial class Hyperlink
+    {
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for binding an <see cref="ICommand"/> instance to a <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// </summary>
+        public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached("Command", typeof(ICommand), typeof(Hyperlink), new PropertyMetadata(null, OnCommandPropertyChanged));
+
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for binding a command parameter to a <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// </summary>
+        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached("CommandParameter", typeof(object), typeof(Hyperlink), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> from which to get the associated <see cref="ICommand"/> instance</param>
+        /// <returns>The <see cref="ICommand"/> instance associated with the the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
+        public static ICommand GetCommand(Windows.UI.Xaml.Documents.Hyperlink obj)
+        {
+            return (ICommand)obj.GetValue(CommandProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> to associated the <see cref="ICommand"/> instance to</param>
+        /// <param name="value">The <see cref="ICommand"/> instance to bind to the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/></param>
+        public static void SetCommand(Windows.UI.Xaml.Documents.Hyperlink obj, ICommand value)
+        {
+            obj.SetValue(CommandProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="CommandProperty"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> from which to get the associated <see cref="CommandProperty"/> value</param>
+        /// <returns>The <see cref="CommandProperty"/> value associated with the the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> or null</returns>
+        public static object GetCommandParameter(Windows.UI.Xaml.Documents.Hyperlink obj)
+        {
+            return obj.GetValue(CommandParameterProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="CommandProperty"/> assocaited with the specified <see cref="Windows.UI.Xaml.Documents.Hyperlink"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> to associated the <see cref="CommandProperty"/> instance to</param>
+        /// <param name="value">The <see cref="object"/> to set the <see cref="CommandProperty"/> to</param>
+        public static void SetCommandParameter(Windows.UI.Xaml.Documents.Hyperlink obj, object value)
+        {
+            obj.SetValue(CommandParameterProperty, value);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/Hyperlink.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/Hyperlink.cs
new file mode 100644
index 00000000000..4f488dbeca4
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/Hyperlink.cs
@@ -0,0 +1,49 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System.Windows.Input;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> content element that allows
+    /// it to invoke a <see cref="ICommand"/> when clicked
+    /// </summary>
+    public partial class Hyperlink
+    {
+        private static void OnCommandPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            Windows.UI.Xaml.Documents.Hyperlink hyperlink = sender as Windows.UI.Xaml.Documents.Hyperlink;
+
+            if (hyperlink != null)
+            {
+                hyperlink.Click -= OnHyperlinkClicked;
+
+                ICommand command = args.NewValue as ICommand;
+
+                if (command != null)
+                {
+                    hyperlink.Click += OnHyperlinkClicked;
+                }
+            }
+        }
+
+        private static void OnHyperlinkClicked(Windows.UI.Xaml.Documents.Hyperlink sender, Windows.UI.Xaml.Documents.HyperlinkClickEventArgs args)
+        {
+            ICommand command = GetCommand(sender);
+            object parameter = GetCommandParameter(sender);
+
+            command?.Execute(parameter);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs
new file mode 100644
index 00000000000..c23c72101f5
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink/HyperlinkExtensions.cs
@@ -0,0 +1,26 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System;
+using System.Windows.Input;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Documents.Hyperlink"/> content element that allows
+    /// it to invoke a <see cref="ICommand"/> when clicked
+    /// </summary>
+    [Obsolete("Use Microsoft.Toolkit.Uwp.UI.Extensions.HyperLink")]
+    public class HyperlinkExtensions : Microsoft.Toolkit.Uwp.UI.Extensions.Hyperlink
+    {
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/HyperlinkExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/HyperlinkExtensions.cs
deleted file mode 100644
index 779620bcd85..00000000000
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/HyperlinkExtensions.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// ******************************************************************
-// Copyright (c) Microsoft. All rights reserved.
-// This code is licensed under the MIT License (MIT).
-// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
-// ******************************************************************
-
-using System.Windows.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Documents;
-
-namespace Microsoft.Toolkit.Uwp.UI
-{
-    /// <summary>
-    /// Provides attached dependency properties for the <see cref="Hyperlink"/> content element that allows
-    /// it to invoke a <see cref="ICommand"/> when clicked
-    /// </summary>
-    public static class HyperlinkExtensions
-    {
-        /// <summary>
-        /// Attached <see cref="DependencyProperty"/> for binding an <see cref="ICommand"/> instance to a <see cref="Hyperlink"/>
-        /// </summary>
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached(
-            "Command",
-            typeof(ICommand),
-            typeof(HyperlinkExtensions),
-            new PropertyMetadata(null, OnCommandPropertyChanged));
-
-        /// <summary>
-        /// Attached <see cref="DependencyProperty"/> for binding a command parameter to a <see cref="Hyperlink"/>
-        /// </summary>
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached(
-            "CommandParameter",
-            typeof(object),
-            typeof(HyperlinkExtensions),
-            new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Hyperlink"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="Hyperlink"/> from which to get the associated <see cref="ICommand"/> instance</param>
-        /// <returns>The <see cref="ICommand"/> instance associated with the the <see cref="Hyperlink"/> or null</returns>
-        public static ICommand GetCommand(Hyperlink obj)
-        {
-            return (ICommand)obj.GetValue(CommandProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Hyperlink"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="Hyperlink"/> to associated the <see cref="ICommand"/> instance to</param>
-        /// <param name="value">The <see cref="ICommand"/> instance to bind to the <see cref="Hyperlink"/></param>
-        public static void SetCommand(Hyperlink obj, ICommand value)
-        {
-            obj.SetValue(CommandProperty, value);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="CommandProperty"/> instance assocaited with the specified <see cref="Hyperlink"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="Hyperlink"/> from which to get the associated <see cref="CommandProperty"/> value</param>
-        /// <returns>The <see cref="CommandProperty"/> value associated with the the <see cref="Hyperlink"/> or null</returns>
-        public static object GetCommandParameter(Hyperlink obj)
-        {
-            return obj.GetValue(CommandParameterProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="CommandProperty"/> assocaited with the specified <see cref="Hyperlink"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="Hyperlink"/> to associated the <see cref="CommandProperty"/> instance to</param>
-        /// <param name="value">The <see cref="object"/> to set the <see cref="CommandProperty"/> to</param>
-        public static void SetCommandParameter(Hyperlink obj, object value)
-        {
-            obj.SetValue(CommandParameterProperty, value);
-        }
-
-        private static void OnCommandPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            Hyperlink hyperlink = sender as Hyperlink;
-
-            if (hyperlink != null)
-            {
-                hyperlink.Click -= OnHyperlinkClicked;
-
-                ICommand command = args.NewValue as ICommand;
-
-                if (command != null)
-                {
-                    hyperlink.Click += OnHyperlinkClicked;
-                }
-            }
-        }
-
-        private static void OnHyperlinkClicked(Hyperlink sender, HyperlinkClickEventArgs args)
-        {
-            ICommand command = GetCommand(sender);
-            object parameter = GetCommandParameter(sender);
-
-            command?.Execute(parameter);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.Data.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.Data.cs
new file mode 100644
index 00000000000..6eabc91933e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.Data.cs
@@ -0,0 +1,41 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+    /// </summary>
+    public partial class ListViewBase
+    {
+        /// <summary>
+        /// Stretch direction
+        /// </summary>
+        public enum StretchDirection
+        {
+            /// <summary>
+            /// Horizontal stretch
+            /// </summary>
+            Horizontal,
+
+            /// <summary>
+            /// Vertical stretch
+            /// </summary>
+            Vertical,
+
+            /// <summary>
+            /// Horizontal and Vertical stretch
+            /// </summary>
+            Both
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.Properties.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.Properties.cs
new file mode 100644
index 00000000000..0d0374214b7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.Properties.cs
@@ -0,0 +1,126 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System.Windows.Input;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+    /// </summary>
+    public partial class ListViewBase
+    {
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for binding an <see cref="ICommand"/> instance to a <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// This ICommand is executed when ListViewBase Item receives interaction by means of ItemClick. This requires IsItemClickEnabled to set to true.
+        /// The ICommand is passed the Item that received interaction as a parameter
+        /// </summary>
+        public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached("Command", typeof(ICommand), typeof(ListViewBase), new PropertyMetadata(null, OnCommandPropertyChanged));
+
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for binding a <see cref="Brush"/> as an alternate background color to a <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        public static readonly DependencyProperty AlternateColorProperty = DependencyProperty.RegisterAttached("AlternateColor", typeof(Brush), typeof(ListViewBase), new PropertyMetadata(null, OnAlternateColorPropertyChanged));
+
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for binding a <see cref="DataTemplate"/> as an alternate template to a <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        public static readonly DependencyProperty AlternateItemTemplateProperty = DependencyProperty.RegisterAttached("AlternateItemTemplate", typeof(DataTemplate), typeof(ListViewBase), new PropertyMetadata(null, OnAlternateItemTemplatePropertyChanged));
+
+        /// <summary>
+        /// Attached <see cref="DependencyProperty"/> for setting the container content stretch direction on the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        public static readonly DependencyProperty StretchItemContainerDirectionProperty = DependencyProperty.RegisterAttached("StretchItemContainerDirection", typeof(StretchDirection), typeof(ListViewBase), new PropertyMetadata(null, OnStretchItemContainerDirectionPropertyChanged));
+
+        /// <summary>
+        /// Gets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> from which to get the associated <see cref="ICommand"/> instance</param>
+        /// <returns>The <see cref="ICommand"/> instance associated with the the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> or null</returns>
+        public static ICommand GetCommand(DependencyObject obj)
+        {
+            return (ICommand)obj.GetValue(CommandProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="ICommand"/> instance assocaited with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to associated the <see cref="ICommand"/> instance to</param>
+        /// <param name="value">The <see cref="ICommand"/> instance to bind to the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></param>
+        public static void SetCommand(DependencyObject obj, ICommand value)
+        {
+            obj.SetValue(CommandProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the alternate <see cref="Brush"/> associated with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to get the associated <see cref="Brush"/> from</param>
+        /// <returns>The <see cref="Brush"/> associated with the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></returns>
+        public static Brush GetAlternateColor(Windows.UI.Xaml.Controls.ListViewBase obj)
+        {
+            return (Brush)obj.GetValue(AlternateColorProperty);
+        }
+
+        /// <summary>
+        /// Sets the alternate <see cref="Brush"/> associated with the specified <see cref="DependencyObject"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to associate the <see cref="Brush"/> with</param>
+        /// <param name="value">The <see cref="Brush"/> for binding to the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></param>
+        public static void SetAlternateColor(Windows.UI.Xaml.Controls.ListViewBase obj, Brush value)
+        {
+            obj.SetValue(AlternateColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="DataTemplate"/> associated with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to get the associated <see cref="DataTemplate"/> from</param>
+        /// <returns>The <see cref="DataTemplate"/> associated with the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></returns>
+        public static DataTemplate GetAlternateItemTemplate(Windows.UI.Xaml.Controls.ListViewBase obj)
+        {
+            return (DataTemplate)obj.GetValue(AlternateItemTemplateProperty);
+        }
+
+        /// <summary>
+        /// Sets the <see cref="DataTemplate"/> associated with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to associate the <see cref="DataTemplate"/> with</param>
+        /// <param name="value">The <see cref="DataTemplate"/> for binding to the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></param>
+        public static void SetAlternateItemTemplate(Windows.UI.Xaml.Controls.ListViewBase obj, DataTemplate value)
+        {
+            obj.SetValue(AlternateItemTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the stretch <see cref="StretchDirection"/> associated with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to get the associated <see cref="StretchDirection"/> from</param>
+        /// <returns>The <see cref="StretchDirection"/> associated with the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></returns>
+        public static StretchDirection GetStretchItemContainerDirection(Windows.UI.Xaml.Controls.ListViewBase obj)
+        {
+            return (StretchDirection)obj.GetValue(StretchItemContainerDirectionProperty);
+        }
+
+        /// <summary>
+        /// Sets the stretch <see cref="StretchDirection"/> associated with the specified <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+        /// </summary>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.ListViewBase"/> to associate the <see cref="StretchDirection"/> with</param>
+        /// <param name="value">The <see cref="StretchDirection"/> for binding to the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/></param>
+        public static void SetStretchItemContainerDirection(Windows.UI.Xaml.Controls.ListViewBase obj, StretchDirection value)
+        {
+            obj.SetValue(StretchItemContainerDirectionProperty, value);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.cs
new file mode 100644
index 00000000000..5d47df84270
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBase.cs
@@ -0,0 +1,155 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System.Windows.Input;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+    /// </summary>
+    public partial class ListViewBase
+    {
+        private static void OnCommandPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            Windows.UI.Xaml.Controls.ListViewBase listViewBase = sender as Windows.UI.Xaml.Controls.ListViewBase;
+
+            if (listViewBase != null)
+            {
+                listViewBase.ItemClick -= OnItemClicked;
+
+                ICommand command = args.NewValue as ICommand;
+
+                if (command != null)
+                {
+                    listViewBase.ItemClick += OnItemClicked;
+                }
+            }
+        }
+
+        private static void OnItemClicked(object sender, ItemClickEventArgs args)
+        {
+            Windows.UI.Xaml.Controls.ListViewBase listViewBase = sender as Windows.UI.Xaml.Controls.ListViewBase;
+
+            if (listViewBase == null)
+            {
+                return;
+            }
+
+            ICommand command = GetCommand(listViewBase);
+            if (command != null && command.CanExecute(args.ClickedItem))
+            {
+                command.Execute(args.ClickedItem);
+            }
+        }
+
+        private static void OnAlternateColorPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            Windows.UI.Xaml.Controls.ListViewBase listViewBase = sender as Windows.UI.Xaml.Controls.ListViewBase;
+
+            if (listViewBase == null)
+            {
+                return;
+            }
+
+            listViewBase.ContainerContentChanging -= ColorContainerContentChanging;
+
+            if (AlternateColorProperty != null)
+            {
+                listViewBase.ContainerContentChanging += ColorContainerContentChanging;
+            }
+        }
+
+        private static void ColorContainerContentChanging(Windows.UI.Xaml.Controls.ListViewBase sender, ContainerContentChangingEventArgs args)
+        {
+            var itemContainer = args.ItemContainer as SelectorItem;
+            var itemIndex = sender.IndexFromContainer(itemContainer);
+
+            if (itemIndex % 2 == 0)
+            {
+                itemContainer.Background = GetAlternateColor(sender);
+            }
+            else
+            {
+                itemContainer.Background = null;
+            }
+        }
+
+        private static void OnAlternateItemTemplatePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            Windows.UI.Xaml.Controls.ListViewBase listViewBase = sender as Windows.UI.Xaml.Controls.ListViewBase;
+
+            if (listViewBase == null)
+            {
+                return;
+            }
+
+            listViewBase.ContainerContentChanging -= ItemTemplateContainerContentChanging;
+
+            if (AlternateItemTemplateProperty != null)
+            {
+                listViewBase.ContainerContentChanging += ItemTemplateContainerContentChanging;
+            }
+        }
+
+        private static void ItemTemplateContainerContentChanging(Windows.UI.Xaml.Controls.ListViewBase sender, ContainerContentChangingEventArgs args)
+        {
+            var itemContainer = args.ItemContainer as SelectorItem;
+            var itemIndex = sender.IndexFromContainer(itemContainer);
+
+            if (itemIndex % 2 == 0)
+            {
+                itemContainer.ContentTemplate = GetAlternateItemTemplate(sender);
+            }
+            else
+            {
+                itemContainer.ContentTemplate = sender.ItemTemplate;
+            }
+        }
+
+        private static void OnStretchItemContainerDirectionPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            Windows.UI.Xaml.Controls.ListViewBase listViewBase = sender as Windows.UI.Xaml.Controls.ListViewBase;
+
+            if (listViewBase == null)
+            {
+                return;
+            }
+
+            listViewBase.ContainerContentChanging -= StretchItemContainerDirectionChanging;
+
+            if (StretchItemContainerDirectionProperty != null)
+            {
+                listViewBase.ContainerContentChanging += StretchItemContainerDirectionChanging;
+            }
+        }
+
+        private static void StretchItemContainerDirectionChanging(Windows.UI.Xaml.Controls.ListViewBase sender, ContainerContentChangingEventArgs args)
+        {
+            var itemContainer = args.ItemContainer as SelectorItem;
+            var stretchDirection = GetStretchItemContainerDirection(sender);
+
+            if (stretchDirection == StretchDirection.Vertical || stretchDirection == StretchDirection.Both)
+            {
+                itemContainer.VerticalContentAlignment = VerticalAlignment.Stretch;
+            }
+
+            if (stretchDirection == StretchDirection.Horizontal || stretchDirection == StretchDirection.Both)
+            {
+                itemContainer.HorizontalContentAlignment = HorizontalAlignment.Stretch;
+            }
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBaseExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBaseExtensions.cs
new file mode 100644
index 00000000000..770ca03a531
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewBaseExtensions.cs
@@ -0,0 +1,24 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
+    /// </summary>
+    [Obsolete("Use Microsoft.Toolkit.Uwp.UI.Extensions.ListViewBase")]
+    public class ListViewBaseExtensions : Microsoft.Toolkit.Uwp.UI.Extensions.ListViewBase
+    {
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBaseExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBaseExtensions.cs
deleted file mode 100644
index cf818df9c64..00000000000
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBaseExtensions.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-// ******************************************************************
-// Copyright (c) Microsoft. All rights reserved.
-// This code is licensed under the MIT License (MIT).
-// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
-// ******************************************************************
-
-using System.Windows.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Media;
-
-namespace Microsoft.Toolkit.Uwp.UI
-{
-    /// <summary>
-    /// Stretch direction
-    /// </summary>
-    public enum StretchDirection
-    {
-        /// <summary>
-        /// Horizontal stretch
-        /// </summary>
-        Horizontal,
-
-        /// <summary>
-        /// Vertical stretch
-        /// </summary>
-        Vertical,
-
-        /// <summary>
-        /// Horizontal and Vertical stretch
-        /// </summary>
-        All
-    }
-
-    /// <summary>
-    /// Provides attached dependency properties for the <see cref="ListViewBase"/>
-    /// </summary>
-    public static class ListViewBaseExtensions
-    {
-        /// <summary>
-        /// Attached <see cref="DependencyProperty"/> for binding an <see cref="ICommand"/> instance to a <see cref="ListViewBase"/>
-        /// This ICommand is executed when ListViewBase Item receives interaction by means of ItemClick. This requires IsItemClickEnabled to set to true.
-        /// The ICommand is passed the Item that received interaction as a parameter
-        /// </summary>
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached(
-            "Command",
-            typeof(ICommand),
-            typeof(ListViewBaseExtensions),
-            new PropertyMetadata(null, OnCommandPropertyChanged));
-
-        /// <summary>
-        /// Gets the <see cref="ICommand"/> instance assocaited with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> from which to get the associated <see cref="ICommand"/> instance</param>
-        /// <returns>The <see cref="ICommand"/> instance associated with the the <see cref="ListViewBase"/> or null</returns>
-        public static ICommand GetCommand(DependencyObject obj)
-        {
-            return (ICommand)obj.GetValue(CommandProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="ICommand"/> instance assocaited with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to associated the <see cref="ICommand"/> instance to</param>
-        /// <param name="value">The <see cref="ICommand"/> instance to bind to the <see cref="ListViewBase"/></param>
-        public static void SetCommand(DependencyObject obj, ICommand value)
-        {
-            obj.SetValue(CommandProperty, value);
-        }
-
-        private static void OnCommandPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            ListViewBase listViewBase = sender as ListViewBase;
-
-            if (listViewBase != null)
-            {
-                listViewBase.ItemClick -= OnItemClicked;
-
-                ICommand command = args.NewValue as ICommand;
-
-                if (command != null)
-                {
-                    listViewBase.ItemClick += OnItemClicked;
-                }
-            }
-        }
-
-        private static void OnItemClicked(object sender, ItemClickEventArgs args)
-        {
-            ListViewBase listViewBase = sender as ListViewBase;
-
-            if (listViewBase == null)
-            {
-                return;
-            }
-
-            ICommand command = GetCommand(listViewBase);
-            if (command != null && command.CanExecute(args.ClickedItem))
-            {
-                command.Execute(args.ClickedItem);
-            }
-        }
-
-        /// <summary>
-        /// Attached <see cref="DependencyProperty"/> for binding a <see cref="Brush"/> as an alternate background color to a <see cref="ListViewBase"/>
-        /// </summary>
-        public static readonly DependencyProperty AlternateColorProperty = DependencyProperty.RegisterAttached(
-            "AlternateColor",
-            typeof(Brush),
-            typeof(ListViewBaseExtensions),
-            new PropertyMetadata(null, OnAlternateColorPropertyChanged));
-
-        /// <summary>
-        /// Gets the alternate <see cref="Brush"/> associated with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to get the associated <see cref="Brush"/> from</param>
-        /// <returns>The <see cref="Brush"/> associated with the <see cref="ListViewBase"/></returns>
-        public static Brush GetAlternateColor(ListViewBase obj)
-        {
-            return (Brush)obj.GetValue(AlternateColorProperty);
-        }
-
-        /// <summary>
-        /// Sets the alternate <see cref="Brush"/> associated with the specified <see cref="DependencyObject"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to associate the <see cref="Brush"/> with</param>
-        /// <param name="value">The <see cref="Brush"/> for binding to the <see cref="ListViewBase"/></param>
-        public static void SetAlternateColor(ListViewBase obj, Brush value)
-        {
-            obj.SetValue(AlternateColorProperty, value);
-        }
-
-        private static void OnAlternateColorPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            ListViewBase listViewBase = sender as ListViewBase;
-
-            if (listViewBase == null)
-            {
-                return;
-            }
-
-            listViewBase.ContainerContentChanging -= ColorContainerContentChanging;
-
-            if (AlternateColorProperty != null)
-            {
-                listViewBase.ContainerContentChanging += ColorContainerContentChanging;
-            }
-        }
-
-        private static void ColorContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
-        {
-            var itemContainer = args.ItemContainer as SelectorItem;
-            var itemIndex = sender.IndexFromContainer(itemContainer);
-
-            if (itemIndex % 2 == 0)
-            {
-                itemContainer.Background = GetAlternateColor(sender);
-            }
-            else
-            {
-                itemContainer.Background = null;
-            }
-        }
-
-        /// <summary>
-        /// Attached <see cref="DependencyProperty"/> for binding a <see cref="DataTemplate"/> as an alternate template to a <see cref="ListViewBase"/>
-        /// </summary>
-        public static readonly DependencyProperty AlternateItemTemplateProperty = DependencyProperty.RegisterAttached(
-            "AlternateItemTemplate",
-            typeof(DataTemplate),
-            typeof(ListViewBaseExtensions),
-            new PropertyMetadata(null, OnAlternateItemTemplatePropertyChanged));
-
-        /// <summary>
-        /// Gets the <see cref="DataTemplate"/> associated with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to get the associated <see cref="DataTemplate"/> from</param>
-        /// <returns>The <see cref="DataTemplate"/> associated with the <see cref="ListViewBase"/></returns>
-        public static DataTemplate GetAlternateItemTemplate(ListViewBase obj)
-        {
-            return (DataTemplate)obj.GetValue(AlternateItemTemplateProperty);
-        }
-
-        /// <summary>
-        /// Sets the <see cref="DataTemplate"/> associated with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to associate the <see cref="DataTemplate"/> with</param>
-        /// <param name="value">The <see cref="DataTemplate"/> for binding to the <see cref="ListViewBase"/></param>
-        public static void SetAlternateItemTemplate(ListViewBase obj, DataTemplate value)
-        {
-            obj.SetValue(AlternateItemTemplateProperty, value);
-        }
-
-        private static void OnAlternateItemTemplatePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            ListViewBase listViewBase = sender as ListViewBase;
-
-            if (listViewBase == null)
-            {
-                return;
-            }
-
-            listViewBase.ContainerContentChanging -= ItemTemplateContainerContentChanging;
-
-            if (AlternateItemTemplateProperty != null)
-            {
-                listViewBase.ContainerContentChanging += ItemTemplateContainerContentChanging;
-            }
-        }
-
-        private static void ItemTemplateContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
-        {
-            var itemContainer = args.ItemContainer as SelectorItem;
-            var itemIndex = sender.IndexFromContainer(itemContainer);
-
-            if (itemIndex % 2 == 0)
-            {
-                itemContainer.ContentTemplate = GetAlternateItemTemplate(sender);
-            }
-            else
-            {
-                itemContainer.ContentTemplate = sender.ItemTemplate;
-            }
-        }
-
-        /// <summary>
-        /// Attached <see cref="DependencyProperty"/> for setting the container content stretch direction on the <see cref="ListViewBase"/>
-        /// </summary>
-        public static readonly DependencyProperty StretchItemContainerDirectionProperty = DependencyProperty.RegisterAttached(
-            "StretchItemContainerDirection",
-            typeof(StretchDirection),
-            typeof(ListViewBaseExtensions),
-            new PropertyMetadata(null, OnStretchItemContainerDirectionPropertyChanged));
-
-        /// <summary>
-        /// Gets the stretch <see cref="StretchDirection"/> associated with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to get the associated <see cref="StretchDirection"/> from</param>
-        /// <returns>The <see cref="StretchDirection"/> associated with the <see cref="ListViewBase"/></returns>
-        public static StretchDirection GetStretchItemContainerDirection(ListViewBase obj)
-        {
-            return (StretchDirection)obj.GetValue(StretchItemContainerDirectionProperty);
-        }
-
-        /// <summary>
-        /// Sets the stretch <see cref="StretchDirection"/> associated with the specified <see cref="ListViewBase"/>
-        /// </summary>
-        /// <param name="obj">The <see cref="ListViewBase"/> to associate the <see cref="StretchDirection"/> with</param>
-        /// <param name="value">The <see cref="StretchDirection"/> for binding to the <see cref="ListViewBase"/></param>
-        public static void SetStretchItemContainerDirection(ListViewBase obj, StretchDirection value)
-        {
-            obj.SetValue(StretchItemContainerDirectionProperty, value);
-        }
-
-        private static void OnStretchItemContainerDirectionPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
-        {
-            ListViewBase listViewBase = sender as ListViewBase;
-
-            if (listViewBase == null)
-            {
-                return;
-            }
-
-            listViewBase.ContainerContentChanging -= StretchItemContainerDirectionChanging;
-
-            if (StretchItemContainerDirectionProperty != null)
-            {
-                listViewBase.ContainerContentChanging += StretchItemContainerDirectionChanging;
-            }
-        }
-
-        private static void StretchItemContainerDirectionChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
-        {
-            var itemContainer = args.ItemContainer as SelectorItem;
-            var stretchDirection = GetStretchItemContainerDirection(sender);
-
-            if (stretchDirection == StretchDirection.Vertical || stretchDirection == StretchDirection.All)
-            {
-                itemContainer.VerticalContentAlignment = VerticalAlignment.Stretch;
-            }
-
-            if (stretchDirection == StretchDirection.Horizontal || stretchDirection == StretchDirection.All)
-            {
-                itemContainer.HorizontalContentAlignment = HorizontalAlignment.Stretch;
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar/StatusBar.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/StatusBar/StatusBar.cs
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
new file mode 100644
index 00000000000..8bd857517cd
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox/SurfaceDialTextbox.cs
@@ -0,0 +1,428 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using Windows.Foundation.Metadata;
+using Windows.UI.Input;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Helper class that provides attached properties to enable any TextBox with the Surface Dial. Rotate to change the value by StepValue between MinValue and MaxValue, and tap to go to the Next focus element from a TextBox
+    /// </summary>
+    public class SurfaceDialTextbox
+    {
+       /// <summary>
+        /// If you provide the Controller yourself, set this to true so you won't add new menu items.
+        /// </summary>
+        public static readonly DependencyProperty ForceMenuItemProperty =
+            DependencyProperty.RegisterAttached("ForceMenuItem", typeof(bool), typeof(SurfaceDialTextbox), new PropertyMetadata(false));
+
+        /// <summary>
+        /// Set the default icon of the menu item that gets added. A user will most likely not see this. Defaults to the Ruler icon.
+        /// </summary>
+        public static readonly DependencyProperty IconProperty =
+            DependencyProperty.RegisterAttached("Icon", typeof(RadialControllerMenuKnownIcon), typeof(SurfaceDialTextbox), new PropertyMetadata(RadialControllerMenuKnownIcon.Ruler));
+
+        /// <summary>
+        /// The amount the TextBox will be modified for each rotation step on the Surface Dial. This can be any double value.
+        /// </summary>
+        public static readonly DependencyProperty StepValueProperty =
+            DependencyProperty.RegisterAttached("StepValue", typeof(double), typeof(SurfaceDialTextbox), new PropertyMetadata(0d, new PropertyChangedCallback(StepValueChanged)));
+
+        /// <summary>
+        /// A flag to enable or disable haptic feedback when rotating the dial for the give TextBox. This is enabled by default.
+        /// </summary>
+        public static readonly DependencyProperty EnableHapticFeedbackProperty =
+            DependencyProperty.RegisterAttached("EnableHapticFeedback", typeof(bool), typeof(SurfaceDialTextbox), new PropertyMetadata(true));
+
+        /// <summary>
+        /// Sets the minimum value the TextBox can have when modifying it using a Surface Dial. Default is -100.0
+        /// </summary>
+        public static readonly DependencyProperty MinValueProperty =
+            DependencyProperty.RegisterAttached("MinValue", typeof(double), typeof(SurfaceDialTextbox), new PropertyMetadata(-100d));
+
+        /// <summary>
+        /// Sets the maxium value the TextBox can have when modifying it using a Surface Dial. Default is 100.0
+        /// </summary>
+        public static readonly DependencyProperty MaxValueProperty =
+            DependencyProperty.RegisterAttached("MaxValue", typeof(double), typeof(SurfaceDialTextbox), new PropertyMetadata(100d));
+
+        /// <summary>
+        /// TapToNext is a feature you can set to automatically try to focus the next focusable element from the Surface Dial enabled TextBox. This is on dy default.
+        /// </summary>
+        public static readonly DependencyProperty EnableTapToNextControlProperty =
+            DependencyProperty.RegisterAttached("EnableTapToNextControl", typeof(bool), typeof(SurfaceDialTextbox), new PropertyMetadata(true));
+
+        /// <summary>
+        /// EnableMinMax limits the value in the textbox to your spesificed Min and Max values, see the other properties.
+        /// </summary>
+        public static readonly DependencyProperty EnableMinMaxValueProperty =
+            DependencyProperty.RegisterAttached("EnableMinMaxValue", typeof(bool), typeof(SurfaceDialTextbox), new PropertyMetadata(false));
+
+        /// <summary>
+        /// Getter of the EnableMinMax property
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static bool GetEnableMinMaxValue(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(EnableMinMaxValueProperty);
+        }
+
+        /// <summary>
+        /// Setter of the EnableMinMax property
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetEnableMinMaxValue(DependencyObject obj, bool value)
+        {
+            obj.SetValue(EnableMinMaxValueProperty, value);
+        }
+
+        /// <summary>
+        /// Getter of the TapToNext flag.
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static bool GetEnableTapToNextControl(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(EnableTapToNextControlProperty);
+        }
+
+        /// <summary>
+        /// Setter of the TapToNext flag.
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetEnableTapToNextControl(DependencyObject obj, bool value)
+        {
+            obj.SetValue(EnableTapToNextControlProperty, value);
+        }
+
+        /// <summary>
+        /// Getter of the MaxValue
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static double GetMaxValue(DependencyObject obj)
+        {
+            return (double)obj.GetValue(MaxValueProperty);
+        }
+
+        /// <summary>
+        /// Setter of the MaxValue
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetMaxValue(DependencyObject obj, double value)
+        {
+            obj.SetValue(MaxValueProperty, value);
+        }
+
+        /// <summary>
+        /// Getter of the MinValue
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static double GetMinValue(DependencyObject obj)
+        {
+            return (double)obj.GetValue(MinValueProperty);
+        }
+
+        /// <summary>
+        /// Setter of the MinValue
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetMinValue(DependencyObject obj, double value)
+        {
+            obj.SetValue(MinValueProperty, value);
+        }
+
+        /// <summary>
+        /// Setter of the StepValue.
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static double GetStepValue(DependencyObject obj)
+        {
+            return (double)obj.GetValue(StepValueProperty);
+        }
+
+        /// <summary>
+        /// Getter of the StepValue
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetStepValue(DependencyObject obj, double value)
+        {
+            obj.SetValue(StepValueProperty, value);
+        }
+
+        /// <summary>
+        /// Getter of the Icon
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static RadialControllerMenuKnownIcon GetIcon(DependencyObject obj)
+        {
+            return (RadialControllerMenuKnownIcon)obj.GetValue(IconProperty);
+        }
+
+        /// <summary>
+        /// Setter of the Icon
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetIcon(DependencyObject obj, RadialControllerMenuKnownIcon value)
+        {
+            obj.SetValue(IconProperty, value);
+        }
+
+        /// <summary>
+        /// Setter of the Haptic Feedback property
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static bool GetEnableHapticFeedback(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(EnableHapticFeedbackProperty);
+        }
+
+        /// <summary>
+        /// Getter of the Haptic Feedback property
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetEnableHapticFeedback(DependencyObject obj, bool value)
+        {
+            obj.SetValue(EnableHapticFeedbackProperty, value);
+        }
+
+        /// <summary>
+        /// Getter of the Force Menu Item flag
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <returns>Return value of property</returns>
+        public static bool GetForceMenuItem(DependencyObject obj)
+        {
+            return (bool)obj?.GetValue(ForceMenuItemProperty);
+        }
+
+        /// <summary>
+        /// Setter of the Force Menu Item flag
+        /// </summary>
+        /// <param name="obj">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="value">The value to set the property to.</param>
+        public static void SetForceMenuItem(DependencyObject obj, bool value)
+        {
+            obj.SetValue(ForceMenuItemProperty, value);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this attached proeprty is supported
+        /// </summary>
+        public static bool IsSupported
+        {
+            get
+            {
+                if (!ApiInformation.IsTypePresent("Windows.UI.Input.RadialController"))
+                {
+                    return false;
+                }
+
+                if (!RadialController.IsSupported())
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// The Surface Dial controller instance itself
+        /// </summary>
+        private static RadialController _controller;
+
+        /// <summary>
+        /// A default menu item that will be used for this to function. It will automatically be cleaned up when you move away from the TextBox, and created on Focus.
+        /// </summary>
+        private static RadialControllerMenuItem _stepTextMenuItem;
+
+        /// <summary>
+        /// The textbox itself needed to refernece the current TextBox that is being modified
+        /// </summary>
+        private static TextBox _textBox;
+
+        /// <summary>
+        /// Gets or sets the controller for the Surface Dial. The RadialController can be set from your app logic in case you use Surface Dial in other custom cases than on a TextBox.
+        /// This helper class will do everything for you, but if you want to control the Menu Items and/or wish to use the same Surface Dial insta
+        /// This is the property for the static controller so you can access it if needed.
+        /// </summary>
+        public static RadialController Controller
+        {
+            get
+            {
+                return _controller;
+            }
+
+            set
+            {
+                _controller = value;
+            }
+        }
+
+        /// <summary>
+        /// This function gets called every time there is a rotational change on the connected Surface Dial while a Surface Dial enabled TextBox is in focus.
+        /// This function ensures that the TextBox stays within the set range between MinValue and MaxValue while rotating the Surface Dial.
+        /// It defaults the content of the TextBox to 0.0 if a non-numerical value is detected.
+        /// </summary>
+        /// <param name="sender">The RadialController being used.</param>
+        /// <param name="args">The arguments of the changed event.</param>
+        private static void Controller_RotationChanged(RadialController sender, RadialControllerRotationChangedEventArgs args)
+        {
+            if (_textBox == null)
+            {
+                return;
+            }
+
+            string t = _textBox.Text;
+            double nr;
+
+            if (double.TryParse(t, out nr))
+            {
+                nr += args.RotationDeltaInDegrees * GetStepValue(_textBox);
+                if (GetEnableMinMaxValue(_textBox))
+                {
+                    if (nr < GetMinValue(_textBox))
+                    {
+                        nr = GetMinValue(_textBox);
+                    }
+
+                    if (nr > GetMaxValue(_textBox))
+                    {
+                        nr = GetMaxValue(_textBox);
+                    }
+                }
+            }
+            else
+            {
+                // default to zero if content is not a number
+                nr = 0.0d;
+            }
+
+            _textBox.Text = nr.ToString("0.00");
+        }
+
+        /// <summary>
+        /// Sets up the events needed for the current TextBox so it can trigger on GotFocus and LostFocus
+        /// </summary>
+        /// <param name="d">The Depenency Object we are dealing with, like a TextBox.</param>
+        /// <param name="e">The arguments of the changed event.</param>
+        private static void StepValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (!IsSupported)
+            {
+                return;
+            }
+
+            var textBox = d as TextBox;
+
+            if (textBox == null)
+            {
+                return;
+            }
+
+            textBox.GotFocus -= TextBox_GotFocus;
+            textBox.LostFocus -= TextBox_LostFocus;
+            textBox.GotFocus += TextBox_GotFocus;
+            textBox.LostFocus += TextBox_LostFocus;
+        }
+
+        /// <summary>
+        /// When the focus of the TextBox is lost, ensure we clean up the events and Surface Dial menu item.
+        /// </summary>
+        /// <param name="sender">The TextBox in being affected.</param>
+        /// <param name="e">The event arguments.</param>
+        private static void TextBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            if (_textBox == null)
+            {
+                return;
+            }
+
+            if (GetForceMenuItem(_textBox))
+            {
+                _controller.Menu.Items.Remove(_stepTextMenuItem);
+            }
+
+            _controller.RotationChanged -= Controller_RotationChanged;
+            if (GetEnableTapToNextControl(_textBox))
+            {
+                _controller.ButtonClicked -= Controller_ButtonClicked;
+            }
+
+            _textBox = null;
+        }
+
+        /// <summary>
+        /// When a Surface Dial TextBox gets focus, ensure the proper events are setup, and connect the Surface Dial itself.
+        /// </summary>
+        /// <param name="sender">The TextBox in being affected.</param>
+        /// <param name="e">The event arguments.</param>
+        private static void TextBox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            _textBox = sender as TextBox;
+
+            if (_textBox == null)
+            {
+                return;
+            }
+
+            if (!IsSupported)
+            {
+                return;
+            }
+
+            _controller = _controller ?? RadialController.CreateForCurrentView();
+
+            if (GetForceMenuItem(_textBox))
+            {
+                _stepTextMenuItem = RadialControllerMenuItem.CreateFromKnownIcon("Step Text Box", GetIcon(_textBox));
+                _controller.Menu.Items.Add(_stepTextMenuItem);
+                _controller.Menu.SelectMenuItem(_stepTextMenuItem);
+            }
+
+            _controller.UseAutomaticHapticFeedback = GetEnableHapticFeedback(_textBox);
+            _controller.RotationResolutionInDegrees = 1;
+            _controller.RotationChanged += Controller_RotationChanged;
+            if (GetEnableTapToNextControl(_textBox))
+            {
+                _controller.ButtonClicked += Controller_ButtonClicked;
+            }
+        }
+
+        /// <summary>
+        /// If the TapToNext flag is enabled, this function will try to take the focus to the next focusable element.
+        /// </summary>
+        /// <param name="sender">The RadialController being used.</param>
+        /// <param name="args">The arguments of the changed event.</param>
+        private static void Controller_ButtonClicked(RadialController sender, RadialControllerButtonClickedEventArgs args)
+        {
+            FocusManager.TryMoveFocus(FocusNavigationDirection.Next);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.Properties.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.Properties.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.Properties.cs
index 21dcc8a0d50..0eaecf40a42 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMask.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.Properties.cs
@@ -12,8 +12,9 @@
 
 using System.Collections.Generic;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
     /// TextBox mask property allows a user to more easily enter fixed width text in TextBox control
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
new file mode 100644
index 00000000000..c9acecfabee
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs
@@ -0,0 +1,402 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// TextBox mask property allows a user to more easily enter fixed width text in TextBox control
+    /// where you would like them to enter the data in a certain format
+    /// </summary>
+    public partial class TextBoxMask
+    {
+        private const string DefaultPlaceHolder = "_";
+        private static readonly KeyValuePair<char, string> AlphaCharacterRepresentation = new KeyValuePair<char, string>('a', "[A-Za-z]");
+        private static readonly KeyValuePair<char, string> NumericCharacterRepresentation = new KeyValuePair<char, string>('9', "[0-9]");
+        private static readonly KeyValuePair<char, string> AlphaNumericRepresentation = new KeyValuePair<char, string>('*', "[A-Za-z0-9]");
+
+        private static void InitTextBoxMask(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var textbox = d as TextBox;
+
+            if (textbox == null)
+            {
+                return;
+            }
+
+            textbox.SelectionChanged -= Textbox_SelectionChanged;
+            textbox.TextChanging -= Textbox_TextChanging;
+            textbox.Paste -= Textbox_Paste;
+            textbox.Loaded -= Textbox_Loaded;
+            textbox.GotFocus -= Textbox_GotFocus;
+            textbox.Loaded += Textbox_Loaded;
+        }
+
+        private static void Textbox_Loaded(object sender, RoutedEventArgs e)
+        {
+            var textbox = (TextBox)sender;
+
+            // incase no value is provided us it as normal textbox
+            var mask = textbox.GetValue(MaskProperty) as string;
+            if (string.IsNullOrWhiteSpace(mask))
+            {
+                return;
+            }
+
+            var placeHolderValue = textbox.GetValue(PlaceHolderProperty) as string;
+            if (string.IsNullOrEmpty(placeHolderValue))
+            {
+                throw new ArgumentException("PlaceHolder can't be null or empty");
+            }
+
+            var placeHolder = placeHolderValue[0];
+
+            var representationDictionary = new Dictionary<char, string>();
+            representationDictionary.Add(AlphaCharacterRepresentation.Key, AlphaCharacterRepresentation.Value);
+            representationDictionary.Add(NumericCharacterRepresentation.Key, NumericCharacterRepresentation.Value);
+            representationDictionary.Add(AlphaNumericRepresentation.Key, AlphaNumericRepresentation.Value);
+
+            var customDictionaryValue = textbox.GetValue(CustomMaskProperty) as string;
+            if (!string.IsNullOrWhiteSpace(customDictionaryValue))
+            {
+                var customRoles = customDictionaryValue.Split(',');
+                foreach (var role in customRoles)
+                {
+                    var roleValues = role.Split(':');
+                    if (roleValues.Length != 2)
+                    {
+                        throw new ArgumentException("Invalid CustomMask property");
+                    }
+
+                    var keyValue = roleValues[0];
+                    var value = roleValues[1];
+                    char key;
+
+                    // an exception should be throw if the regex is not valid
+                    Regex.Match(string.Empty, value);
+                    if (!char.TryParse(keyValue, out key))
+                    {
+                        throw new ArgumentException("Invalid CustomMask property, please validate the mask key");
+                    }
+
+                    representationDictionary.Add(key, value);
+                }
+            }
+
+            textbox.SetValue(RepresentationDictionaryProperty, representationDictionary);
+
+            var displayText = mask;
+            foreach (var key in representationDictionary.Keys)
+            {
+                displayText = displayText.Replace(key, placeHolder);
+            }
+
+            if (string.IsNullOrEmpty(textbox.Text))
+            {
+                textbox.Text = displayText;
+            }
+            else
+            {
+                var textboxInitialValue = textbox.Text;
+                textbox.Text = displayText;
+                int oldSelectionStart = (int)textbox.GetValue(OldSelectionStartProperty);
+                SetTextBoxValue(textboxInitialValue, textbox, mask, representationDictionary, placeHolder, oldSelectionStart);
+            }
+
+            textbox.TextChanging += Textbox_TextChanging;
+            textbox.SelectionChanged += Textbox_SelectionChanged;
+            textbox.Paste += Textbox_Paste;
+            textbox.GotFocus += Textbox_GotFocus;
+            textbox.SetValue(OldTextProperty, textbox.Text);
+            textbox.SetValue(DefaultDisplayTextProperty, displayText);
+            textbox.SelectionStart = 0;
+        }
+
+        private static void Textbox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            var textbox = (TextBox)sender;
+            var mask = textbox?.GetValue(MaskProperty) as string;
+            var placeHolderValue = textbox?.GetValue(PlaceHolderProperty) as string;
+            var representationDictionary = textbox?.GetValue(RepresentationDictionaryProperty) as Dictionary<char, string>;
+            if (string.IsNullOrWhiteSpace(mask) ||
+                representationDictionary == null ||
+                string.IsNullOrEmpty(placeHolderValue))
+            {
+                return;
+            }
+
+            var placeHolder = placeHolderValue[0];
+
+            // if the textbox got focus and the textbox is empty (contains only mask) set the textbox cursor at the beginning to simulate normal TextBox behavior if it is empty.
+            // if the textbox has value set the cursor to the first empty mask character
+            var textboxText = textbox.Text;
+            for (int i = 0; i < textboxText.Length; i++)
+            {
+                if (placeHolder == textboxText[i])
+                {
+                    textbox.SelectionStart = i;
+                    break;
+                }
+            }
+        }
+
+        private static async void Textbox_Paste(object sender, TextControlPasteEventArgs e)
+        {
+            e.Handled = true;
+            DataPackageView dataPackageView = Clipboard.GetContent();
+            if (!dataPackageView.Contains(StandardDataFormats.Text))
+            {
+                return;
+            }
+
+            var pasteText = await dataPackageView.GetTextAsync();
+            if (string.IsNullOrWhiteSpace(pasteText))
+            {
+                return;
+            }
+
+            var textbox = (TextBox)sender;
+            var mask = textbox.GetValue(MaskProperty) as string;
+            var representationDictionary = textbox?.GetValue(RepresentationDictionaryProperty) as Dictionary<char, string>;
+            var placeHolderValue = textbox.GetValue(PlaceHolderProperty) as string;
+            if (string.IsNullOrWhiteSpace(mask) ||
+            representationDictionary == null ||
+            string.IsNullOrEmpty(placeHolderValue))
+            {
+                return;
+            }
+
+            // to update the textbox text without triggering TextChanging text
+            int oldSelectionStart = (int)textbox.GetValue(OldSelectionStartProperty);
+            textbox.TextChanging -= Textbox_TextChanging;
+            SetTextBoxValue(pasteText, textbox, mask, representationDictionary, placeHolderValue[0], oldSelectionStart);
+            textbox.SetValue(OldTextProperty, textbox.Text);
+            textbox.TextChanging += Textbox_TextChanging;
+        }
+
+        private static void SetTextBoxValue(
+            string newValue,
+            TextBox textbox,
+            string mask,
+            Dictionary<char, string> representationDictionary,
+            char placeholder,
+            int oldSelectionStart)
+        {
+            var maxLength = (newValue.Length + oldSelectionStart) < mask.Length ? (newValue.Length + oldSelectionStart) : mask.Length;
+            var textArray = textbox.Text.ToCharArray();
+
+            for (int i = oldSelectionStart; i < maxLength; i++)
+            {
+                var maskChar = mask[i];
+                var selectedChar = newValue[i - oldSelectionStart];
+
+                // If dynamic character a,9,* or custom
+                if (representationDictionary.ContainsKey(maskChar))
+                {
+                    var pattern = representationDictionary[maskChar];
+                    if (Regex.IsMatch(selectedChar.ToString(), pattern))
+                    {
+                        textArray[i] = selectedChar;
+                    }
+                    else
+                    {
+                        textArray[i] = placeholder;
+                    }
+                }
+            }
+
+            textbox.Text = new string(textArray);
+            textbox.SelectionStart = maxLength;
+        }
+
+        private static void Textbox_SelectionChanged(object sender, RoutedEventArgs e)
+        {
+            var textbox = (TextBox)sender;
+            textbox.SetValue(OldSelectionStartProperty, textbox.SelectionStart);
+            textbox.SetValue(OldSelectionLengthProperty, textbox.SelectionLength);
+        }
+
+        private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEventArgs args)
+        {
+            var mask = textbox.GetValue(MaskProperty) as string;
+            var representationDictionary = textbox.GetValue(RepresentationDictionaryProperty) as Dictionary<char, string>;
+            var placeHolderValue = textbox?.GetValue(PlaceHolderProperty) as string;
+            var oldText = textbox.GetValue(OldTextProperty) as string;
+            var oldSelectionStart = (int)textbox.GetValue(OldSelectionStartProperty);
+            var oldSelectionLength = (int)textbox.GetValue(OldSelectionLengthProperty);
+            if (string.IsNullOrWhiteSpace(mask) ||
+                representationDictionary == null ||
+                string.IsNullOrEmpty(placeHolderValue) ||
+                oldText == null)
+            {
+                return;
+            }
+
+            var placeHolder = placeHolderValue[0];
+            var isDeleteOrBackspace = false;
+            var deleteBackspaceIndex = 0;
+
+            // Delete or backspace is triggered
+            // if the new length is less than or equal the old text - the old selection length then a delete or backspace is triggered with or without selection and no characters is added
+            if (textbox.Text.Length < oldText.Length
+                && textbox.Text.Length <= oldText.Length - oldSelectionLength)
+            {
+                isDeleteOrBackspace = true;
+                if (oldSelectionLength == 0)
+                {
+                    // backspace else delete
+                    if (oldSelectionStart != textbox.SelectionStart)
+                    {
+                        deleteBackspaceIndex++;
+                    }
+                }
+            }
+
+            // case adding data at the end of the textbox
+            if (oldSelectionStart >= oldText.Length && !isDeleteOrBackspace)
+            {
+                textbox.Text = oldText;
+                if (oldText.Length >= 0)
+                {
+                    textbox.SelectionStart = oldText.Length;
+                }
+
+                return;
+            }
+
+            var textArray = oldText.ToCharArray();
+
+            // detect if backspace or delete is triggered to handle the right removed character
+            var newSelectionIndex = oldSelectionStart - deleteBackspaceIndex;
+
+            // check if single selection
+            var isSingleSelection = oldSelectionLength != 0 && oldSelectionLength != 1;
+
+            // for handling single key click add +1 to match length for selection = 1
+            var singleOrMultiSelectionIndex = oldSelectionLength == 0 ? oldSelectionLength + 1 : oldSelectionLength;
+
+            // Case change due to Text property is assigned a value (Ex Textbox.Text="value")
+            if (textbox.SelectionStart == 0 && textbox.FocusState == FocusState.Unfocused)
+            {
+                var displayText = textbox.GetValue(DefaultDisplayTextProperty) as string ?? string.Empty;
+                if (string.IsNullOrEmpty(textbox.Text))
+                {
+                    textbox.Text = displayText;
+                }
+                else
+                {
+                    var textboxInitialValue = textbox.Text;
+                    textbox.Text = displayText;
+                    SetTextBoxValue(textboxInitialValue, textbox, mask, representationDictionary, placeHolderValue[0], 0);
+                    textbox.SetValue(OldTextProperty, textbox.Text);
+                    return;
+                }
+            }
+
+            if (!isDeleteOrBackspace)
+            {
+                // Case change happended due to user input
+                var selectedChar = textbox.SelectionStart > 0 ?
+                                    textbox.Text[textbox.SelectionStart - 1] :
+                                    placeHolder;
+
+                var maskChar = mask[newSelectionIndex];
+
+                // If dynamic character a,9,* or custom
+                if (representationDictionary.ContainsKey(maskChar))
+                {
+                    var pattern = representationDictionary[maskChar];
+                    if (Regex.IsMatch(selectedChar.ToString(), pattern))
+                    {
+                        textArray[newSelectionIndex] = selectedChar;
+
+                        // updating text box new index
+                        newSelectionIndex++;
+                    }
+
+                    // character doesn't match the pattern get the old character
+                    else
+                    {
+                        // if single press don't change
+                        if (oldSelectionLength == 0)
+                        {
+                            textArray[newSelectionIndex] = oldText[newSelectionIndex];
+                        }
+
+                        // if change in selection reset to default place holder instead of keeping the old valid to be clear for the user
+                        else
+                        {
+                            textArray[newSelectionIndex] = placeHolder;
+                        }
+                    }
+                }
+
+                // if fixed character
+                else
+                {
+                    textArray[newSelectionIndex] = oldText[newSelectionIndex];
+
+                    // updating text box new index
+                    newSelectionIndex++;
+                }
+            }
+
+            if (isSingleSelection || isDeleteOrBackspace)
+            {
+                for (int i = newSelectionIndex;
+                    i < (oldSelectionStart - deleteBackspaceIndex + singleOrMultiSelectionIndex);
+                    i++)
+                {
+                    var maskChar = mask[i];
+
+                    // If dynamic character a,9,* or custom
+                    if (representationDictionary.ContainsKey(maskChar))
+                    {
+                        textArray[i] = placeHolder;
+                    }
+
+                    // if fixed character
+                    else
+                    {
+                        textArray[i] = oldText[i];
+                    }
+                }
+            }
+
+            textbox.Text = new string(textArray);
+            textbox.SetValue(OldTextProperty, textbox.Text);
+            textbox.SelectionStart = isDeleteOrBackspace ? newSelectionIndex : GetSelectionStart(mask, newSelectionIndex, representationDictionary);
+        }
+
+        private static int GetSelectionStart(string mask, int selectionIndex, Dictionary<char, string> representationDictionary)
+        {
+            for (int i = selectionIndex; i < mask.Length; i++)
+            {
+                var maskChar = mask[i];
+
+                // If dynamic character a,9,* or custom
+                if (representationDictionary.ContainsKey(maskChar))
+                {
+                    return i;
+                }
+            }
+
+            return selectionIndex;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.Data.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.Data.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.Data.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.Data.cs
index 97ea82a4b86..fea7a1c8c04 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.Data.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.Data.cs
@@ -10,7 +10,7 @@
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
     /// TextBoxRegex allows text validation using a regular expression.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.Properties.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.Properties.cs
similarity index 99%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.Properties.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.Properties.cs
index ba6fb3922ec..d170c14e68a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.Properties.cs
@@ -13,7 +13,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
     /// TextBoxRegex allows text validation using a regular expression.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs
similarity index 98%
rename from Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs
index e49eeff153e..d9761b872d8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegex.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx/TextBoxRegex.cs
@@ -10,13 +10,12 @@
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 
-using System;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI.Controls
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
     /// TextBoxRegex allows text validation using a regular expression.
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar/TitleBar.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/TitleBar/TitleBar.cs
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/WebViewExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebView.Properties.cs
similarity index 55%
rename from Microsoft.Toolkit.Uwp.UI/Extensions/WebViewExtensions.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebView.Properties.cs
index 34e3b69ff06..ec889365d7e 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/WebViewExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebView.Properties.cs
@@ -12,37 +12,28 @@
 
 using System;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.UI
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
-    /// Provides attached dependency properties for the <see cref="WebView"/> that allows attaching HTML string content/>.
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Controls.WebView"/> that allows attaching HTML string content/>.
     /// </summary>
-    public static class WebViewExtensions
+    public partial class WebView
     {
         /// <summary>
         /// Using a DependencyProperty as the backing store for HTML content. This enables binding html string content.
         /// </summary>
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.RegisterAttached(
-            "Content",
-            typeof(string),
-            typeof(WebViewExtensions),
-            new PropertyMetadata(string.Empty, OnContentChanged));
+        public static readonly DependencyProperty ContentProperty = DependencyProperty.RegisterAttached("Content", typeof(string), typeof(WebView), new PropertyMetadata(string.Empty, OnContentChanged));
 
         /// <summary>
         /// Using a DependencyProperty as the backing store for Content Uri.  This binding Content Uri.
         /// </summary>
-        public static readonly DependencyProperty ContentUriProperty = DependencyProperty.RegisterAttached(
-            "ContentUri",
-            typeof(Uri),
-            typeof(WebViewExtensions),
-            new PropertyMetadata(null, OnContentUriChanged));
+        public static readonly DependencyProperty ContentUriProperty = DependencyProperty.RegisterAttached("ContentUri", typeof(Uri), typeof(WebView), new PropertyMetadata(null, OnContentUriChanged));
 
         /// <summary>
-        /// Gets Content associated with the <see cref="WebView"/>
+        /// Gets Content associated with the <see cref="Windows.UI.Xaml.Controls.WebView"/>
         /// </summary>
-        /// <param name="obj">The <see cref="WebView"/> that has the content</param>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.WebView"/> that has the content</param>
         /// <returns>HTML content</returns>
         public static string GetContent(DependencyObject obj)
         {
@@ -50,9 +41,9 @@ public static string GetContent(DependencyObject obj)
         }
 
         /// <summary>
-        /// Sets HTML from the <see cref="WebView"/>
+        /// Sets HTML from the <see cref="Windows.UI.Xaml.Controls.WebView"/>
         /// </summary>
-        /// <param name="obj">The <see cref="WebView"/> that content is being set to.</param>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.WebView"/> that content is being set to.</param>
         /// <param name="value">HTML content</param>
         public static void SetContent(DependencyObject obj, string value)
         {
@@ -60,9 +51,9 @@ public static void SetContent(DependencyObject obj, string value)
         }
 
         /// <summary>
-        /// Gets Uri source associated with the <see cref="WebView"/>
+        /// Gets Uri source associated with the <see cref="Windows.UI.Xaml.Controls.WebView"/>
         /// </summary>
-        /// <param name="obj">The <see cref="WebView"/> that has the content uri.</param>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.WebView"/> that has the content uri.</param>
         /// <returns>HTML content</returns>
         public static Uri GetContentUri(DependencyObject obj)
         {
@@ -70,41 +61,13 @@ public static Uri GetContentUri(DependencyObject obj)
         }
 
         /// <summary>
-        /// Sets HTML from the <see cref="WebView"/>
+        /// Sets HTML from the <see cref="Windows.UI.Xaml.Controls.WebView"/>
         /// </summary>
-        /// <param name="obj">The <see cref="WebView"/> that content uri is being set to.</param>
+        /// <param name="obj">The <see cref="Windows.UI.Xaml.Controls.WebView"/> that content uri is being set to.</param>
         /// <param name="value">HTML content</param>
         public static void SetContentUri(DependencyObject obj, Uri value)
         {
             obj.SetValue(ContentUriProperty, value);
         }
-
-        private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            WebView wv = d as WebView;
-
-            var content = e.NewValue as string;
-
-            if (string.IsNullOrEmpty(content))
-            {
-                return;
-            }
-
-            wv?.NavigateToString(content);
-        }
-
-        private static void OnContentUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            WebView wv = d as WebView;
-
-            var uri = e.NewValue as Uri;
-
-            if (uri == null)
-            {
-                return;
-            }
-
-            wv?.Navigate(uri);
-        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebView.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebView.cs
new file mode 100644
index 00000000000..d762f9ca251
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebView.cs
@@ -0,0 +1,51 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System;
+using Windows.UI.Xaml;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Provides attached dependency properties for the <see cref="Windows.UI.Xaml.Controls.WebView"/> that allows attaching HTML string content/>.
+    /// </summary>
+    public partial class WebView
+    {
+        private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            Windows.UI.Xaml.Controls.WebView wv = d as Windows.UI.Xaml.Controls.WebView;
+
+            var content = e.NewValue as string;
+
+            if (string.IsNullOrEmpty(content))
+            {
+                return;
+            }
+
+            wv?.NavigateToString(content);
+        }
+
+        private static void OnContentUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            Windows.UI.Xaml.Controls.WebView wv = d as Windows.UI.Xaml.Controls.WebView;
+
+            var uri = e.NewValue as Uri;
+
+            if (uri == null)
+            {
+                return;
+            }
+
+            wv?.Navigate(uri);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebViewExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebViewExtensions.cs
new file mode 100644
index 00000000000..ac64445c1ba
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/WebView/WebViewExtensions.cs
@@ -0,0 +1,21 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+using System;
+
+namespace Microsoft.Toolkit.Uwp.UI
+{
+    [Obsolete("Use Microsoft.Toolkit.Uwp.UI.Extensions.WebView instead")]
+    public class WebViewExtensions : Microsoft.Toolkit.Uwp.UI.Extensions.WebView
+    {
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
index 5f0b663c6ab..34131c991e9 100644
--- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
+++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Microsoft.Toolkit.Uwp.UI</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -45,6 +45,10 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <Compile Include="Extensions\Hyperlink\Hyperlink.Properties.cs" />
+    <Compile Include="Extensions\Hyperlink\Hyperlink.cs" />
+    <Compile Include="Extensions\ListViewBase\ListViewBaseExtensions.cs" />
+    <Compile Include="Extensions\ListViewBase\ListViewBase.Data.cs" />
     <None Include="Microsoft.Toolkit.Uwp.UI.ruleset" />
     <None Include="project.json" />
   </ItemGroup>
@@ -71,15 +75,24 @@
     <Compile Include="Converters\EmptyStringToObjectConverter.cs" />
     <Compile Include="Converters\FormatStringConverter.cs" />
     <Compile Include="Converters\ResourceNameToResourceStringConverter.cs" />
-    <Compile Include="Extensions\ListViewBaseExtensions.cs" />
-    <Compile Include="Extensions\HyperlinkExtensions.cs" />
+    <Compile Include="Extensions\ListViewBase\ListViewBase.cs" />
+    <Compile Include="Extensions\Hyperlink\HyperlinkExtensions.cs" />
     <Compile Include="Converters\StringVisibilityConverter.cs" />
     <Compile Include="Converters\StringFormatConverter.cs" />
-    <Compile Include="Extensions\ApplicationView.cs" />
-    <Compile Include="Extensions\TitleBar.cs" />
-    <Compile Include="Extensions\StatusBar.cs" />
+    <Compile Include="Extensions\ApplicationView\ApplicationView.cs" />
+    <Compile Include="Extensions\ListViewBase\ListViewBase.Properties.cs" />
+    <Compile Include="Extensions\SurfaceDialTextbox\SurfaceDialTextbox.cs" />
+    <Compile Include="Extensions\TextBoxMask\TextBoxMask.cs" />
+    <Compile Include="Extensions\TextBoxMask\TextBoxMask.Properties.cs" />
+    <Compile Include="Extensions\TextBoxRegEx\TextBoxRegex.cs" />
+    <Compile Include="Extensions\TextBoxRegEx\TextBoxRegex.Data.cs" />
+    <Compile Include="Extensions\TextBoxRegEx\TextBoxRegex.Properties.cs" />
+    <Compile Include="Extensions\TitleBar\TitleBar.cs" />
+    <Compile Include="Extensions\StatusBar\StatusBar.cs" />
     <Compile Include="Extensions\VisualTreeExtensions.cs" />
-    <Compile Include="Extensions\WebViewExtensions.cs" />
+    <Compile Include="Extensions\WebView\WebView.Properties.cs" />
+    <Compile Include="Extensions\WebView\WebView.cs" />
+    <Compile Include="Extensions\WebView\WebViewExtensions.cs" />
     <Compile Include="Helpers\BindableValueHolder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -94,13 +107,14 @@
     <EmbeddedResource Include="Properties\Microsoft.Windows.Toolkit.UI.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsDesktop, Version=10.0.10586.0">
+    <SDKReference Include="WindowsDesktop, Version=10.0.14393.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
-    <SDKReference Include="WindowsMobile, Version=10.0.10586.0">
+    <SDKReference Include="WindowsMobile, Version=10.0.14393.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/docs/extensions/Hyperlink.md b/docs/extensions/Hyperlink.md
new file mode 100644
index 00000000000..b88f08b30cf
--- /dev/null
+++ b/docs/extensions/Hyperlink.md
@@ -0,0 +1,27 @@
+# Hyperlink
+
+The **Hyperlink** allows for a Hyperlink element to invoke the execute method on a bound [ICommand](https://msdn.microsoft.com/en-us/library/system.windows.input.icommand.aspx) instance when clicked.
+
+## Example
+
+```xml
+	// Use Hyperlink in a wrapped TextBlock with text either side and ensure it executes a command when
+	// clicked passing the current data context as the command parameter.
+	<TextBlock>
+	    <Run>Some leading text with a</Run>
+	     <Hyperlink extensions:Hyperlink.Command="{Binding HyperlinkClicked}"
+			        extensions:Hyperlink.CommandParameter="{Binding}">hyperlink</Hyperlink>
+	    <Run>in the middle.</Run>
+	</TextBlock>
+```
+
+## Requirements (Windows 10 Device Family)
+
+| [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
+| --- | --- |
+| Namespace | Microsoft.Toolkit.Uwp.Extensions |
+
+## API
+
+* [Hyperlink source code](https://github.com/Microsoft/UWPCommunityToolkit/blob/dev/Microsoft.Toolkit.Uwp.UI/Extensions/Hyperlink)
+
diff --git a/docs/helpers/ListViewBaseExtensions.md b/docs/extensions/ListViewBase.md
similarity index 74%
rename from docs/helpers/ListViewBaseExtensions.md
rename to docs/extensions/ListViewBase.md
index d9c7dea43f6..9349c377ed0 100644
--- a/docs/helpers/ListViewBaseExtensions.md
+++ b/docs/extensions/ListViewBase.md
@@ -1,12 +1,12 @@
-# ListViewBaseExtensions class
+# ListViewBase class
 
-ListViewBaseExtensions provides a lightweight way to extend every control that inherits the <a href="https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.listviewbase" target="_blank">ListViewBase</a> class with attached properties.
+ListViewBase provides a lightweight way to extend every control that inherits the <a href="https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.listviewbase" target="_blank">ListViewBase</a> class with attached properties.
 
 <br/>
 
 ##### Command
 
-ListViewBaseExtensions provides extension method that allow attaching ICommand to handle ListViewBase Item interaction by means of [ItemClick](https://msdn.microsoft.com/en-us/library/windows/apps/windows.ui.xaml.controls.listviewbase.itemclick.aspx) event. 
+ListViewBase provides extension method that allow attaching ICommand to handle ListViewBase Item interaction by means of [ItemClick](https://msdn.microsoft.com/en-us/library/windows/apps/windows.ui.xaml.controls.listviewbase.itemclick.aspx) event. 
 ListViewBase [IsItemClickEnabled](https://msdn.microsoft.com/en-us/library/windows/apps/windows.ui.xaml.controls.listviewbase.isitemclickenabled.aspx) must be set to **true**
 
 
@@ -17,7 +17,7 @@ ListViewBase [IsItemClickEnabled](https://msdn.microsoft.com/en-us/library/windo
     // Attach the command declared in MainViewModel to ListView declared in XAML
     // IsItemClickEnabled is set to true as shown below
     <ListView
-        ui:ListViewBaseExtensions.Command="{x:Bind MainViewModel.ItemSelectedCommand, Mode=OneWay}"
+        extensions:ListViewBase.Command="{x:Bind MainViewModel.ItemSelectedCommand, Mode=OneWay}"
         IsItemClickEnabled="True"
         ItemsSource="{x:Bind MainViewModel.Items, Mode=OneWay}"
         SelectionMode="None" />
@@ -35,7 +35,7 @@ The AlternateColor property provides a way to assign a background color to every
 
 ```xml
     <ListView
-        ui:ListViewBaseExtensions.AlternateColor="Silver"
+        extensions:ListViewBase.AlternateColor="Silver"
         ItemsSource="{x:Bind MainViewModel.Items, Mode=OneWay}" />
 ```
 
@@ -62,7 +62,7 @@ The AlternateItemTemplate property provides a way to assign an alternate <a href
 
     <ListView
         ItemTemplate="{StaticResource NormalTemplate}"
-        ui:ListViewBaseExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
+        extensions:ListViewBase.AlternateItemTemplate="{StaticResource AlternateTemplate}"
         ItemsSource="{x:Bind MainViewModel.Items, Mode=OneWay}" />
 ```
 
@@ -70,7 +70,7 @@ The AlternateItemTemplate property provides a way to assign an alternate <a href
 
 ##### StretchItemContainerDirection
 
-The StretchItemContainerDirection property provides a way to stretch the ItemContainer in horizontal, vertical or both ways. Possible values for this property are **Horizontal**, **Vertical** and **All**.
+The StretchItemContainerDirection property provides a way to stretch the ItemContainer in horizontal, vertical or both ways. Possible values for this property are **Horizontal**, **Vertical** and **Both**.
 
 > The <a href="https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.listviewbase#Windows_UI_Xaml_Controls_ListViewBase_ContainerContentChanging" target="_blank">ContainerContentChanging</a> event used for this extension to work, will not be raised when the ItemsPanel is replaced with another type of panel than ItemsStackPanel or ItemsWrapGrid. 
 
@@ -78,7 +78,7 @@ The StretchItemContainerDirection property provides a way to stretch the ItemCon
 
 ```xml
     <ListView
-        ui:ListViewBaseExtensions.StretchItemContainerDirection="Horizontal"
+        extensions:ListViewBase.StretchItemContainerDirection="Horizontal"
         ItemsSource="{x:Bind MainViewModel.Items, Mode=OneWay}" />
 ```
 
@@ -86,9 +86,9 @@ The StretchItemContainerDirection property provides a way to stretch the ItemCon
 
 | [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
 | --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp.UI |
+| Namespace | Microsoft.Toolkit.Uwp.UI.Extensions |
 
 ## API
 
-* [ListViewBaseExtensions source code](https://github.com/Microsoft/UWPCommunityToolkit/blob/dev/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBaseExtensions.cs)
+* [ListViewBase source code](https://github.com/Microsoft/UWPCommunityToolkit/blob/dev/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase)
 
diff --git a/docs/controls/SurfaceDialTextboxHelper.md b/docs/extensions/SurfaceDialTextboxHelper.md
similarity index 78%
rename from docs/controls/SurfaceDialTextboxHelper.md
rename to docs/extensions/SurfaceDialTextboxHelper.md
index f2729f453d2..9676bab7b3d 100644
--- a/docs/controls/SurfaceDialTextboxHelper.md
+++ b/docs/extensions/SurfaceDialTextboxHelper.md
@@ -28,14 +28,14 @@ Enables you to click the Surface Dial Control to move to the next focus item in
 <TextBox Width="106"
           HorizontalAlignment="Left"
           VerticalAlignment="Top"
-          controls:SurfaceDialTextboxHelper.EnableHapticFeedback="True"
-          controls:SurfaceDialTextboxHelper.EnableMinMaxValue="True"
-          controls:SurfaceDialTextboxHelper.EnableTapToNextControl="False"
-          controls:SurfaceDialTextboxHelper.ForceMenuItem="True"
-          controls:SurfaceDialTextboxHelper.Icon="Ruler"
-          controls:SurfaceDialTextboxHelper.MaxValue="0"
-          controls:SurfaceDialTextboxHelper.MinValue="100"
-          controls:SurfaceDialTextboxHelper.StepValue="1"
+          extensions:SurfaceDialTextboxHelper.EnableHapticFeedback="True"
+          extensions:SurfaceDialTextboxHelper.EnableMinMaxValue="True"
+          extensions:SurfaceDialTextboxHelper.EnableTapToNextControl="False"
+          extensions:SurfaceDialTextboxHelper.ForceMenuItem="True"
+          extensions:SurfaceDialTextboxHelper.Icon="Ruler"
+          extensions:SurfaceDialTextboxHelper.MaxValue="0"
+          extensions:SurfaceDialTextboxHelper.MinValue="100"
+          extensions:SurfaceDialTextboxHelper.StepValue="1"
           Text="0" />  
 
 ```
@@ -52,8 +52,8 @@ Enables you to click the Surface Dial Control to move to the next focus item in
 
 | [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.14393.0 or higher |
 | --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp.UI.Controls |
+| Namespace | Microsoft.Toolkit.Uwp.UI.Extensions |
 
 ## API
 
-* [SurfaceDialTextboxHelper source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/SurfaceDialTextboxHelper)
+* [SurfaceDialTextboxHelper source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextboxHelper)
diff --git a/docs/controls/TextBoxMask.md b/docs/extensions/TextBoxMask.md
similarity index 79%
rename from docs/controls/TextBoxMask.md
rename to docs/extensions/TextBoxMask.md
index 3d92a6759c3..32260434e75 100644
--- a/docs/controls/TextBoxMask.md
+++ b/docs/extensions/TextBoxMask.md
@@ -7,11 +7,11 @@ The **TextBox Mask Property** allows a user to more easily enter fixed width tex
 The developer adds the mask property to prevent end user to enter any other format but the required one, ex postal code aaa-9999
 
 TextBox Mask property has 3 build in variable characters 
-a which represents [a-Z]
-9 which represents [0-9]
-* which represents a or 9
+1) a which represents [a-Z]
+2) 9 which represents [0-9]
+3) '*' which represents a or 9
 
-at the post code example the user will only be allowed to enter from a to Z in the first 3 characters then there is a fixed character (-) which the user can change or remove it and the last part which the user can change by entering from 0 to 9 at each character
+At the post code example the user will only be allowed to enter from a to Z in the first 3 characters then there is a fixed character (-) which the user can change or remove it and the last part which the user can change by entering from 0 to 9 at each character
 TextBoxMask prevent the text box from having non specified characters ex if you entered 1 or 2 into a mask like 9999.
 
 TextBoxMask has 2 type of characters 
@@ -19,7 +19,7 @@ TextBoxMask has 2 type of characters
 2) Fixed: which the user can't change and it is any non variable character ex the - in the first example
 
 Variable characters a represented to end user in form of placeholder so the user can know which characters he can change and which he can't, ex mask aaa-9999 will be presented to user as ___-____
-the default placeholder is _ but you can change it using  controls:TextBoxMask.PlaceHolder property (Check the second textbox in syntax section)
+the default placeholder is _ but you can change it using  extensions:TextBoxMask.PlaceHolder property (Check the second textbox in syntax section)
 
 In case you want to add a custom variable character you can use property TextBoxMask.CustomMask (Check the third textbox in syntax section), you can add a character that represents certain regex as c:[a-c] and once you use character c in the mask the mask will prevent any characters but from a to c inside the TextBox, also you specify multiple variable characters by adding comma "," after every character and it's representation. this feature is helpful if you want to allow certain language characters ex French or Arabic only TextBox.
 
@@ -27,19 +27,19 @@ In case you want to add a custom variable character you can use property TextBox
 
 ```xml
 
-            <TextBox controls:TextBoxMask.Mask="9a9a-a9a*"
+            <TextBox extensions:TextBoxMask.Mask="9a9a-a9a*"
                      Header="Text box with Mask 9a9a-a9a* (9 allows from 0 to 9, a allow from a to Z and * allows both a and 9)"
                       />
 
             <TextBox 
-                     controls:TextBoxMask.Mask="+1999-9999"
-                     controls:TextBoxMask.PlaceHolder=" "
+                     extensions:TextBoxMask.Mask="+1999-9999"
+                     extensions:TextBoxMask.PlaceHolder=" "
                      Header="Text box with Mask +1999-9999 and placeHolder as space (placeholder represents the characters the user can change on runtime)"
                       />
 
             <TextBox
-                     controls:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
-                     controls:TextBoxMask.Mask="a5c-5c*9"
+                     extensions:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
+                     extensions:TextBoxMask.Mask="a5c-5c*9"
                      Header="Text box with CustomMask in case you want to define your own variable character like a,9 and * , mask: a5c-5c*9, 5: [1-5], c: [a-c]"
                      />
 
@@ -61,7 +61,7 @@ The following sample demonstrates how to add TextBoxMask property.
 <Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextBoxMaskPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Extensions"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -89,21 +89,21 @@ The following sample demonstrates how to add TextBoxMask property.
                 <RowDefinition />
             </Grid.RowDefinitions>
 
-            <TextBox controls:TextBoxMask.Mask="9a9a-a9a*"
+            <TextBox extensions:TextBoxMask.Mask="9a9a-a9a*"
                      Header="Text box with Mask 9a9a-a9a* (9 allows from 0 to 9, a allow from a to Z and * allows both a and 9)"
                      HeaderTemplate="{StaticResource HeaderTemplate}"
                      Style="{StaticResource MaskedTextBoxStyle}" />
 
             <TextBox Grid.Row="1"
-                     controls:TextBoxMask.Mask="+1999-9999"
-                     controls:TextBoxMask.PlaceHolder=" "
+                     extensions:TextBoxMask.Mask="+1999-9999"
+                     extensions:TextBoxMask.PlaceHolder=" "
                      Header="Text box with Mask +1999-9999 and placeHolder as space (placeholder represents the characters the user can change on runtime)"
                      HeaderTemplate="{StaticResource HeaderTemplate}"
                      Style="{StaticResource MaskedTextBoxStyle}" />
 
             <TextBox Grid.Row="2"
-                     controls:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
-                     controls:TextBoxMask.Mask="a5c-5c*9"
+                     extensions:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
+                     extensions:TextBoxMask.Mask="a5c-5c*9"
                      Header="Text box with CustomMask in case you want to define your own variable character like a,9 and * , mask: a5c-5c*9, 5: [1-5], c: [a-c]"
                      HeaderTemplate="{StaticResource HeaderTemplate}"
                      Style="{StaticResource MaskedTextBoxStyle}" />
@@ -118,14 +118,14 @@ The following sample demonstrates how to add TextBoxMask property.
 
 ## Default Template 
 
-[TextBoxMask XAML File](https://github.com/Microsoft/UWPCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask/TextBoxMaskPage.xaml) is the XAML template used in the toolkit for the default styling.
+[TextBoxMask XAML File](https://github.com/Microsoft/UWPCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMaskPage.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements (Windows 10 Device Family)
 
 | [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
 | --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp.UI.Controls |
+| Namespace | Microsoft.Toolkit.Uwp.UI.Extensions |
 
 ## API
 
-* [TextBoxMask source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxMask)
+* [TextBoxMask source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask)
diff --git a/docs/controls/TextBoxRegex.md b/docs/extensions/TextBoxRegex.md
similarity index 74%
rename from docs/controls/TextBoxRegex.md
rename to docs/extensions/TextBoxRegex.md
index 54d5de897b8..a9d7b8a8dc0 100644
--- a/docs/controls/TextBoxRegex.md
+++ b/docs/extensions/TextBoxRegex.md
@@ -19,16 +19,16 @@ Main Attached Properties:
 
 ```xml
 
-            <TextBox controls:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$" />
+            <TextBox extensions:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$" />
 
-            <TextBox controls:TextBoxRegex.ValidationMode="Forced"
-                      controls:TextBoxRegex.ValidationType="PhoneNumber"
+            <TextBox extensions:TextBoxRegex.ValidationMode="Forced"
+                      extensions:TextBoxRegex.ValidationType="PhoneNumber"
                       Text="+61616161611" />
 
-           <TextBox controls:TextBoxRegex.ValidationType="Email"   />
+           <TextBox extensions:TextBoxRegex.ValidationType="Email"   />
 
-            <TextBox controls:TextBoxRegex.ValidationMode="Forced"
-                     controls:TextBoxRegex.ValidationType="Decimal" />
+            <TextBox extensions:TextBoxRegex.ValidationMode="Forced"
+                     extensions:TextBoxRegex.ValidationType="Decimal" />
 
 ```
 
@@ -49,7 +49,7 @@ The following sample demonstrates how to add TextBoxRegex property.
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Extenions"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -80,13 +80,13 @@ The following sample demonstrates how to add TextBoxRegex property.
 
             <StackPanel Margin="10,0,10,0">
                 <TextBox Name="PhoneNumberValidator"
-                         controls:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
+                         extensions:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"
                          Header="Text box with Regex extension for phone number, validation occurs on TextChanged"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Is Valid: " />
-                    <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
+                    <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
                 </StackPanel>
 
             </StackPanel>
@@ -94,42 +94,42 @@ The following sample demonstrates how to add TextBoxRegex property.
             <StackPanel Grid.Row="1"
                         Margin="10,0,10,0">
                 <TextBox Name="PhoneNumberValidatorForce"
-                         controls:TextBoxRegex.ValidationMode="Forced"
-                         controls:TextBoxRegex.ValidationType="PhoneNumber"
+                         extensions:TextBoxRegex.ValidationMode="Forced"
+                         extensions:TextBoxRegex.ValidationType="PhoneNumber"
                          Header="Text box with ValidationType=PhoneNumber, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}"
                          Text="+61616161611" />
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Is Valid: " />
-                    <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=PhoneNumberValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+                    <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidatorForce, Converter={StaticResource StringFormatConverter}}" />
                 </StackPanel>
             </StackPanel>
 
             <StackPanel Grid.Row="2"
                         Margin="10,0,10,0">
                 <TextBox Name="EmailValidatorForce"
-                         controls:TextBoxRegex.ValidationType="Email"
+                         extensions:TextBoxRegex.ValidationType="Email"
                          Header="Text box with ValidationType=Email, validation occurs on TextChanged"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Is Valid: " />
-                    <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=EmailValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+                    <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=EmailValidatorForce, Converter={StaticResource StringFormatConverter}}" />
                 </StackPanel>
             </StackPanel>
 
             <StackPanel Grid.Row="3"
                         Margin="10,0,10,0">
                 <TextBox Name="DecimalValidatorForce"
-                         controls:TextBoxRegex.ValidationMode="Forced"
-                         controls:TextBoxRegex.ValidationType="Decimal"
+                         extensions:TextBoxRegex.ValidationMode="Forced"
+                         extensions:TextBoxRegex.ValidationType="Decimal"
                          Header="Text box with ValidationType=Decimal, validation occurs on TextChanged and force occurs on lose focus with ValidationMode=Force (333,111 or 333.111)"
                          HeaderTemplate="{StaticResource HeaderTemplate}"
                          Style="{StaticResource TextBoxRegexStyle}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Is Valid: " />
-                    <TextBlock Text="{Binding (controls:TextBoxRegex.IsValid), ElementName=DecimalValidatorForce, Converter={StaticResource StringFormatConverter}}" />
+                    <TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=DecimalValidatorForce, Converter={StaticResource StringFormatConverter}}" />
                 </StackPanel>
             </StackPanel>
 
@@ -144,14 +144,14 @@ The following sample demonstrates how to add TextBoxRegex property.
 
 ## Default Template 
 
-[TextBoxRegex XAML File](https://github.com/Microsoft/UWPCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex/TextBoxRegexPage.xaml) is the XAML template used in the toolkit for the default styling.
+[TextBoxRegex XAML File](https://github.com/Microsoft/UWPCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegex/TextBoxRegexPage.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements (Windows 10 Device Family)
 
 | [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
 | --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp.UI.Controls |
+| Namespace | Microsoft.Toolkit.Uwp.UI.Extensions |
 
 ## API
 
-* [TextBoxRegex source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TextBoxRegex)
+* [TextBoxRegex source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx)
diff --git a/docs/helpers/ViewExtensions.md b/docs/extensions/ViewExtensions.md
similarity index 75%
rename from docs/helpers/ViewExtensions.md
rename to docs/extensions/ViewExtensions.md
index 9e9e1965960..a2d6007bb55 100644
--- a/docs/helpers/ViewExtensions.md
+++ b/docs/extensions/ViewExtensions.md
@@ -12,13 +12,13 @@ The **ApplicationViewExtensions, StatusBarExtensions & TitleBarExtensions** prov
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:viewHelper="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-      viewHelper:ApplicationViewExtensions.Title="View Extensions"
-      viewHelper:StatusBarExtensions.BackgroundColor="Blue"
-      viewHelper:StatusBarExtensions.BackgroundOpacity="0.8"
-      viewHelper:StatusBarExtensions.ForegroundColor="White"
-      viewHelper:StatusBarExtensions.IsVisible="True"
-      viewHelper:TitleBarExtensions.BackgroundColor="Blue"
-      viewHelper:TitleBarExtensions.ForegroundColor="White"
+      extensions:ApplicationViewExtensions.Title="View Extensions"
+      extensions:StatusBarExtensions.BackgroundColor="Blue"
+      extensions:StatusBarExtensions.BackgroundOpacity="0.8"
+      extensions:StatusBarExtensions.ForegroundColor="White"
+      extensions:StatusBarExtensions.IsVisible="True"
+      extensions:TitleBarExtensions.BackgroundColor="Blue"
+      extensions:TitleBarExtensions.ForegroundColor="White"
       mc:Ignorable="d">
 
     <Grid Background="{StaticResource Brush-Grey-05}" />
@@ -29,7 +29,7 @@ The **ApplicationViewExtensions, StatusBarExtensions & TitleBarExtensions** prov
 
 | [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
 | --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp.UI |
+| Namespace | Microsoft.Toolkit.Uwp.UI.Extensions |
 
 ## API
 
diff --git a/docs/helpers/WebViewExtensions.md b/docs/extensions/WebView.md
similarity index 61%
rename from docs/helpers/WebViewExtensions.md
rename to docs/extensions/WebView.md
index 5ce5569b32a..3ffc059d344 100644
--- a/docs/helpers/WebViewExtensions.md
+++ b/docs/extensions/WebView.md
@@ -1,24 +1,24 @@
 # WebViewExtensions
 
-The **WebViewExtensions** allows attaching HTML content to WebView.
+The **WebView** allows attaching HTML content to WebView.
 
 ## Example
 
 ```xml
 	// Attach HTML content directly to WebView.
-	<WebView xaml:WebViewExtensions.Content="{Binding HtmlContent}" />
+	<WebView extensions:WebView.Content="{Binding HtmlContent}" />
 
     // Attach Uri directly to WebView
-    <WebView xaml:WebViewExtensions.ContentUri="{Binding ContentUri}" />
+    <WebView extensions:WebView.ContentUri="{Binding ContentUri}" />
 ```
 
 ## Requirements (Windows 10 Device Family)
 
 | [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
 | --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp.UI |
+| Namespace | Microsoft.Toolkit.Uwp.UI.Extensions |
 
 ## API
 
-* [WebViewExtensions source code](https://github.com/Microsoft/UWPCommunityToolkit/blob/dev/Microsoft.Toolkit.Uwp.UI/Extensions/WebViewExtensions.cs)
+* [WebViewExtensions source code](https://github.com/Microsoft/UWPCommunityToolkit/blob/dev/Microsoft.Toolkit.Uwp.UI/Extensions/Webview)
 
diff --git a/docs/helpers/HyperlinkExtensions.md b/docs/helpers/HyperlinkExtensions.md
deleted file mode 100644
index 1268ab6ca9c..00000000000
--- a/docs/helpers/HyperlinkExtensions.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# HyperlinkExtensions
-
-The **HyperlinkExtensions** allows for a Hyperlink element to invoke the execute method on a bound [ICommand](https://msdn.microsoft.com/en-us/library/system.windows.input.icommand.aspx) instance when clicked.
-
-## Example
-
-```xml
-	// Use Hyperlink in a wrapped TextBlock with text either side and ensure it executes a command when
-	// clicked passing the current data context as the command parameter.
-	<TextBlock>
-	    <Run>Some leading text with a</Run>
-	     <Hyperlink xaml:HyperlinkExtensions.Command="{Binding HyperlinkClicked}"
-			        xaml:HyperlinkExtensions.CommandParameter="{Binding}">hyperlink</Hyperlink>
-	    <Run>in the middle.</Run>
-	</TextBlock>
-```
-
-## Requirements (Windows 10 Device Family)
-
-| [Device family](http://go.microsoft.com/fwlink/p/?LinkID=526370) | Universal, 10.0.10586.0 or higher |
-| --- | --- |
-| Namespace | Microsoft.Toolkit.Uwp |
-
-## API
-
-* [HyperlinkExtensions source code](https://github.com/Microsoft/UWPCommunityToolkit/blob/dev/Microsoft.Toolkit.Uwp.UI/Extensions/HyperlinkExtensions.cs)
-
diff --git a/readme.md b/readme.md
index dc51a2466fa..838ecef068b 100644
--- a/readme.md
+++ b/readme.md
@@ -76,9 +76,6 @@ Once you search you should see a list similar to the one below (versions may be
 * [RotatorTile](http://docs.uwpcommunitytoolkit.com/en/master/controls/RotatorTile/)
 * [ScrollHeader](http://docs.uwpcommunitytoolkit.com/en/master/controls/ScrollHeader/)
 * [SlideableListItem](http://docs.uwpcommunitytoolkit.com/en/master/controls/SlidableListItem/)
-* [SurfaceDialTextboxHelper](http://docs.uwpcommunitytoolkit.com/en/master/controls/SurfaceDialTextboxHelper/)
-* [TextBoxMask](http://docs.uwpcommunitytoolkit.com/en/master/controls/TextBoxMask/)
-* [TextBoxRegex](http://docs.uwpcommunitytoolkit.com/en/master/controls/TextBoxRegex/)
 * [TileControl](http://docs.uwpcommunitytoolkit.com/en/master/controls/TileControl/)
 * [WrapPanel](http://docs.uwpcommunitytoolkit.com/en/master/controls/WrapPanel/)
 
@@ -86,8 +83,16 @@ Once you search you should see a list similar to the one below (versions may be
 * [AlignmentGrid](http://www.uwpcommunitytoolkit.com/en/master/developer%20tools/AlignmentGrid/)
 * [FocusTracker](http://www.uwpcommunitytoolkit.com/en/master/developer%20tools/FocusTracker/)
 
-### Code Helpers
+### Extensions
+* [Hyperlink](http://docs.uwpcommunitytoolkit.com/en/master/extensions/Hyperlink/)
+* [ListViewBase](http://docs.uwpcommunitytoolkit.com/en/master/extensions/ListViewBase/)
+* [SurfaceDialTextbox](http://docs.uwpcommunitytoolkit.com/en/master/extensions/SurfaceDialTextbox/)
+* [TextBoxMask](http://docs.uwpcommunitytoolkit.com/en/master/extensions/TextBoxMask/)
+* [TextBoxRegex](http://docs.uwpcommunitytoolkit.com/en/master/extensions/TextBoxRegex/)
+* [ViewExtensions](http://www.uwpcommunitytoolkit.com/en/master/extensions/ViewExtensions/)
+* [WebView](http://docs.uwpcommunitytoolkit.com/en/master/extensions/WebView/)
 
+### Code Helpers
 * [AdvancedCollectionView](docs.uwpcommunitytoolkit.com/en/master/helpers/AdvancedCollectionView/)
 * [BackgroundTaskHelper](http://docs.uwpcommunitytoolkit.com/en/master/helpers/BackgroundTaskHelper/)
 * [BindableValueHolder](http://docs.uwpcommunitytoolkit.com/en/master/helpers/BindableValueHolder/)
@@ -97,20 +102,16 @@ Once you search you should see a list similar to the one below (versions may be
 * [DeepLinkParsers](http://docs.uwpcommunitytoolkit.com/en/master/helpers/DeepLinkParsers/)
 * [DispatcherHelper](http://docs.uwpcommunitytoolkit.com/en/master/helpers/DispatcherHelper/)
 * [HttpHelper](http://docs.uwpcommunitytoolkit.com/en/master/helpers/HttpHelper/)
-* [HyperlinkExtensions](http://docs.uwpcommunitytoolkit.com/en/master/helpers/HyperlinkExtensions/)
 * [ImageCache](http://docs.uwpcommunitytoolkit.com/en/master/helpers/ImageCache/)
 * [Incremental Loading Collection](http://docs.uwpcommunitytoolkit.com/en/master/helpers/IncrementalLoadingCollection/)
-* [ListViewBaseExtensions](http://docs.uwpcommunitytoolkit.com/en/master/helpers/ListViewBaseExtensions/)
 * [NetworkHelper](http://www.uwpcommunitytoolkit.com/en/master/helpers/NetworkHelper/)
 * [Object Storage](http://docs.uwpcommunitytoolkit.com/en/master/helpers/ObjectStorage/)
 * [PrinterHelper](http://docs.uwpcommunitytoolkit.com/en/master/helpers/PrinterHelper/)
 * [StorageFiles](http://docs.uwpcommunitytoolkit.com/en/master/helpers/StorageFiles/)
 * [Streams](http://docs.uwpcommunitytoolkit.com/en/master/helpers/Streams/)
 * [SystemInformation](http://docs.uwpcommunitytoolkit.com/en/master/helpers/SystemInformation/)
-* [ViewExtensions](http://www.uwpcommunitytoolkit.com/en/master/helpers/ViewExtensions/)
 * [VisualTreeExtensions](http://docs.uwpcommunitytoolkit.com/en/master/helpers/VisualTreeExtensions/)
 * [WeakEventListener](http://docs.uwpcommunitytoolkit.com/en/master/helpers/WeakEventListener/)
-* [WebViewExtensions](http://docs.uwpcommunitytoolkit.com/en/master/helpers/WebViewExtensions/)
 
 ### Services