diff --git a/docs/behaviors/AutoSelectBehavior.md b/docs/behaviors/AutoSelectBehavior.md
index 19900f421..9b891abe9 100644
--- a/docs/behaviors/AutoSelectBehavior.md
+++ b/docs/behaviors/AutoSelectBehavior.md
@@ -30,11 +30,11 @@ In this example using the `AutoSelectBehavior` the textbox content will be autom
 
 ## Sample Project
 
-[AutoSelect behavior sample page Source](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.0.1/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoSelectBehavior). You can [see this in action](uwpct://Helpers?sample=AutoSelectBehavior) in [Windows Community Toolkit Sample App](https://aka.ms/windowstoolkitapp).
+[AutoSelect behavior sample page Source](https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoSelectBehavior). You can [see this in action](uwpct://Helpers?sample=AutoSelectBehavior) in [Windows Community Toolkit Sample App](https://aka.ms/windowstoolkitapp).
 
 ## Source Code
 
-- [AutoSelect behavior source code](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.0.1/Microsoft.Toolkit.Uwp.UI.Behaviors/Select/AutoSelectBehavior.cs)
+- [AutoSelect behavior source code](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Behaviors/Select/AutoSelectBehavior.cs)
 
 ## Related Topics
 
diff --git a/docs/brushes/AcrylicBrush.md b/docs/brushes/AcrylicBrush.md
index 58cc3d2ee..d221bfce8 100644
--- a/docs/brushes/AcrylicBrush.md
+++ b/docs/brushes/AcrylicBrush.md
@@ -71,5 +71,5 @@ Brush brush = PipelineBuilder.FromBackdropAcrylic(
 
 ## Related Topics
 
-* [Win2D GaussianBlurEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_GaussianBlurEffect.htm)
+* [Win2D GaussianBlurEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_GaussianBlurEffect.htm)
 * [XamlCompositionBrushBase Examples](/uwp/api/windows.ui.xaml.media.xamlcompositionbrushbase#examples)
diff --git a/docs/brushes/BackdropBlurBrush.md b/docs/brushes/BackdropBlurBrush.md
index 16b75a588..f1d1eaad3 100644
--- a/docs/brushes/BackdropBlurBrush.md
+++ b/docs/brushes/BackdropBlurBrush.md
@@ -49,5 +49,5 @@ The [BackdropBlurBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.backdropblurb
 
 ## Related Topics
 
-* [Win2D GaussianBlurEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_GaussianBlurEffect.htm)
+* [Win2D GaussianBlurEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_GaussianBlurEffect.htm)
 * [XamlCompositionBrushBase Examples](/uwp/api/windows.ui.xaml.media.xamlcompositionbrushbase#examples)
diff --git a/docs/brushes/BackdropGammaTransferBrush.md b/docs/brushes/BackdropGammaTransferBrush.md
index 151ddbfa6..ee6807a14 100644
--- a/docs/brushes/BackdropGammaTransferBrush.md
+++ b/docs/brushes/BackdropGammaTransferBrush.md
@@ -30,7 +30,7 @@ To apply a red hue:
 
 ## Properties
 
-See the property reference for the [GammaTransferEffect](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_GammaTransferEffect.htm).  
+See the property reference for the [GammaTransferEffect](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_GammaTransferEffect.htm).  
 
 All Amplitude, Disable, Exponent, and Offset properties are available for the Alpha, Red, Green, and Blue channels.
 
@@ -51,4 +51,4 @@ All Amplitude, Disable, Exponent, and Offset properties are available for the Al
 
 ## Related Topics
 
-* [Win2D GammaTransferEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_GammaTransferEffect.htm)
+* [Win2D GammaTransferEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_GammaTransferEffect.htm)
diff --git a/docs/brushes/BackdropInvertBrush.md b/docs/brushes/BackdropInvertBrush.md
index cae199e47..74295fe79 100644
--- a/docs/brushes/BackdropInvertBrush.md
+++ b/docs/brushes/BackdropInvertBrush.md
@@ -43,5 +43,5 @@ The [BackdropInvertBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.backdropinv
 
 ## Related Topics
 
-* [Win2D InvertEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_InvertEffect.htm)
+* [Win2D InvertEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_InvertEffect.htm)
 * [Working with Brushes and Content – XAML and Visual Layer Interop, Part One](https://blogs.windows.com/buildingapps/2017/07/18/working-brushes-content-xaml-visual-layer-interop-part-one/#c57zf3bW4ylLlSvJ.97)
diff --git a/docs/brushes/BackdropSaturationBrush.md b/docs/brushes/BackdropSaturationBrush.md
index b15aa3333..2f6c2f675 100644
--- a/docs/brushes/BackdropSaturationBrush.md
+++ b/docs/brushes/BackdropSaturationBrush.md
@@ -49,4 +49,4 @@ The [BackdropSaturationBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.backdro
 
 ## Related Topics
 
-* [Win2D SaturationEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_SaturationEffect.htm)
+* [Win2D SaturationEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_SaturationEffect.htm)
diff --git a/docs/brushes/BackdropSepiaBrush.md b/docs/brushes/BackdropSepiaBrush.md
index 530b754ea..394569996 100644
--- a/docs/brushes/BackdropSepiaBrush.md
+++ b/docs/brushes/BackdropSepiaBrush.md
@@ -49,4 +49,4 @@ The [BackdropSepiaBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.backdropsepi
 
 ## Related Topics
 
-* [Win2D SepiaEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_SepiaEffect.htm)
+* [Win2D SepiaEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_SepiaEffect.htm)
diff --git a/docs/brushes/ImageBlendBrush.md b/docs/brushes/ImageBlendBrush.md
index 4d047da8f..eb8365f39 100644
--- a/docs/brushes/ImageBlendBrush.md
+++ b/docs/brushes/ImageBlendBrush.md
@@ -35,7 +35,7 @@ The [ImageBlendBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.imageblendbrush
 | -- | -- | -- |
 | Source | Windows.UI.Xaml.Media.ImageSource | The `ImageSource` property specifies which image to use for the effect.  It is assumed it will resolve to a [BitmapImage](/uwp/api/windows.ui.xaml.media.imaging.bitmapimage). |
 | Stretch | Windows.UI.Xaml.Media.Stretch | The `Stretch` property specifies how the image should stretch to its container.  Requires 10.0.16299 or higher for modes other than None (default). |
-| Mode | [ImageBlendMode](/dotnet/api/microsoft.toolkit.uwp.ui.media.imageblendmode) | The `ImageBlendMode` property specifies how the image should be blended with the backdrop.  See the [BlendEffectMode](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_BlendEffectMode.htm) reference. |
+| Mode | [ImageBlendMode](/dotnet/api/microsoft.toolkit.uwp.ui.media.imageblendmode) | The `ImageBlendMode` property specifies how the image should be blended with the backdrop.  See the [BlendEffectMode](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_BlendEffectMode.htm) reference. |
 
 ## Sample Project
 
@@ -55,6 +55,6 @@ The [ImageBlendBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.imageblendbrush
 ## Related Topics
 
 * [BitmapImage](/uwp/api/windows.ui.xaml.media.imaging.bitmapimage)
-* [Win2D BlendEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_BlendEffect.htm)
-* [BlendEffectMode reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_BlendEffectMode.htm)
+* [Win2D BlendEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_BlendEffect.htm)
+* [BlendEffectMode reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_BlendEffectMode.htm)
 * [Working with Brushes and Content – XAML and Visual Layer Interop, Part One](https://blogs.windows.com/buildingapps/2017/07/18/working-brushes-content-xaml-visual-layer-interop-part-one/#c57zf3bW4ylLlSvJ.97)
diff --git a/docs/brushes/PipelineBrush.md b/docs/brushes/PipelineBrush.md
index 94283063c..a777e9c2c 100644
--- a/docs/brushes/PipelineBrush.md
+++ b/docs/brushes/PipelineBrush.md
@@ -85,5 +85,5 @@ Brush brush =
 
 ## Related Topics
 
-* [Win2D GaussianBlurEffect reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Effects_GaussianBlurEffect.htm)
+* [Win2D GaussianBlurEffect reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Effects_GaussianBlurEffect.htm)
 * [XamlCompositionBrushBase Examples](/uwp/api/windows.ui.xaml.media.xamlcompositionbrushbase#examples)
diff --git a/docs/brushes/RadialGradientBrush.md b/docs/brushes/RadialGradientBrush.md
index f6a301e5b..4297f2359 100644
--- a/docs/brushes/RadialGradientBrush.md
+++ b/docs/brushes/RadialGradientBrush.md
@@ -84,4 +84,4 @@ The Animation or Binding of *GradientStop* `Offset` and `Color` properties is no
 
 - [Brush](/uwp/api/windows.ui.xaml.media.brush)
 - [System.Windows.Media.RadialGradientBrush](/dotnet/api/system.windows.media.radialgradientbrush)
-- [Win2D CanvasRadialGradientBrush reference](https://microsoft.github.io/Win2D/html/T_Microsoft_Graphics_Canvas_Brushes_CanvasRadialGradientBrush.htm)
+- [Win2D CanvasRadialGradientBrush reference](https://microsoft.github.io/Win2D/WinUI2/html/T_Microsoft_Graphics_Canvas_Brushes_CanvasRadialGradientBrush.htm)
diff --git a/docs/controls/BladeView.md b/docs/controls/BladeView.md
index 65a8092c3..6732a8252 100644
--- a/docs/controls/BladeView.md
+++ b/docs/controls/BladeView.md
@@ -10,7 +10,7 @@ dev_langs:
 
 # BladeView
 
-The [BladeView](/dotnet/api/microsoft.toolkit.uwp.ui.controls.bladeview) control provides a horizontal collection of [BladeItems](/dotnet/api/microsoft.toolkit.uwp.ui.controls.bladeitem) for drilling into detailed scenarios.  The control is based on how the Azure Portal works.
+The [BladeView](/dotnet/api/microsoft.toolkit.uwp.ui.controls.bladeview) control provides a horizontal collection of [BladeItems](/dotnet/api/microsoft.toolkit.uwp.ui.controls.bladeitem) for drilling into detailed scenarios. The control is based on how the Azure Portal works.
 
 > [!div class="nextstepaction"]
 > [Try it in the sample app](uwpct://Controls?sample=BladeView)
@@ -99,7 +99,7 @@ The [BladeView](/dotnet/api/microsoft.toolkit.uwp.ui.controls.bladeview) control
 
 ## Default Template
 
-[BladeView XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml) is the XAML template used in the toolkit for the default styling.
+[BladeView XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/Carousel.md b/docs/controls/Carousel.md
index abbef6787..7d02f49b7 100644
--- a/docs/controls/Carousel.md
+++ b/docs/controls/Carousel.md
@@ -71,7 +71,7 @@ The `Carousel` control works fine with mouse, touch, mouse and keyboard as well.
 
 ## Default Template
 
-[Carousel XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml) is the XAML template used in the toolkit for the default styling.
+[Carousel XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/DropShadowPanel.md b/docs/controls/DropShadowPanel.md
index 6f5884920..0823fe290 100644
--- a/docs/controls/DropShadowPanel.md
+++ b/docs/controls/DropShadowPanel.md
@@ -65,11 +65,11 @@ The [DropShadowPanel](/dotnet/api/microsoft.toolkit.uwp.ui.controls.dropshadowpa
 
 ## Sample Project
 
-[DropShadowPanel Sample Page Source](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DropShadowPanel). You can [see this in action](uwpct://Controls?sample=DropShadowPanel) in the [Windows Community Toolkit Sample App](https://aka.ms/windowstoolkitapp).
+[DropShadowPanel Sample Page Source](https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Shadows). You can [see this in action](uwpct://Controls?sample=DropShadowPanel) in the [Windows Community Toolkit Sample App](https://aka.ms/windowstoolkitapp).
 
 ## Default Template
 
-[DropShadowPanel XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml) is the XAML template used in the toolkit for the default styling.
+[DropShadowPanel XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/Expander.md b/docs/controls/Expander.md
index 480d2fa87..2afff159c 100644
--- a/docs/controls/Expander.md
+++ b/docs/controls/Expander.md
@@ -99,7 +99,7 @@ For instance to remove the header entirely from the Expander:
 
 ## Default Template
 
-[Expander XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml) is the XAML template used in the toolkit for the default styling.
+[Expander XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/GridSplitter.md b/docs/controls/GridSplitter.md
index 593d38779..3e39e6236 100644
--- a/docs/controls/GridSplitter.md
+++ b/docs/controls/GridSplitter.md
@@ -105,7 +105,7 @@ The following sample demonstrates how to add Grid Splitter Control
 
 ## Default Template
 
-[GridSplitter XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml) is the XAML template used in the toolkit for the default styling.
+[GridSplitter XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/HeaderedContentControl.md b/docs/controls/HeaderedContentControl.md
index 4379086f8..c826b18df 100644
--- a/docs/controls/HeaderedContentControl.md
+++ b/docs/controls/HeaderedContentControl.md
@@ -74,7 +74,7 @@ The [HeaderedContentControl](/dotnet/api/microsoft.toolkit.uwp.ui.controls.heade
 
 ## Default Template
 
-[HeaderedContentControl XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml) is the XAML template used in the toolkit for the default styling.
+[HeaderedContentControl XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/HeaderedItemsControl.md b/docs/controls/HeaderedItemsControl.md
index e2664143b..ccc53d4d1 100644
--- a/docs/controls/HeaderedItemsControl.md
+++ b/docs/controls/HeaderedItemsControl.md
@@ -76,7 +76,7 @@ The [HeaderedItemsControl](/dotnet/api/microsoft.toolkit.uwp.ui.controls.headere
 
 ## Default Template
 
-[HeaderedItemsControl XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml) is the XAML template used in the toolkit for the default styling.
+[HeaderedItemsControl XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/HeaderedTextBlock.md b/docs/controls/HeaderedTextBlock.md
index a9a522945..147b574e9 100644
--- a/docs/controls/HeaderedTextBlock.md
+++ b/docs/controls/HeaderedTextBlock.md
@@ -39,11 +39,11 @@ The [HeaderedTextBlock](/dotnet/api/microsoft.toolkit.uwp.ui.controls.headeredte
 
 ## Sample Project
 
-[HeaderedTextBlock Sample Page Source](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock). You can [see this in action](uwpct://Controls?sample=HeaderedTextBlock) in the [Windows Community Toolkit Sample App](https://aka.ms/windowstoolkitapp).
+[HeaderedTextBlock Sample Page Source](https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/rel/6.1.0/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HeaderedTextBlock). You can [see this in action](uwpct://Controls?sample=HeaderedTextBlock) in the [Windows Community Toolkit Sample App](https://aka.ms/windowstoolkitapp).
 
 ## Default Template
 
-[HeaderedTextBlock XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml) is the XAML template used in the toolkit for the default styling.
+[HeaderedTextBlock XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/6.1.0/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
@@ -54,4 +54,4 @@ The [HeaderedTextBlock](/dotnet/api/microsoft.toolkit.uwp.ui.controls.headeredte
 
 ## API
 
-* [HeaderedTextBlock source code](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock)
+* [HeaderedTextBlock source code](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/6.1.0/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/)
diff --git a/docs/controls/ImageCropper.md b/docs/controls/ImageCropper.md
index aabcb51be..a9fcbe547 100644
--- a/docs/controls/ImageCropper.md
+++ b/docs/controls/ImageCropper.md
@@ -125,7 +125,7 @@ ImageCropper.AspectRatio = Nothing
 
 ## Default Template
 
-[ImageCropper XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml) is the XAML template used in the toolkit for the default styling.
+[ImageCropper XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/InAppNotification.md b/docs/controls/InAppNotification.md
index 05d16b669..e566054da 100644
--- a/docs/controls/InAppNotification.md
+++ b/docs/controls/InAppNotification.md
@@ -238,7 +238,7 @@ You can change this behavior with one of these values:
 
 If you want to add styles to the Toolkit, please follow these steps :
 
-1. Create a `ResourceDictionary` file in [Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles) folder
+1. Create a `ResourceDictionary` file in [Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/](https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/rel/6.1.0/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles) folder
 2. Create a new `Style` with `TargetType="local:InAppNotification"`
 3. Create a new `ControlTemplate` with `TargetType="local:InAppNotification"` and add a `ContentPresenter` inside the Template
 4. Do not forget to set the `Template` property inside your `Style` resource
diff --git a/docs/controls/InfiniteCanvas.md b/docs/controls/InfiniteCanvas.md
index 66b3a57e6..5a9166a55 100644
--- a/docs/controls/InfiniteCanvas.md
+++ b/docs/controls/InfiniteCanvas.md
@@ -71,7 +71,7 @@ The following sample demonstrates how to add InfiniteCanvas Control
 
 ## Default Template
 
-[InfiniteCanvas XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml) is the XAML template used in the toolkit for the default styling.
+[InfiniteCanvas XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/Loading.md b/docs/controls/Loading.md
index b5dc17d01..36b7ddbbf 100644
--- a/docs/controls/Loading.md
+++ b/docs/controls/Loading.md
@@ -72,7 +72,7 @@ LoadingControl.IsLoading = true
 
 ## Default Template
 
-[Loading XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml) is the XAML template used in the toolkit for the default styling.
+[Loading XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/MarkdownTextBlock.md b/docs/controls/MarkdownTextBlock.md
index b6b539077..2986c1043 100644
--- a/docs/controls/MarkdownTextBlock.md
+++ b/docs/controls/MarkdownTextBlock.md
@@ -212,8 +212,8 @@ block.SetRenderer<InheritedMarkdownRenderer>();
 
 This will likely require intimate knowledge of the implementation of the `MarkdownRenderer`, take a look at the following:
 
-- [MarkdownRenderer and Helpers](https://github.com/windows-toolkit/WindowsCommunityToolit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/Render)
-- [Sample App custom markdown renderer](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer)
+- MarkdownRenderer and Helpers (`https://github.com/windows-toolkit/WindowsCommunityToolit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/Render`)
+- [Sample App custom markdown renderer](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/6.1.1/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs)
 
 ## Sample Project
 
@@ -221,7 +221,7 @@ This will likely require intimate knowledge of the implementation of the `Markdo
 
 ## Default Template
 
-[MarkdownTextBlock XAML File](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls/MarkdownTextBlock/MarkdownTextBlock.xaml) is the XAML template used in the toolkit for the default styling.
+[MarkdownTextBlock XAML File](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/MarkdownTextBlock/MarkdownTextBlock.xaml) is the XAML template used in the toolkit for the default styling.
 
 ## Requirements
 
diff --git a/docs/controls/layout/StaggeredLayout.md b/docs/controls/layout/StaggeredLayout.md
index 4ea2cecac..d2b3ce9f0 100644
--- a/docs/controls/layout/StaggeredLayout.md
+++ b/docs/controls/layout/StaggeredLayout.md
@@ -53,4 +53,4 @@ The [StaggeredLayout](/dotnet/api/microsoft.toolkit.uwp.ui.controls.StaggeredLay
 
 ## API
 
-- [StaggeredLayout](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout)
+- [StaggeredLayout](https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout)
diff --git a/docs/controls/layout/WrapLayout.md b/docs/controls/layout/WrapLayout.md
index b9c380b20..8e6816a2f 100644
--- a/docs/controls/layout/WrapLayout.md
+++ b/docs/controls/layout/WrapLayout.md
@@ -99,4 +99,4 @@ The following example of adding the WrapLayout layout panel.
 
 ## API
 
-* [WrapLayout source code](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/rel/7.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout)
+* [WrapLayout source code](https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/rel/6.1.0/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout)