diff --git a/sites/org/components/wrappers/page.mjs b/sites/org/components/wrappers/page.mjs
deleted file mode 100644
index ae46cae3348..00000000000
--- a/sites/org/components/wrappers/page.mjs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Dependencies
-import React, { useState, useEffect } from 'react'
-import { useSwipeable } from 'react-swipeable'
-import { useHotkeys } from 'react-hotkeys-hook'
-// Hooks
-import { useTheme } from 'shared/hooks/use-theme.mjs'
-// Components
-import { LayoutWrapper, ns as layoutNs } from 'site/components/wrappers/layout.mjs'
-import { DocsLayout } from 'site/components/layouts/docs.mjs'
-import { Feeds } from 'site/components/feeds.mjs'
-
-export const ns = [...layoutNs]
-
-/* This component should wrap all page content */
-export const PageWrapper = ({
-  title = 'FIXME: No title set',
-  noSearch = false,
-  app = false,
-  layout = DocsLayout,
-  footer = true,
-  crumbs = false,
-  children = [],
-}) => {
-  /*
-   * This forces a re-render upon initial bootstrap of the app
-   * This is needed to avoid hydration errors because theme can't be set reliably in SSR
-   */
-  const [theme, setTheme] = useTheme()
-  const [currentTheme, setCurrentTheme] = useState()
-  useEffect(() => setCurrentTheme(theme), [currentTheme, theme])
-
-  /*
-   * Swipe handling for the entire site
-   */
-  const swipeHandlers = useSwipeable({
-    onSwipedLeft: () => (app.primaryMenu ? app.setPrimaryMenu(false) : null),
-    onSwipedRight: () => (app.primaryMenu ? null : app.setPrimaryMenu(true)),
-    trackMouse: true,
-  })
-
-  /*
-   * Hotkeys (keyboard actions)
-   */
-  // Trigger search with /
-  useHotkeys('/', (evt) => {
-    evt.preventDefault()
-    setSearch(true)
-  })
-
-  // Always close modal when Escape key is hit
-  useHotkeys('esc', (evt) => {
-    evt.preventDefault()
-    app.setModal(false)
-  })
-
-  // Search state
-  const [search, setSearch] = useState(false)
-
-  // Helper object to pass props down (keeps things DRY)
-  const childProps = {
-    app: app,
-    title: title,
-    footer,
-    crumbs: crumbs,
-    search,
-    setSearch,
-    toggleSearch: () => setSearch(!search),
-    noSearch: noSearch,
-  }
-
-  // Make layout prop into a (uppercase) component
-  const Layout = layout
-
-  // Return wrapper
-  return (
-    <div
-      ref={swipeHandlers.ref}
-      onMouseDown={swipeHandlers.onMouseDown}
-      data-theme={currentTheme} // This facilitates CSS selectors
-      key={currentTheme} // This forces the data-theme update
-    >
-      <Feeds />
-      <LayoutWrapper {...childProps}>
-        {Layout ? <Layout {...childProps}>{children}</Layout> : children}
-      </LayoutWrapper>
-      {app.modal ? (
-        <div
-          className={`fixed top-0 left-0 m-0 p-0 shadow drop-shadow-lg w-full h-screen
-              bg-base-100 bg-opacity-90 z-50 hover:cursor-pointer
-              flex flex-row items-center justify-center
-            `}
-          onClick={() => app.setModal(false)}
-        >
-          {app.modal}
-        </div>
-      ) : null}
-    </div>
-  )
-}
diff --git a/sites/org/pages/account/apikeys.mjs b/sites/org/pages/account/apikeys.mjs
index 6e7ac2595f3..04154e9491b 100644
--- a/sites/org/pages/account/apikeys.mjs
+++ b/sites/org/pages/account/apikeys.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as apikeysNs } from 'site/components/account/apikeys.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as apikeysNs } from 'shared/components/account/apikeys.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...apikeysNs, ...authNs, ...pageNs])]
@@ -18,12 +18,12 @@ console.log(namespaces)
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicApikeys = dynamic(
-  () => import('site/components/account/apikeys.mjs').then((mod) => mod.Apikeys),
+  () => import('shared/components/account/apikeys.mjs').then((mod) => mod.Apikeys),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/bio.mjs b/sites/org/pages/account/bio.mjs
index 8bb50187b58..355052a48ca 100644
--- a/sites/org/pages/account/bio.mjs
+++ b/sites/org/pages/account/bio.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as bioNs } from 'site/components/account/bio.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as bioNs } from 'shared/components/account/bio.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...bioNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...bioNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicBio = dynamic(
-  () => import('site/components/account/bio.mjs').then((mod) => mod.BioSettings),
+  () => import('shared/components/account/bio.mjs').then((mod) => mod.BioSettings),
   { ssr: false }
 )
 
