diff --git a/firebase.json b/firebase.json
index f76a3e8b..9fd039de 100644
--- a/firebase.json
+++ b/firebase.json
@@ -368,6 +368,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/expandable",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/expandable",
+        "destination": "/resources/ui/widgets/built-in-widgets/expandable",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/layout-elements/staggeredview",
         "destination": "/resources/ui/widgets/built-in-widgets/list-grid/#staggered-view",
@@ -378,6 +383,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/flippable-card",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/flippable-card",
+        "destination": "/resources/ui/widgets/built-in-widgets/flippable-card",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/layout-elements/wrap",
         "destination": "/concepts/layouts/wrap",
@@ -388,16 +398,31 @@
         "destination": "/resources/ui/widgets/built-in-widgets/carousel",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/carousel",
+        "destination": "/resources/ui/widgets/built-in-widgets/carousel",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/layout-elements/swipeablestack",
         "destination": "/resources/ui/widgets/built-in-widgets/swipeable-stack",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/swipeable-stack",
+        "destination": "/resources/ui/widgets/built-in-widgets/swipeable-stack",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/layout-elements/datatable-paginated",
         "destination": "/resources/ui/widgets/built-in-widgets/datatable",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/datatable",
+        "destination": "/resources/ui/widgets/built-in-widgets/datatable",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/page-elements",
         "destination": "/resources/ui/pages/scaffold-elements",
@@ -488,6 +513,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/calendar",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/calendar",
+        "destination": "/resources/ui/widgets/built-in-widgets/calendar",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/checkbox",
         "destination": "/resources/forms/checkbox",
@@ -548,6 +578,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/blur",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/blur",
+        "destination": "/resources/ui/widgets/built-in-widgets/blur",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/transform",
         "destination": "/resources/ui/widgets/built-in-widgets/transform",
@@ -558,6 +593,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/media-display",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/media-display",
+        "destination": "/resources/ui/widgets/built-in-widgets/media-display",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/riveanimation",
         "destination": "/concepts/animations/rive-animation",
@@ -573,6 +613,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/progressbar",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/progressbar",
+        "destination": "/resources/ui/widgets/built-in-widgets/progressbar",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/languageselector",
         "destination": "/concepts/multiple-languages/language-selector",
@@ -583,26 +628,51 @@
         "destination": "/resources/ui/widgets/built-in-widgets/badge",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/badge",
+        "destination": "/resources/ui/widgets/built-in-widgets/badge",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/chart",
         "destination": "/resources/ui/widgets/built-in-widgets/chart/chart",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/chart/chart",
+        "destination": "/resources/ui/widgets/built-in-widgets/chart/chart",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/chart/line-chart",
         "destination": "/resources/ui/widgets/built-in-widgets/chart/line-chart",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/chart/line-chart",
+        "destination": "/resources/ui/widgets/built-in-widgets/chart/line-chart",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/chart/bar-chart",
         "destination": "/resources/ui/widgets/built-in-widgets/chart/bar-chart",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/chart/bar-chart",
+        "destination": "/resources/ui/widgets/built-in-widgets/chart/bar-chart",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/chart/pie-chart",
         "destination": "/resources/ui/widgets/built-in-widgets/chart/pie-chart",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/chart/pie-chart",
+        "destination": "/resources/ui/widgets/built-in-widgets/chart/pie-chart",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/muxbroadcast",
         "destination": "/integrations/mux/getting-started",
@@ -628,6 +698,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/barcode",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/barcode",
+        "destination": "/resources/ui/widgets/built-in-widgets/barcode",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/tooltip",
         "destination": "/resources/ui/widgets/built-in-widgets/tooltip",
@@ -643,16 +718,31 @@
         "destination": "/resources/ui/widgets/built-in-widgets/sticky-header",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/sticky-header",
+        "destination": "/resources/ui/widgets/built-in-widgets/sticky-header",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/markdown",
         "destination": "/resources/ui/widgets/built-in-widgets/markdown",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/markdown",
+        "destination": "/resources/ui/widgets/built-in-widgets/markdown",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/base-elements/draggable-+-dragtarget",
         "destination": "/resources/ui/widgets/built-in-widgets/draggable",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/draggable",
+        "destination": "/resources/ui/widgets/built-in-widgets/draggable",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/form-elements-1",
         "destination": "/resources/forms",
@@ -678,26 +768,51 @@
         "destination": "/resources/ui/widgets/built-in-widgets/pincode",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/pincode",
+        "destination": "/resources/ui/widgets/built-in-widgets/pincode",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/form-elements-1/slider",
         "destination": "/resources/ui/widgets/built-in-widgets/slider",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/slider",
+        "destination": "/resources/ui/widgets/built-in-widgets/slider",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/form-elements-1/ratingbar",
         "destination": "/resources/ui/widgets/built-in-widgets/ratingbar",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/ratingbar",
+        "destination": "/resources/ui/widgets/built-in-widgets/ratingbar",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/form-elements-1/creditcardform",
         "destination": "/resources/ui/widgets/built-in-widgets/credit-card-form",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/credit-card-form",
+        "destination": "/resources/ui/widgets/built-in-widgets/credit-card-form",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/form-elements-1/countcontroller",
         "destination": "/resources/ui/widgets/built-in-widgets/count-controller",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/count-controller",
+        "destination": "/resources/ui/widgets/built-in-widgets/count-controller",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/form-elements-1/choicechips",
         "destination": "/resources/forms/choice-chips",
@@ -723,6 +838,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/signature/",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/signature/",
+        "destination": "/resources/ui/widgets/built-in-widgets/signature/",
+        "type": 301
+      },
       {
         "source": "/widgets-and-components/widgets/widget-commonalities",
         "destination": "/resources/ui/widgets/widget-commonalities",
@@ -1003,6 +1123,11 @@
         "destination": "/resources/ui/widgets/built-in-widgets/barcode",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/barcode",
+        "destination": "/resources/ui/widgets/built-in-widgets/barcode",
+        "type": 301
+      },
       {
         "source": "/actions/actions/widget-ui-interactions/launch-map",
         "destination": "/integrations/maps/launch-map",
@@ -1058,21 +1183,41 @@
         "destination": "/resources/ui/widgets/built-in-widgets/signature/#2-upload-signature-action",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/signature/#2-upload-signature-action",
+        "destination": "/resources/ui/widgets/built-in-widgets/signature/#2-upload-signature-action",
+        "type": 301
+      },
       {
         "source": "/actions/actions/widget-ui-interactions/clear-signatures",
         "destination": "/resources/ui/widgets/built-in-widgets/signature/#clear-signature-action",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/signature/#clear-signature-action",
+        "destination": "/resources/ui/widgets/built-in-widgets/signature/#clear-signature-action",
+        "type": 301
+      },
       {
         "source": "/actions/actions/widget-ui-interactions/control-swipeable-stack",
         "destination": "/resources/ui/widgets/built-in-widgets/swipeable-stack/#control-swipeable-stack-action",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/swipeable-stack/#control-swipeable-stack-action",
+        "destination": "/resources/ui/widgets/built-in-widgets/swipeable-stack/#control-swipeable-stack-action",
+        "type": 301
+      },
       {
         "source": "/actions/actions/widget-ui-interactions/control-carousel",
         "destination": "/resources/ui/widgets/built-in-widgets/carousel/#control-carousel-action",
         "type": 301
       },
+      {
+        "source": "/resources/ui/components/built-in-components/carousel/#control-carousel-action",
+        "destination": "/resources/ui/widgets/built-in-widgets/carousel/#control-carousel-action",
+        "type": 301
+      },
       {
         "source": "/concepts/alerts-notification/",
         "destination": "/concepts/alerts-notification/alert-dialog",