@@ -49,6 +49,9 @@ export async function getStaticProps({ locale }) {
   return {
     props: {
       ...(await serverSideTranslations(locale, namespaces)),
+      page: {
+        path: ['account', 'bio'],
+      },
     },
   }
 }
diff --git a/sites/org/pages/account/compare.mjs b/sites/org/pages/account/compare.mjs
index f5e60d99361..04412279521 100644
--- a/sites/org/pages/account/compare.mjs
+++ b/sites/org/pages/account/compare.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as compareNs } from 'site/components/account/compare.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as compareNs } from 'shared/components/account/compare.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...compareNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...compareNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicCompare = dynamic(
-  () => import('site/components/account/compare.mjs').then((mod) => mod.CompareSettings),
+  () => import('shared/components/account/compare.mjs').then((mod) => mod.CompareSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/consent.mjs b/sites/org/pages/account/consent.mjs
index c67df367e9a..6269f00f8c4 100644
--- a/sites/org/pages/account/consent.mjs
+++ b/sites/org/pages/account/consent.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as consentNs } from 'site/components/account/consent.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as consentNs } from 'shared/components/account/consent.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...consentNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...consentNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicConsent = dynamic(
-  () => import('site/components/account/consent.mjs').then((mod) => mod.ConsentSettings),
+  () => import('shared/components/account/consent.mjs').then((mod) => mod.ConsentSettings),
   { ssr: false }
 )
 
@@ -46,10 +46,12 @@ const AccountPage = (props) => {
 export default AccountPage
 
 export async function getStaticProps({ locale }) {
-  console.log(namespaces)
   return {
     props: {
       ...(await serverSideTranslations(locale, namespaces)),
+      page: {
+        path: ['account', 'consent'],
+      },
     },
   }
 }
diff --git a/sites/org/pages/account/control.mjs b/sites/org/pages/account/control.mjs
index 1dfdc75c9d5..c0d208aaddf 100644
--- a/sites/org/pages/account/control.mjs
+++ b/sites/org/pages/account/control.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as controlNs } from 'site/components/account/control.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as controlNs } from 'shared/components/account/control.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...controlNs, ...authNs, ...pageNs])]
@@ -17,25 +17,21 @@ const namespaces = [...new Set([...controlNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicControl = dynamic(
-  () => import('site/components/account/control.mjs').then((mod) => mod.ControlSettings),
+  () => import('shared/components/account/control.mjs').then((mod) => mod.ControlSettings),
   { ssr: false }
 )
 
 const AccountPage = (props) => {
   const app = useApp(props)
   const { t } = useTranslation(namespaces)
-  const crumbs = [
-    [t('yourAccount'), '/account'],
-    [t('control'), '/account/control'],
-  ]
 
   return (
-    <PageWrapper app={app} title={t('control')} crumbs={crumbs}>
+    <PageWrapper app={app} itle={t('control')}>
       <DynamicAuthWrapper app={app}>
         <DynamicControl app={app} title />
       </DynamicAuthWrapper>
@@ -49,6 +45,9 @@ export async function getStaticProps({ locale }) {
   return {
     props: {
       ...(await serverSideTranslations(locale, namespaces)),
+      page: {
+        path: ['account', 'control'],
+      },
     },
   }
 }
diff --git a/sites/org/pages/account/email.mjs b/sites/org/pages/account/email.mjs
index 6a40a2eeff7..541d7a579fc 100644
--- a/sites/org/pages/account/email.mjs
+++ b/sites/org/pages/account/email.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as emailNs } from 'site/components/account/email.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as emailNs } from 'shared/components/account/email.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...emailNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...emailNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicEmail = dynamic(
-  () => import('site/components/account/email.mjs').then((mod) => mod.EmailSettings),
+  () => import('shared/components/account/email.mjs').then((mod) => mod.EmailSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/github.mjs b/sites/org/pages/account/github.mjs
index f320f3e739c..cad34e00c98 100644
--- a/sites/org/pages/account/github.mjs
+++ b/sites/org/pages/account/github.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as githubNs } from 'site/components/account/github.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as githubNs } from 'shared/components/account/github.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...githubNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...githubNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicGithub = dynamic(
-  () => import('site/components/account/github.mjs').then((mod) => mod.GithubSettings),
+  () => import('shared/components/account/github.mjs').then((mod) => mod.GithubSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/img.mjs b/sites/org/pages/account/img.mjs
index 67893e0c683..05da39ed1be 100644
--- a/sites/org/pages/account/img.mjs
+++ b/sites/org/pages/account/img.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as imgNs } from 'site/components/account/img.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as imgNs } from 'shared/components/account/img.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...imgNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...imgNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicImg = dynamic(
-  () => import('site/components/account/img.mjs').then((mod) => mod.ImgSettings),
+  () => import('shared/components/account/img.mjs').then((mod) => mod.ImgSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/index.mjs b/sites/org/pages/account/index.mjs
index 8041f602eef..55ba2186508 100644
--- a/sites/org/pages/account/index.mjs
+++ b/sites/org/pages/account/index.mjs
@@ -5,8 +5,8 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
 
 // Translation namespaces used on this page
 const namespaces = ['account', ...authNs]
@@ -16,12 +16,12 @@ const namespaces = ['account', ...authNs]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicAccountOverview = dynamic(
-  () => import('site/components/account/overview.mjs').then((mod) => mod.AccountOverview),
+  () => import('shared/components/account/overview.mjs').then((mod) => mod.AccountOverview),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/language.mjs b/sites/org/pages/account/language.mjs
index 7bb77e5a7d6..c44091c113d 100644
--- a/sites/org/pages/account/language.mjs
+++ b/sites/org/pages/account/language.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as languageNs } from 'site/components/account/language.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as languageNs } from 'shared/components/account/language.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...languageNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...languageNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicLanguage = dynamic(
-  () => import('site/components/account/language.mjs').then((mod) => mod.LanguageSettings),
+  () => import('shared/components/account/language.mjs').then((mod) => mod.LanguageSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/mfa.mjs b/sites/org/pages/account/mfa.mjs
index 551e45261f0..00e7028439f 100644
--- a/sites/org/pages/account/mfa.mjs
+++ b/sites/org/pages/account/mfa.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as mfaNs } from 'site/components/account/mfa.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as mfaNs } from 'shared/components/account/mfa.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...mfaNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...mfaNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicMfa = dynamic(
-  () => import('site/components/account/mfa.mjs').then((mod) => mod.MfaSettings),
+  () => import('shared/components/account/mfa.mjs').then((mod) => mod.MfaSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/newsletter.mjs b/sites/org/pages/account/newsletter.mjs
index dd29ad96b01..b6fee46c5b5 100644
--- a/sites/org/pages/account/newsletter.mjs
+++ b/sites/org/pages/account/newsletter.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as newsletterNs } from 'site/components/account/newsletter.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as newsletterNs } from 'shared/components/account/newsletter.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...newsletterNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...newsletterNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicNewsletter = dynamic(
-  () => import('site/components/account/newsletter.mjs').then((mod) => mod.NewsletterSettings),
+  () => import('shared/components/account/newsletter.mjs').then((mod) => mod.NewsletterSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/password.mjs b/sites/org/pages/account/password.mjs
index c37d285dbf1..0d95cb3ca50 100644
--- a/sites/org/pages/account/password.mjs
+++ b/sites/org/pages/account/password.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as passwordNs } from 'site/components/account/password.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as passwordNs } from 'shared/components/account/password.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...passwordNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...passwordNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicPassword = dynamic(
-  () => import('site/components/account/password.mjs').then((mod) => mod.PasswordSettings),
+  () => import('shared/components/account/password.mjs').then((mod) => mod.PasswordSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/reload.mjs b/sites/org/pages/account/reload.mjs
index 5b881be89a7..bac3d1c2bbd 100644
--- a/sites/org/pages/account/reload.mjs
+++ b/sites/org/pages/account/reload.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as reloadNs } from 'site/components/account/reload.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as reloadNs } from 'shared/components/account/reload.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...reloadNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...reloadNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicReload = dynamic(
-  () => import('site/components/account/reload.mjs').then((mod) => mod.ReloadAccount),
+  () => import('shared/components/account/reload.mjs').then((mod) => mod.ReloadAccount),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/sets/index.mjs b/sites/org/pages/account/sets/index.mjs
index 1512ccf2edf..0941289b9a2 100644
--- a/sites/org/pages/account/sets/index.mjs
+++ b/sites/org/pages/account/sets/index.mjs
@@ -5,9 +5,9 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Hooks
 import { useApp } from 'shared/hooks/use-app.mjs'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as apikeysNs } from 'site/components/account/apikeys.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as apikeysNs } from 'shared/components/account/apikeys.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...apikeysNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...apikeysNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicApikeys = dynamic(
-  () => import('site/components/account/apikeys.mjs').then((mod) => mod.Apikeys),
+  () => import('shared/components/account/apikeys.mjs').then((mod) => mod.Apikeys),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/units.mjs b/sites/org/pages/account/units.mjs
index 83e8adedb16..4e33ce67c43 100644
--- a/sites/org/pages/account/units.mjs
+++ b/sites/org/pages/account/units.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as unitsNs } from 'site/components/account/imperial.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as unitsNs } from 'shared/components/account/imperial.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...unitsNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...unitsNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicImperial = dynamic(
-  () => import('site/components/account/imperial.mjs').then((mod) => mod.ImperialSettings),
+  () => import('shared/components/account/imperial.mjs').then((mod) => mod.ImperialSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/account/username.mjs b/sites/org/pages/account/username.mjs
index 95fca318e5b..85e48dc5893 100644
--- a/sites/org/pages/account/username.mjs
+++ b/sites/org/pages/account/username.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as usernameNs } from 'site/components/account/username.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as usernameNs } from 'shared/components/account/username.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...usernameNs, ...authNs, ...pageNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set([...usernameNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicUsername = dynamic(
-  () => import('site/components/account/username.mjs').then((mod) => mod.UsernameSettings),
+  () => import('shared/components/account/username.mjs').then((mod) => mod.UsernameSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/confirm/emailchange/[...confirmation].mjs b/sites/org/pages/confirm/emailchange/[...confirmation].mjs
index a3805db0a6c..1f6232ae09e 100644
--- a/sites/org/pages/confirm/emailchange/[...confirmation].mjs
+++ b/sites/org/pages/confirm/emailchange/[...confirmation].mjs
@@ -9,11 +9,11 @@ import { useTranslation } from 'next-i18next'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import Link from 'next/link'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
 import { Spinner } from 'shared/components/spinner.mjs'
 import { Robot } from 'shared/components/robot/index.mjs'
-import { BackToAccountButton } from 'site/components/account/shared.mjs'
+import { BackToAccountButton } from 'shared/components/account/shared.mjs'
 import { HelpIcon } from 'shared/components/icons.mjs'
 
 // Translation namespaces used on this page
diff --git a/sites/org/pages/confirm/signin/[...confirmation].mjs b/sites/org/pages/confirm/signin/[...confirmation].mjs
index fe0eaf8e97a..36cba38ddf1 100644
--- a/sites/org/pages/confirm/signin/[...confirmation].mjs
+++ b/sites/org/pages/confirm/signin/[...confirmation].mjs
@@ -8,7 +8,7 @@ import { useTranslation } from 'next-i18next'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import Link from 'next/link'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
 import { WelcomeWrapper } from 'site/components/wrappers/welcome.mjs'
 import { Spinner } from 'shared/components/spinner.mjs'
diff --git a/sites/org/pages/confirm/signup/[...confirmation].mjs b/sites/org/pages/confirm/signup/[...confirmation].mjs
index fc2b346ccd1..befe0256434 100644
--- a/sites/org/pages/confirm/signup/[...confirmation].mjs
+++ b/sites/org/pages/confirm/signup/[...confirmation].mjs
@@ -9,7 +9,7 @@ import { useTranslation } from 'next-i18next'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import Link from 'next/link'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
 import { WelcomeWrapper } from 'site/components/wrappers/welcome.mjs'
 import { Spinner } from 'shared/components/spinner.mjs'
diff --git a/sites/org/pages/docs/index.mjs b/sites/org/pages/docs/index.mjs
index 6ec0f91092f..c50daf2b5fa 100644
--- a/sites/org/pages/docs/index.mjs
+++ b/sites/org/pages/docs/index.mjs
@@ -4,7 +4,7 @@ import { useApp } from 'shared/hooks/use-app.mjs'
 import Head from 'next/head'
 import { mdxLoader } from 'shared/mdx/loader.mjs'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs'
 import { ReadMore } from 'shared/components/mdx/read-more.mjs'
 import { jargon } from 'site/jargon.mjs'
diff --git a/sites/org/pages/index.mjs b/sites/org/pages/index.mjs
index f7b68cfdadc..959b3e168c1 100644
--- a/sites/org/pages/index.mjs
+++ b/sites/org/pages/index.mjs
@@ -5,7 +5,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 //import { useTranslation } from 'next-i18next'
 import Head from 'next/head'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { Popout } from 'shared/components/popout.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
 import { PageLink } from 'shared/components/page-link.mjs'
diff --git a/sites/org/pages/profile.mjs b/sites/org/pages/profile.mjs
index 5c12f1346ee..8143e4d031d 100644
--- a/sites/org/pages/profile.mjs
+++ b/sites/org/pages/profile.mjs
@@ -6,11 +6,11 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
 import { Popout } from 'shared/components/popout.mjs'
 import { PageLink } from 'shared/components/page-link.mjs'
-import { BackToAccountButton } from 'site/components/account/shared.mjs'
+import { BackToAccountButton } from 'shared/components/account/shared.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set(['account', ...authNs, ...pageNs])]
@@ -20,12 +20,12 @@ const namespaces = [...new Set(['account', ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicAccountProfile = dynamic(
-  () => import('site/components/account/profile.mjs').then((mod) => mod.AccountProfile),
+  () => import('shared/components/account/profile.mjs').then((mod) => mod.AccountProfile),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/signin/index.mjs b/sites/org/pages/signin/index.mjs
index afddd3bb8a2..97e73a95784 100644
--- a/sites/org/pages/signin/index.mjs
+++ b/sites/org/pages/signin/index.mjs
@@ -10,7 +10,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { validateEmail, validateTld } from 'shared/utils.mjs'
 // Components
 import Link from 'next/link'
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
 import { SusiWrapper } from 'site/components/wrappers/susi.mjs'
 import { EmailIcon, KeyIcon, RightIcon, WarningIcon } from 'shared/components/icons.mjs'
diff --git a/sites/org/pages/signup/index.mjs b/sites/org/pages/signup/index.mjs
index 32828ba7d2c..0869e0303a0 100644
--- a/sites/org/pages/signup/index.mjs
+++ b/sites/org/pages/signup/index.mjs
@@ -8,7 +8,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { validateEmail, validateTld } from 'site/utils.mjs'
 // Components
 import Link from 'next/link'
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
 import { SusiWrapper } from 'site/components/wrappers/susi.mjs'
 import { Robot } from 'shared/components/robot/index.mjs'
diff --git a/sites/org/pages/typography.mjs b/sites/org/pages/typography.mjs
index 7c7055827dc..648b05acde0 100644
--- a/sites/org/pages/typography.mjs
+++ b/sites/org/pages/typography.mjs
@@ -1,7 +1,7 @@
 // Hooks
 import { useApp } from 'shared/hooks/use-app.mjs'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { Popout } from 'shared/components/popout.mjs'
 
 const TypographyPage = (props) => {
diff --git a/sites/org/pages/welcome/bio.mjs b/sites/org/pages/welcome/bio.mjs
index e190c4d587e..066b3f89fb5 100644
--- a/sites/org/pages/welcome/bio.mjs
+++ b/sites/org/pages/welcome/bio.mjs
@@ -5,10 +5,10 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as bioNs } from 'site/components/account/bio.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as bioNs } from 'shared/components/account/bio.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...bioNs, ...authNs, ...pageNs])]
@@ -18,11 +18,11 @@ const namespaces = [...new Set([...bioNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 const DynamicBio = dynamic(
-  () => import('site/components/account/bio.mjs').then((mod) => mod.BioSettings),
+  () => import('shared/components/account/bio.mjs').then((mod) => mod.BioSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/welcome/compare.mjs b/sites/org/pages/welcome/compare.mjs
index e833d422e95..284e833c454 100644
--- a/sites/org/pages/welcome/compare.mjs
+++ b/sites/org/pages/welcome/compare.mjs
@@ -5,10 +5,10 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as compareNs } from 'site/components/account/compare.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as compareNs } from 'shared/components/account/compare.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...compareNs, ...authNs, ...pageNs])]
@@ -18,11 +18,11 @@ const namespaces = [...new Set([...compareNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 const DynamicCompare = dynamic(
-  () => import('site/components/account/compare.mjs').then((mod) => mod.CompareSettings),
+  () => import('shared/components/account/compare.mjs').then((mod) => mod.CompareSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/welcome/img.mjs b/sites/org/pages/welcome/img.mjs
index b055d398124..49c50d97bb5 100644
--- a/sites/org/pages/welcome/img.mjs
+++ b/sites/org/pages/welcome/img.mjs
@@ -5,10 +5,10 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as imgNs } from 'site/components/account/img.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as imgNs } from 'shared/components/account/img.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...imgNs, ...authNs, ...pageNs])]
@@ -18,11 +18,11 @@ const namespaces = [...new Set([...imgNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 const DynamicImg = dynamic(
-  () => import('site/components/account/img.mjs').then((mod) => mod.ImgSettings),
+  () => import('shared/components/account/img.mjs').then((mod) => mod.ImgSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/welcome/index.mjs b/sites/org/pages/welcome/index.mjs
index 28b1c1cbbde..e1bf3f38c6c 100644
--- a/sites/org/pages/welcome/index.mjs
+++ b/sites/org/pages/welcome/index.mjs
@@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper } from 'site/components/wrappers/page.mjs'
+import { PageWrapper } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set(['account', ...authNs])]
@@ -17,12 +17,12 @@ const namespaces = [...new Set(['account', ...authNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicControl = dynamic(
-  () => import('site/components/account/control.mjs').then((mod) => mod.ControlSettings),
+  () => import('shared/components/account/control.mjs').then((mod) => mod.ControlSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/welcome/newsletter.mjs b/sites/org/pages/welcome/newsletter.mjs
index a7e777724b9..c4841b94e84 100644
--- a/sites/org/pages/welcome/newsletter.mjs
+++ b/sites/org/pages/welcome/newsletter.mjs
@@ -5,10 +5,10 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as newsletterNs } from 'site/components/account/newsletter.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as newsletterNs } from 'shared/components/account/newsletter.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...newsletterNs, ...authNs, ...pageNs])]
@@ -18,12 +18,12 @@ const namespaces = [...new Set([...newsletterNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 
 const DynamicNewsletter = dynamic(
-  () => import('site/components/account/newsletter.mjs').then((mod) => mod.NewsletterSettings),
+  () => import('shared/components/account/newsletter.mjs').then((mod) => mod.NewsletterSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/welcome/units.mjs b/sites/org/pages/welcome/units.mjs
index 4e581232f0b..eaf733c3bf0 100644
--- a/sites/org/pages/welcome/units.mjs
+++ b/sites/org/pages/welcome/units.mjs
@@ -5,10 +5,10 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as imperialNs } from 'site/components/account/imperial.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as imperialNs } from 'shared/components/account/imperial.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...imperialNs, ...authNs, ...pageNs])]
@@ -18,11 +18,11 @@ const namespaces = [...new Set([...imperialNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 const DynamicImperial = dynamic(
-  () => import('site/components/account/imperial.mjs').then((mod) => mod.ImperialSettings),
+  () => import('shared/components/account/imperial.mjs').then((mod) => mod.ImperialSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/pages/welcome/username.mjs b/sites/org/pages/welcome/username.mjs
index 78b9ecd9f2c..243b9b5117c 100644
--- a/sites/org/pages/welcome/username.mjs
+++ b/sites/org/pages/welcome/username.mjs
@@ -5,10 +5,10 @@ import { useTranslation } from 'next-i18next'
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 // Components
-import { PageWrapper, ns as pageNs } from 'site/components/wrappers/page.mjs'
+import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { ns as authNs } from 'site/components/wrappers/auth/index.mjs'
-import { ns as usernameNs } from 'site/components/account/username.mjs'
+import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
+import { ns as usernameNs } from 'shared/components/account/username.mjs'
 
 // Translation namespaces used on this page
 const namespaces = [...new Set([...usernameNs, ...authNs, ...pageNs])]
@@ -18,11 +18,11 @@ const namespaces = [...new Set([...usernameNs, ...authNs, ...pageNs])]
  * So for these, we run a dynamic import and disable SSR rendering
  */
 const DynamicAuthWrapper = dynamic(
-  () => import('site/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
+  () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper),
   { ssr: false }
 )
 const DynamicUsername = dynamic(
-  () => import('site/components/account/username.mjs').then((mod) => mod.UsernameSettings),
+  () => import('shared/components/account/username.mjs').then((mod) => mod.UsernameSettings),
   { ssr: false }
 )
 
diff --git a/sites/org/components/account/account.en.yaml b/sites/shared/components/account/account.en.yaml
similarity index 100%
rename from sites/org/components/account/account.en.yaml
rename to sites/shared/components/account/account.en.yaml
diff --git a/sites/org/components/account/apikeys.mjs b/sites/shared/components/account/apikeys.mjs
similarity index 97%
rename from sites/org/components/account/apikeys.mjs
rename to sites/shared/components/account/apikeys.mjs
index f8fe1fd1b85..0fc365bdca2 100644
--- a/sites/org/components/account/apikeys.mjs
+++ b/sites/shared/components/account/apikeys.mjs
@@ -285,7 +285,7 @@ export const Apikeys = ({ app }) => {
   const keyAdded = () => setAdded(added + 1)
 
   return (
-    <div>
+    <div className="max-w-xl xl:pl-4">
       {generate ? (
         <NewKey {...{ app, t, setGenerate, backend, toast, keyAdded }} />
       ) : (
@@ -294,14 +294,12 @@ export const Apikeys = ({ app }) => {
           {keys.map((apikey) => (
             <Apikey {...{ app, apikey, t, backend, keyAdded }} key={apikey.id} />
           ))}
-          <div className="max-w-sm">
-            <button
-              className="btn btn-primary w-full capitalize mt-4"
-              onClick={() => setGenerate(true)}
-            >
-              {t('newApikey')}
-            </button>
-          </div>
+          <button
+            className="btn btn-primary w-full capitalize mt-4"
+            onClick={() => setGenerate(true)}
+          >
+            {t('newApikey')}
+          </button>
           <BackToAccountButton loading={app.state.loading} />
           {account.control < 5 ? (
             <Popout tip>
diff --git a/sites/org/components/account/bio.mjs b/sites/shared/components/account/bio.mjs
similarity index 98%
rename from sites/org/components/account/bio.mjs
rename to sites/shared/components/account/bio.mjs
index 2421184e88a..d2cc6d19607 100644
--- a/sites/org/components/account/bio.mjs
+++ b/sites/shared/components/account/bio.mjs
@@ -50,7 +50,7 @@ export const BioSettings = ({ app, title = false, welcome = false }) => {
   const tabProps = { activeTab, setActiveTab, t }
 
   return (
-    <>
+    <div className="max-w-xl xl:pl-4">
       {title ? <h1 className="text-4xl">{t('bioTitle')}</h1> : null}
       <div className="tabs w-full">
         <Tab id="edit" {...tabProps} />
@@ -99,6 +99,6 @@ export const BioSettings = ({ app, title = false, welcome = false }) => {
           ) : null}
         </>
       ) : null}
-    </>
+    </div>
   )
 }
diff --git a/sites/org/components/account/compare.mjs b/sites/shared/components/account/compare.mjs
similarity index 100%
rename from sites/org/components/account/compare.mjs
rename to sites/shared/components/account/compare.mjs
diff --git a/sites/org/components/account/consent.mjs b/sites/shared/components/account/consent.mjs
similarity index 99%
rename from sites/org/components/account/consent.mjs
rename to sites/shared/components/account/consent.mjs
index 465d7bb206f..9b6e33fa976 100644
--- a/sites/org/components/account/consent.mjs
+++ b/sites/shared/components/account/consent.mjs
@@ -116,7 +116,7 @@ export const ConsentSettings = ({ app, title = false }) => {
   )
 
   return (
-    <>
+    <div className="max-w-xl xl:pl-4">
       {title ? <h2 className="text-4xl">{t('privacyMatters')}</h2> : null}
       <p>{t('compliant')}</p>
       <p>{t('consentWhyAnswer')}</p>
@@ -152,6 +152,6 @@ export const ConsentSettings = ({ app, title = false }) => {
           FreeSewing Privacy Notice
         </Link>
       </p>
-    </>
+    </div>
   )
 }
diff --git a/sites/org/components/account/control.mjs b/sites/shared/components/account/control.mjs
similarity index 100%
rename from sites/org/components/account/control.mjs
rename to sites/shared/components/account/control.mjs
diff --git a/sites/org/components/account/email.mjs b/sites/shared/components/account/email.mjs
similarity index 100%
rename from sites/org/components/account/email.mjs
rename to sites/shared/components/account/email.mjs
diff --git a/sites/org/components/account/github.mjs b/sites/shared/components/account/github.mjs
similarity index 100%
rename from sites/org/components/account/github.mjs
rename to sites/shared/components/account/github.mjs
diff --git a/sites/org/components/account/img.mjs b/sites/shared/components/account/img.mjs
similarity index 100%
rename from sites/org/components/account/img.mjs
rename to sites/shared/components/account/img.mjs
diff --git a/sites/org/components/account/imperial.mjs b/sites/shared/components/account/imperial.mjs
similarity index 100%
rename from sites/org/components/account/imperial.mjs
rename to sites/shared/components/account/imperial.mjs
diff --git a/sites/org/components/account/language.mjs b/sites/shared/components/account/language.mjs
similarity index 100%
rename from sites/org/components/account/language.mjs
rename to sites/shared/components/account/language.mjs
diff --git a/sites/org/components/account/links.mjs b/sites/shared/components/account/links.mjs
similarity index 100%
rename from sites/org/components/account/links.mjs
rename to sites/shared/components/account/links.mjs
diff --git a/sites/org/components/account/mfa.mjs b/sites/shared/components/account/mfa.mjs
similarity index 100%
rename from sites/org/components/account/mfa.mjs
rename to sites/shared/components/account/mfa.mjs
diff --git a/sites/org/components/account/newsletter.mjs b/sites/shared/components/account/newsletter.mjs
similarity index 100%
rename from sites/org/components/account/newsletter.mjs
rename to sites/shared/components/account/newsletter.mjs
diff --git a/sites/org/components/account/overview.mjs b/sites/shared/components/account/overview.mjs
similarity index 100%
rename from sites/org/components/account/overview.mjs
rename to sites/shared/components/account/overview.mjs
diff --git a/sites/org/components/account/password.mjs b/sites/shared/components/account/password.mjs
similarity index 100%
rename from sites/org/components/account/password.mjs
rename to sites/shared/components/account/password.mjs
diff --git a/sites/org/components/account/profile.mjs b/sites/shared/components/account/profile.mjs
similarity index 100%
rename from sites/org/components/account/profile.mjs
rename to sites/shared/components/account/profile.mjs
diff --git a/sites/org/components/account/reload.mjs b/sites/shared/components/account/reload.mjs
similarity index 100%
rename from sites/org/components/account/reload.mjs
rename to sites/shared/components/account/reload.mjs
diff --git a/sites/org/components/account/shared.mjs b/sites/shared/components/account/shared.mjs
similarity index 100%
rename from sites/org/components/account/shared.mjs
rename to sites/shared/components/account/shared.mjs
diff --git a/sites/org/components/account/username.mjs b/sites/shared/components/account/username.mjs
similarity index 100%
rename from sites/org/components/account/username.mjs
rename to sites/shared/components/account/username.mjs
diff --git a/sites/org/components/wrappers/auth/auth.en.yaml b/sites/shared/components/wrappers/auth/auth.en.yaml
similarity index 100%
rename from sites/org/components/wrappers/auth/auth.en.yaml
rename to sites/shared/components/wrappers/auth/auth.en.yaml
diff --git a/sites/org/components/wrappers/auth/auth.nl.yaml b/sites/shared/components/wrappers/auth/auth.nl.yaml
similarity index 100%
rename from sites/org/components/wrappers/auth/auth.nl.yaml
rename to sites/shared/components/wrappers/auth/auth.nl.yaml
diff --git a/sites/org/components/wrappers/auth/index.mjs b/sites/shared/components/wrappers/auth/index.mjs
similarity index 100%
rename from sites/org/components/wrappers/auth/index.mjs
rename to sites/shared/components/wrappers/auth/index.mjs