diff --git a/package.json b/package.json
index 016a42c6a6..42213ee14a 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,10 @@
   },
   "devDependencies": {
     "@octokit/rest": "^19.0.7",
-    "@patternfly/patternfly": "^6.5.0-prerelease.23",
-    "@patternfly/react-code-editor": "^6.5.0-prerelease.11",
-    "@patternfly/react-core": "^6.5.0-prerelease.11",
-    "@patternfly/react-table": "^6.5.0-prerelease.11",
+    "@patternfly/patternfly": "^6.5.0-prerelease.27",
+    "@patternfly/react-code-editor": "^6.5.0-prerelease.13",
+    "@patternfly/react-core": "^6.5.0-prerelease.13",
+    "@patternfly/react-table": "^6.5.0-prerelease.13",
     "@rspack/cli": "^1.5.6",
     "@rspack/core": "^1.5.6",
     "@rspack/dev-server": "^1.1.4",
@@ -65,8 +65,9 @@
     "ip": ">=2.0.0",
     "http-cache-semantics": ">=4.1.1",
     "nanoid": "3.3.8",
-    "@patternfly/react-code-editor": "^6.5.0-prerelease.11",
-    "@patternfly/react-core": "^6.5.0-prerelease.11",
-    "@patternfly/react-table": "^6.5.0-prerelease.11"
+    "@patternfly/react-code-editor": "^6.5.0-prerelease.13",
+    "@patternfly/react-core": "^6.5.0-prerelease.13",
+    "@patternfly/react-table": "^6.5.0-prerelease.13",
+    "monaco-editor": "0.54.0"
   }
 }
diff --git a/packages/documentation-framework/components/example/exampleToolbar.jsx b/packages/documentation-framework/components/example/exampleToolbar.jsx
index f6b9fd95ad..bd7fdfc32b 100644
--- a/packages/documentation-framework/components/example/exampleToolbar.jsx
+++ b/packages/documentation-framework/components/example/exampleToolbar.jsx
@@ -195,6 +195,16 @@ export const ExampleToolbar = ({
   // TODO: check if worth adding react, patternfly, and example types
   // https://microsoft.github.io/monaco-editor/api/interfaces/monaco.languages.typescript.languageservicedefaults.html#addextralib
   const onEditorDidMount = (_editor, monaco) => {
+    // Configure Monaco environment for web workers (required for Monaco 0.54+)
+    if (typeof window !== 'undefined' && !window.MonacoEnvironment) {
+      window.MonacoEnvironment = {
+        getWorker() {
+          // Return empty worker since we disable all diagnostics below anyway
+          return new Worker(URL.createObjectURL(new Blob([''], { type: 'application/javascript' })));
+        }
+      };
+    }
+
     monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
       jsx: true,
       ...monaco.languages.typescript.typescriptDefaults.getCompilerOptions()
diff --git a/packages/documentation-framework/components/footer/footer.js b/packages/documentation-framework/components/footer/footer.js
index eee60b653c..b265e07553 100644
--- a/packages/documentation-framework/components/footer/footer.js
+++ b/packages/documentation-framework/components/footer/footer.js
@@ -30,68 +30,12 @@ export const Footer = ({ isDarkTheme }) => (
           <Grid className="pf-v6-u-py-xl">
             <GridItem
               sm={6}
-              md={4}
+              md={6}
               className="pf-v6-u-ml-md pf-v6-u-ml-0-on-md pf-v6-u-mb-xl pf-v6-u-mb-0-on-md"
-            >
-              <p className="ws-org-pfsite-footer-menu-list-title">What's new</p>
-              <nav aria-label="Quick Links">
-                <List isPlain className="ws-org-pfsite-footer-menu-list">
-                  <ListItem className="ws-org-pfsite-footer-menu-list-item">
-                    <Link
-                      className="ws-org-pfsite-footer-menu-link"
-                      to="/get-started/upgrade"
-                      aria-label="Latest PatternFly upgrade guide"
-                    >
-                      Upgrade
-                    </Link>
-                  </ListItem>
-                  <ListItem className="ws-org-pfsite-footer-menu-list-item">
-                    <Link
-                      className="ws-org-pfsite-footer-menu-link"
-                      to="/get-started/release-highlights/"
-                      aria-label="PatternFly release highlights"
-                    >
-                      Releases
-                    </Link>
-                  </ListItem>
-                  <ListItem className="ws-org-pfsite-footer-menu-list-item">
-                    <Link
-                      className="ws-org-pfsite-footer-menu-link"
-                      to="/patternfly-ai/about-ai"
-                      aria-label="PatternFly's new AI resources"
-                    >
-                      PatternFly AI
-                    </Link>
-                  </ListItem>
-                  <ListItem className="ws-org-pfsite-footer-menu-list-item">
-                    <Link
-                      className="ws-org-pfsite-footer-menu-link"
-                      to="/tokens/about-tokens"
-                      aria-label="PatternFly's new token system"
-                    >
-                      Tokens
-                    </Link>
-                  </ListItem>
-                </List>
-              </nav>
-            </GridItem>
-            <GridItem
-              sm={6}
-              md={4}
-              className="pf-v6-u-mt-lg pf-v6-u-mt-0-on-sm pf-v6-u-ml-md pf-v6-u-ml-0-on-md pf-v6-u-mb-xl pf-v6-u-mb-0-on-md"
             >
               <p className="ws-org-pfsite-footer-menu-list-title">Contribute</p>
               <nav aria-label="Contribute">
                 <List isPlain className="ws-org-pfsite-footer-menu-list">
-                  <ListItem className="ws-org-pfsite-footer-menu-list-item">
-                    <Link
-                      className="ws-org-pfsite-footer-menu-link"
-                      to="/get-started/about-patternfly"
-                      aria-label="Learn about PatternFly"
-                    >
-                      About PatternFly
-                    </Link>
-                  </ListItem>
                   <ListItem className="ws-org-pfsite-footer-menu-list-item">
                     <Link
                       className="ws-org-pfsite-footer-menu-link"
@@ -101,22 +45,13 @@ export const Footer = ({ isDarkTheme }) => (
                       Code of conduct
                     </Link>
                   </ListItem>
-                  <ListItem className="ws-org-pfsite-footer-menu-list-item">
-                    <Link
-                      className="ws-org-pfsite-footer-menu-link"
-                      to="/get-started/contribute"
-                      aria-label="Learn how to contribute to PatternFly"
-                    >
-                      Contribute
-                    </Link>
-                  </ListItem>
                 </List>
               </nav>
             </GridItem>
             <GridItem
               sm={6}
-              md={4}
-              className="pf-v6-u-mt-lg pf-v6-u-mt-0-on-md pf-v6-u-ml-md pf-v6-u-ml-0-on-md"
+              md={6}
+              className="pf-v6-u-mt-lg pf-v6-u-mt-0-on-sm pf-v6-u-ml-md pf-v6-u-ml-0-on-md"
             >
               <p className="ws-org-pfsite-footer-menu-list-title">Community</p>
               <nav aria-label="Stay in touch">
@@ -138,7 +73,7 @@ export const Footer = ({ isDarkTheme }) => (
                       target="top"
                       aria-label="Read the PatternFly blog"
                     >
-                      Blog
+                      Medium
                     </Link>
                   </ListItem>
                   <ListItem className="ws-org-pfsite-footer-menu-list-item">
@@ -167,7 +102,7 @@ export const Footer = ({ isDarkTheme }) => (
                       target="top"
                       aria-label="Visit the PatternFly discussion forum"
                     >
-                      Discussions
+                      GitHub Discussions
                     </Link>
                   </ListItem>
                 </List>
diff --git a/packages/documentation-framework/components/index.js b/packages/documentation-framework/components/index.js
index 2bedb87e93..5d255dbffa 100644
--- a/packages/documentation-framework/components/index.js
+++ b/packages/documentation-framework/components/index.js
@@ -5,6 +5,7 @@ export * from './example/example';
 export * from './footer/footer';
 export * from './gdprBanner/gdprBanner';
 export * from './propsTable/propsTable';
+export * from './navAnnouncementBanner/navAnnouncementBanner';
 export * from './sideNav/sideNav';
 export * from './topNav/topNav';
 export * from './link/link';
diff --git a/packages/documentation-framework/components/navAnnouncementBanner/navAnnouncementBanner.css b/packages/documentation-framework/components/navAnnouncementBanner/navAnnouncementBanner.css
new file mode 100644
index 0000000000..9004a33e7d
--- /dev/null
+++ b/packages/documentation-framework/components/navAnnouncementBanner/navAnnouncementBanner.css
@@ -0,0 +1,20 @@
+.ws-nav-announcement-banner-container {
+    position: fixed;
+    top: 20px;
+    left: 0;
+    right: 0;
+    width: 100%;
+    z-index: 300;
+    display: flex;
+    justify-content: center;
+    padding: 0 var(--pf-t--global--spacer--xl);
+    pointer-events: none;
+  }
+  
+  .ws-nav-announcement-banner {
+    max-width: 85vw;
+    width: 100%;
+    box-shadow: var(--pf-t--global--box-shadow--md);
+    pointer-events: auto;
+  }
+  
\ No newline at end of file
diff --git a/packages/documentation-framework/components/navAnnouncementBanner/navAnnouncementBanner.js b/packages/documentation-framework/components/navAnnouncementBanner/navAnnouncementBanner.js
new file mode 100644
index 0000000000..4697912217
--- /dev/null
+++ b/packages/documentation-framework/components/navAnnouncementBanner/navAnnouncementBanner.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
+import './navAnnouncementBanner.css';
+
+export const NavAnnouncementBanner = () => {
+  const initialBannerOpen = typeof window !== 'undefined' && window.localStorage && !localStorage.getItem('nav-announcement-banner-closed');
+  const [ isBannerOpen, setBannerOpen ] = React.useState(initialBannerOpen);
+
+  const closeBanner = () => {
+    localStorage.setItem('nav-announcement-banner-closed', 'true');
+    setBannerOpen(false);
+  }
+
+  return !isBannerOpen ? null : (
+    <div className="ws-nav-announcement-banner-container">
+      <Alert
+        variant="info"
+        isInline
+        actionClose={<AlertActionCloseButton onClose={closeBanner} />}
+        className="ws-nav-announcement-banner"
+        title={<>We've redesigned our website's navigation menu to make it easier to find the information you need. Learn more about the changes on <a href="https://medium.com/patternfly" target="_blank" rel="noopener noreferrer">Medium</a> and share any thoughts in our <a href="https://www.feedback.redhat.com/jfe/form/SV_9MKBjq8H7muINMy" target="_blank" rel="noopener noreferrer">user feedback survey</a>.</>}
+      />
+    </div>
+  );
+}
diff --git a/packages/documentation-framework/components/sideNav/sideNav.js b/packages/documentation-framework/components/sideNav/sideNav.js
index 3ea50cc885..c2837d1dd3 100644
--- a/packages/documentation-framework/components/sideNav/sideNav.js
+++ b/packages/documentation-framework/components/sideNav/sideNav.js
@@ -16,8 +16,8 @@ import { css } from '@patternfly/react-styles';
 import { Location } from '@reach/router';
 
 const DIVIDER_STYLES = {
-  marginTop: 'var(--pf-t--global--spacer--md)',
-  marginBottom: 'var(--pf-t--global--spacer--md)'
+  marginTop: 'var(--pf-t--global--spacer--xs)',
+  marginBottom: 'var(--pf-t--global--spacer--xs)'
 };
 import { makeSlug } from '../../helpers';
 import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_xl';
diff --git a/packages/documentation-framework/layouts/sideNavLayout/sideNavLayout.js b/packages/documentation-framework/layouts/sideNavLayout/sideNavLayout.js
index acea2aae37..38b76252ef 100644
--- a/packages/documentation-framework/layouts/sideNavLayout/sideNavLayout.js
+++ b/packages/documentation-framework/layouts/sideNavLayout/sideNavLayout.js
@@ -27,7 +27,7 @@ import {
 } from '@patternfly/react-core';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import GithubIcon from '@patternfly/react-icons/dist/esm/icons/github-icon';
-import { SideNav, TopNav, GdprBanner, ThemeSelector } from '../../components';
+import { SideNav, TopNav, GdprBanner, NavAnnouncementBanner, ThemeSelector } from '../../components';
 import staticVersions from '../../versions.json';
 import { Footer } from '@patternfly/documentation-framework/components';
 import { useTheme, THEME_TYPES } from '../../hooks/useTheme';
@@ -363,7 +363,10 @@ export const SideNavLayout = ({ children, groupedRoutes, navOpen: navOpenProp })
           {children}
           {process.env.hasFooter && <Footer isDarkTheme={isDarkTheme} />}
         </Page>
-        <div id="ws-page-banners">{hasGdprBanner && <GdprBanner />}</div>
+        <div id="ws-page-banners">
+          <NavAnnouncementBanner />
+          {hasGdprBanner && <GdprBanner />}
+        </div>
       </RtlContext.Provider>
     </React.Fragment>
   );
diff --git a/packages/documentation-framework/package.json b/packages/documentation-framework/package.json
index a26eba42f2..1bf15e6ba6 100644
--- a/packages/documentation-framework/package.json
+++ b/packages/documentation-framework/package.json
@@ -66,10 +66,10 @@
     "webpack-merge": "5.8.0"
   },
   "peerDependencies": {
-    "@patternfly/patternfly": "^6.5.0-prerelease.23",
-    "@patternfly/react-code-editor": "^6.5.0-prerelease.11",
-    "@patternfly/react-core": "^6.5.0-prerelease.11",
-    "@patternfly/react-table": "^6.5.0-prerelease.11",
+    "@patternfly/patternfly": "^6.5.0-prerelease.27",
+    "@patternfly/react-code-editor": "^6.5.0-prerelease.13",
+    "@patternfly/react-core": "^6.5.0-prerelease.13",
+    "@patternfly/react-table": "^6.5.0-prerelease.13",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },
diff --git a/packages/documentation-framework/pages/404/index.js b/packages/documentation-framework/pages/404/index.js
index 6a964369b6..b1f8afb765 100644
--- a/packages/documentation-framework/pages/404/index.js
+++ b/packages/documentation-framework/pages/404/index.js
@@ -77,7 +77,7 @@ const Page404 = () => {
           body="Learn about designing and developing with PatternFly."
           link={{
             text: 'View getting started resources',
-            to: '/get-started/about-patternfly',
+            to: '/about-us',
           }}
         />
         <Card404
diff --git a/packages/documentation-framework/routes.js b/packages/documentation-framework/routes.js
index 6593aa5916..55e5ce91b6 100644
--- a/packages/documentation-framework/routes.js
+++ b/packages/documentation-framework/routes.js
@@ -106,6 +106,7 @@ const getDefaultDesignGuidelines = ({ id, section, slug, title }) => {
     section,
     slug: `${slug}/design-guidelines`,
     source: 'design-guidelines',
+    tabName: 'design-guidelines',
     title,
     Component
   };
diff --git a/packages/documentation-framework/scripts/webpack/webpack.base.config.js b/packages/documentation-framework/scripts/webpack/webpack.base.config.js
index 2814fede7b..4cd66a5c16 100644
--- a/packages/documentation-framework/scripts/webpack/webpack.base.config.js
+++ b/packages/documentation-framework/scripts/webpack/webpack.base.config.js
@@ -144,6 +144,9 @@ module.exports = (_env, argv) => {
         patterns: [{ from: path.join(__dirname, '../../assets'), to: 'assets' }]
       })
     ],
-    stats: 'minimal'
+    stats: 'minimal',
+    performance: {
+      hints: false // Disable performance hints to avoid [object Object] warnings
+    }
   };
 };
diff --git a/packages/documentation-framework/scripts/webpack/webpack.client.config.js b/packages/documentation-framework/scripts/webpack/webpack.client.config.js
index c5663d144f..bff4a87ebe 100644
--- a/packages/documentation-framework/scripts/webpack/webpack.client.config.js
+++ b/packages/documentation-framework/scripts/webpack/webpack.client.config.js
@@ -125,9 +125,12 @@ const clientConfig = async (env, argv) => {
       new rspack.DefinePlugin({
         'process.env.PRERENDER': false,
       }),
-      new rspack.CssExtractRspackPlugin(!isProd ? {} : {
+      new rspack.CssExtractRspackPlugin(!isProd ? {
+        ignoreOrder: true // Suppress CSS order warnings in dev mode
+      } : {
         filename: 'css/[name].[contenthash].css',
         chunkFilename: 'css/[name].[contenthash].css',
+        ignoreOrder: true // Suppress CSS order warnings (Monaco vs highlight.js conflicts)
       }),
       new rspack.CopyRspackPlugin({
         patterns: [
diff --git a/packages/documentation-framework/templates/mdx.js b/packages/documentation-framework/templates/mdx.js
index be50ce6a97..b008c9f4a6 100644
--- a/packages/documentation-framework/templates/mdx.js
+++ b/packages/documentation-framework/templates/mdx.js
@@ -81,7 +81,7 @@ const MDXChildTemplate = ({ Component, source, toc = [], index = 0, id }) => {
             Slack
           </a>
           . To learn more about the process, visit our{' '}
-          <Link to="/get-started/about-patternfly#beta-components">about page</Link> or our{' '}
+          <Link to="/about-us#beta-features">about page</Link> or our{' '}
           <a href="https://github.com/patternfly/patternfly-org/tree/main/beta-component-promotion">Beta components</a>{' '}
           page on GitHub.
         </InlineAlert>
diff --git a/packages/documentation-framework/versions.json b/packages/documentation-framework/versions.json
index 53f1f13a83..ed7d34fe56 100644
--- a/packages/documentation-framework/versions.json
+++ b/packages/documentation-framework/versions.json
@@ -5,25 +5,25 @@
       "date": "2025-11-06",
       "latest": true,
       "versions": {
-        "@patternfly/patternfly": "6.5.0-prerelease.23",
+        "@patternfly/patternfly": "6.5.0-prerelease.27",
         "@patternfly/react-catalog-view-extension": "6.2.0",
-        "@patternfly/react-charts": "8.5.0-prerelease.4",
-        "@patternfly/react-code-editor": "6.5.0-prerelease.11",
-        "@patternfly/react-component-groups": "6.4.0",
-        "@patternfly/react-core": "6.5.0-prerelease.11",
+        "@patternfly/react-charts": "8.5.0-prerelease.6",
+        "@patternfly/react-code-editor": "6.5.0-prerelease.13",
+        "@patternfly/react-component-groups": "6.4.0-prerelease.6",
+        "@patternfly/react-core": "6.5.0-prerelease.13",
         "@patternfly/react-drag-drop": "6.5.0-prerelease.11",
         "@patternfly/react-icons": "6.5.0-prerelease.4",
         "@patternfly/react-log-viewer": "6.3.0",
         "@patternfly/react-styles": "6.5.0-prerelease.4",
-        "@patternfly/react-table": "6.5.0-prerelease.11",
+        "@patternfly/react-table": "6.5.0-prerelease.13",
         "@patternfly/react-tokens": "6.5.0-prerelease.4",
-        "@patternfly/react-topology": "6.4.0",
+        "@patternfly/react-topology": "6.5.0-prerelease.2",
         "@patternfly/react-user-feedback": "6.2.0",
         "@patternfly/react-console": "6.1.0",
         "@patternfly/quickstarts": "6.4.0",
         "@patternfly/react-virtualized-extension": "6.1.0",
         "@patternfly/react-templates": "6.5.0-prerelease.11",
-        "@patternfly/chatbot": "6.5.0-prerelease.10",
+        "@patternfly/chatbot": "6.5.0-prerelease.18",
         "@patternfly/react-data-view": "6.4.0"
       }
     },
diff --git a/packages/documentation-site/package.json b/packages/documentation-site/package.json
index 976799f08a..0061918a10 100644
--- a/packages/documentation-site/package.json
+++ b/packages/documentation-site/package.json
@@ -10,7 +10,7 @@
     "build": "yarn build:ts && pf-docs-framework build all",
     "build:server": "pf-docs-framework build server",
     "build:client": "pf-docs-framework build client",
-    "build:ts": "tsc --project patternfly-docs/content/design-guidelines/styles/motion/tsconfig.json && tsc --project patternfly-docs/content/demos/Compass/tsconfig.json",
+    "build:ts": "tsc --project patternfly-docs/content/foundations-and-styles/styles/motion/tsconfig.json && tsc --project patternfly-docs/content/AI/Compass/tsconfig.json",
     "clean": "rimraf -rf .cache public size-plugin.json patternfly-docs/generated/**/*.js",
     "develop": "yarn build:ts && pf-docs-framework start",
     "generate": "pf-docs-framework generate",
@@ -18,18 +18,18 @@
     "screenshots": "pf-docs-framework screenshots"
   },
   "dependencies": {
-    "@patternfly/chatbot": "6.5.0-prerelease.10",
-    "@patternfly/design-tokens": "1.14.4",
+    "@patternfly/chatbot": "6.5.0-prerelease.18",
+    "@patternfly/design-tokens": "1.14.5",
     "@patternfly/documentation-framework": "workspace:*",
     "@patternfly/quickstarts": "6.4.0",
     "@patternfly/react-catalog-view-extension": "6.3.0",
-    "@patternfly/react-charts": "8.5.0-prerelease.4",
-    "@patternfly/react-component-groups": "6.4.0",
+    "@patternfly/react-charts": "8.5.0-prerelease.6",
+    "@patternfly/react-component-groups": "6.4.0-prerelease.6",
     "@patternfly/react-console": "6.1.0",
     "@patternfly/react-data-view": "6.4.0",
-    "@patternfly/react-docs": "7.5.0-prerelease.12",
+    "@patternfly/react-docs": "7.5.0-prerelease.14",
     "@patternfly/react-log-viewer": "6.3.0",
-    "@patternfly/react-topology": "6.4.0",
+    "@patternfly/react-topology": "6.5.0-prerelease.2",
     "@patternfly/react-user-feedback": "6.2.0",
     "@patternfly/react-virtualized-extension": "6.1.0",
     "@xyflow/react": "^12.9.0",
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/.gitignore b/packages/documentation-site/patternfly-docs/content/AI/Compass/.gitignore
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/.gitignore
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/.gitignore
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/Compass.md b/packages/documentation-site/patternfly-docs/content/AI/Compass/Compass.md
similarity index 89%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/Compass.md
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/Compass.md
index 408421b8e3..a50d8f6223 100644
--- a/packages/documentation-site/patternfly-docs/content/demos/Compass/Compass.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/Compass/Compass.md
@@ -1,6 +1,7 @@
 ---
 id: Compass
-section: PatternFly-AI
+section: AI
+source: org-demos
 subsection: Generative UIs
 ---
 
@@ -46,8 +47,8 @@ To facilitate building a compass layout, there are several useful variants and p
 - `isNav` on [Tabs](/components/tabs#tabs-used-for-site-navigation). This flag enables a new styling of `Tabs` to be used as a top site navigation.
 - `isCircle` on [Button](/components/button#circle-buttons) and [MenuToggle](/components/menus/menu-toggle#plain-circle-toggle). This flag sets a border radius on the `Button` and `MenuToggle`, allowing buttons and plain icon menu toggles to be circular and typical menu toggles to be a pill shape.
 - `isPill` on [Drawer](/components/drawer#pill). This flag sets a border radius and inset on the `Drawer`, giving it a more floating look.
-- `isThinking` or `pf-v6-m-thinking` on `CompassPanel` and [MessageBar](/patternfly-ai/chatbot/ui/#message-bar-with-ai-indicator-styles). This prop, or class name, may be set to turn on a pulsing color animation around the component.
-- `hasAiIndicator` or `pf-v6-m-ai-indicator` on [MessageBar](/patternfly-ai/chatbot/ui/#message-bar-with-ai-indicator-styles). This prop, or class name, may be set to enable a gradient border around the component.
+- `isThinking` or `pf-v6-m-thinking` on `CompassPanel` and [MessageBar](/AI/chatbot/ui/#message-bar-with-ai-indicator-styles). This prop, or class name, may be set to turn on a pulsing color animation around the component.
+- `hasAiIndicator` or `pf-v6-m-ai-indicator` on [MessageBar](/AI/chatbot/ui/#message-bar-with-ai-indicator-styles). This prop, or class name, may be set to enable a gradient border around the component.
 
 ### Card and data view layout
 
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/CompassIntegrationsDemo.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/CompassIntegrationsDemo.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/CompassIntegrationsDemo.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/CompassIntegrationsDemo.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/CompassReactFlowDemo.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/CompassReactFlowDemo.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/CompassReactFlowDemo.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/CompassReactFlowDemo.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/ReactFlow.md b/packages/documentation-site/patternfly-docs/content/AI/Compass/ReactFlow.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/ReactFlow.md
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/ReactFlow.md
index 5be8497a34..2e90d2ac38 100644
--- a/packages/documentation-site/patternfly-docs/content/demos/Compass/ReactFlow.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/Compass/ReactFlow.md
@@ -1,6 +1,6 @@
 ---
 id: React flow
-section: PatternFly-AI
+section: AI
 subsection: Generative UIs
 ---
 
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/RHAiExperienceIcon.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/RHAiExperienceIcon.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/RHAiExperienceIcon.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/RHAiExperienceIcon.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/RHAutomationsLogo.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/RHAutomationsLogo.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/RHAutomationsLogo.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/RHAutomationsLogo.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/RHServerStackIcon.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/RHServerStackIcon.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/RHServerStackIcon.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/RHServerStackIcon.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/avatar.jpg b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/avatar.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/avatar.jpg
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/avatar.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/hero-bg.png b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/hero-bg.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/hero-bg.png
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/hero-bg.png
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/wallpaper-dark.png b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/wallpaper-dark.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/wallpaper-dark.png
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/wallpaper-dark.png
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/assets/wallpaper-light.png b/packages/documentation-site/patternfly-docs/content/AI/Compass/assets/wallpaper-light.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/assets/wallpaper-light.png
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/assets/wallpaper-light.png
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewClusterInventory.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewClusterInventory.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewClusterInventory.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewClusterInventory.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewMemoryUtilization.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewMemoryUtilization.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewMemoryUtilization.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewMemoryUtilization.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewNetworkActivity.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewNetworkActivity.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewNetworkActivity.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewNetworkActivity.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewStorage.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewStorage.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/cards/AnimationsOverviewStorage.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/cards/AnimationsOverviewStorage.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/cards/ClusterDetailsCard.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/cards/ClusterDetailsCard.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/cards/ClusterDetailsCard.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/cards/ClusterDetailsCard.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/cards/RecentActivityCard.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/cards/RecentActivityCard.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/cards/RecentActivityCard.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/cards/RecentActivityCard.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/dashboard.tsx b/packages/documentation-site/patternfly-docs/content/AI/Compass/dashboard.tsx
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/dashboard.tsx
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/dashboard.tsx
index 9e0a4b34f2..15b9e14a7f 100644
--- a/packages/documentation-site/patternfly-docs/content/demos/Compass/dashboard.tsx
+++ b/packages/documentation-site/patternfly-docs/content/AI/Compass/dashboard.tsx
@@ -2,10 +2,10 @@ import { useState } from 'react';
 import {
   Compass,
   CompassHeader,
-  CompassHero,
   CompassContent,
   CompassPanel,
   CompassMessageBar,
+  Hero,
   Tabs,
   TabsComponent,
   Tab,
@@ -161,7 +161,7 @@ export const CompassBasic: React.FunctionComponent = () => {
 
   const mainContent = (
     <>
-      <CompassHero gradientDark={{ stop1: '#3d2785', stop2: '#1b0d33', stop3: '#000' }} backgroundSrcDark={heroBg}>
+      <Hero gradientDark={{ stop1: '#3d2785', stop2: '#1b0d33', stop3: '#000' }} backgroundSrcDark={heroBg}>
         <Content>
           <h1>Automation that does more</h1>
           <p>
@@ -180,7 +180,7 @@ export const CompassBasic: React.FunctionComponent = () => {
             </ActionListGroup>
           </ActionList>
         </Content>
-      </CompassHero>
+      </Hero>
       <CompassContent id="main">
         <Grid hasGutter style={{ maxHeight: 'none' }}>
           <GridItem span={12} sm={12} md={6} lg={4} xl={3} rowSpan={4}>
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/declarations.ts b/packages/documentation-site/patternfly-docs/content/AI/Compass/declarations.ts
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/declarations.ts
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/declarations.ts
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/reactFlowOverrides.css b/packages/documentation-site/patternfly-docs/content/AI/Compass/reactFlowOverrides.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/reactFlowOverrides.css
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/reactFlowOverrides.css
diff --git a/packages/documentation-site/patternfly-docs/content/demos/Compass/tsconfig.json b/packages/documentation-site/patternfly-docs/content/AI/Compass/tsconfig.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/demos/Compass/tsconfig.json
rename to packages/documentation-site/patternfly-docs/content/AI/Compass/tsconfig.json
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/about-generative-ui.md b/packages/documentation-site/patternfly-docs/content/AI/about-generative-ui.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/about-generative-ui.md
rename to packages/documentation-site/patternfly-docs/content/AI/about-generative-ui.md
index 1a9ac594c6..27d2eacf25 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/about-generative-ui.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/about-generative-ui.md
@@ -1,7 +1,9 @@
 ---
-id: About generative UIs
-section: PatternFly-AI
+id: Overview
+title: Generative UIs overview
+section: AI
 subsection: Generative UIs
+sortValue: 1
 ---
 
 import { Alert } from "@patternfly/react-core";
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/about-ai.md b/packages/documentation-site/patternfly-docs/content/AI/ai-overview.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/about-ai.md
rename to packages/documentation-site/patternfly-docs/content/AI/ai-overview.md
index 1ae4d75888..4404de2c4e 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/about-ai.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/ai-overview.md
@@ -1,6 +1,6 @@
 ---
-id: Principles and guidelines 
-section: PatternFly-AI
+id: Overview
+section: AI
 sortValue: 1
 --- 
 import { Alert, AlertActionLink, Accordion, AccordionItem, AccordionContent, AccordionToggle, Button, Card, CardHeader, CardTitle, CardBody, CardFooter, Checkbox, Divider,  DescriptionList, DescriptionListTerm, DescriptionListGroup,  DescriptionListDescription, Grid, GridItem} from '@patternfly/react-core';
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/conversation-design.md b/packages/documentation-site/patternfly-docs/content/AI/conversation-design/conversation-design.md
similarity index 88%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/conversation-design.md
rename to packages/documentation-site/patternfly-docs/content/AI/conversation-design/conversation-design.md
index 007520c5cc..5d10228f50 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/conversation-design.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/conversation-design/conversation-design.md
@@ -1,6 +1,6 @@
 ---
 id: Conversation design
-section: PatternFly-AI
+section: AI
 ---
 
 import { Button, Flex, FlexItem } from '@patternfly/react-core';
@@ -13,7 +13,7 @@ import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-i
 
 Good conversation design combines content strategy, writing, and design to ensure that the development and use of chatbots is centered on real user needs. This includes making sure that all text related to the conversational UI supports easy engagement with chatbots, while staying aligned with brand standards.
 
-When designing AI conversations alongside PatternFly-based projects, it is important to align with our established [brand voice and tone](/ux-writing/brand-voice-and-tone), as well as our [ethical guidelines for AI.](/patternfly-ai/ai-guidelines)
+When designing AI conversations alongside PatternFly-based projects, it is important to align with our established [brand voice and tone](/content-design/brand-voice-and-tone), as well as our [ethical guidelines for AI.](/AI/ai-guidelines)
 
 ## Best practices 
 
@@ -29,11 +29,11 @@ Following these best practices to help ensure that your users can complete their
 
 When chatbots are designed to meet the needs of your users, they can improve the overall UX of your product. They are convenient, efficient, and persistent. 
 
-[Our chatbot extension](/patternfly-ai/chatbot/about-chatbot) utilizes PatternFly components to create a foundation for an AI-based chatbot, with additional customization options.
+[Our chatbot extension](/AI/chatbot/about-chatbot) utilizes PatternFly components to create a foundation for an AI-based chatbot, with additional customization options.
 
 <Flex>
 <FlexItem>
-<Button component="a" href="/patternfly-ai/chatbot/about-chatbot" target="_blank" variant="primary" size="lg">Use the chatbot extension <ArrowRightIcon /></Button>
+<Button component="a" href="/AI/chatbot/about-chatbot" target="_blank" variant="primary" size="lg">Use the chatbot extension <ArrowRightIcon /></Button>
 </FlexItem>
 </Flex>
 
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/img/chatbot-prompts.png b/packages/documentation-site/patternfly-docs/content/AI/conversation-design/img/chatbot-prompts.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/img/chatbot-prompts.png
rename to packages/documentation-site/patternfly-docs/content/AI/conversation-design/img/chatbot-prompts.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/img/chatbot-welcome.png b/packages/documentation-site/patternfly-docs/content/AI/conversation-design/img/chatbot-welcome.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/conversation-design/img/chatbot-welcome.png
rename to packages/documentation-site/patternfly-docs/content/AI/conversation-design/img/chatbot-welcome.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/enhancing-existing-projects.md b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/enhancing-existing-projects.md
similarity index 89%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/enhancing-existing-projects.md
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/enhancing-existing-projects.md
index eea520205d..f0ab5cf3bc 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/enhancing-existing-projects.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/enhancing-existing-projects.md
@@ -1,6 +1,6 @@
 ---
 id: Rapid prototyping
-section: PatternFly-AI
+section: AI
 source: enhancing-existing-projects
 sortValue: 2
 ---
@@ -9,9 +9,9 @@ sortValue: 2
 
 This guide provides instructions for integrating AI-assisted PatternFly development tools into your existing codebase.
 
-Before you get started, review [best practices for AI-assisted prototyping](/patternfly-ai/rapid-prototyping/rapid-prototyping#best-practices-for-ai-assisted-prototyping) and learn about [vibe coding principles](/patternfly-ai/rapid-prototyping/rapid-prototyping#what-is-vibe-coding) for effective AI-assisted development.
+Before you get started, review [best practices for AI-assisted prototyping](/AI/rapid-prototyping/rapid-prototyping#best-practices-for-ai-assisted-prototyping) and learn about [vibe coding principles](/AI/rapid-prototyping/rapid-prototyping#what-is-vibe-coding) for effective AI-assisted development.
 
-If you need to start a new project, follow our guidelines for [starting a new prototype](/patternfly-ai/rapid-prototyping/new-prototypes).
+If you need to start a new project, follow our guidelines for [starting a new prototype](/AI/rapid-prototyping/new-prototypes).
 
 ## Why enhance existing projects?
 
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/angular-directives-1.png b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/angular-directives-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/angular-directives-1.png
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/angular-directives-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/angular-directives-2.png b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/angular-directives-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/angular-directives-2.png
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/angular-directives-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/generated-tests.png b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/generated-tests.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/generated-tests.png
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/generated-tests.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/products-after.svg b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/products-after.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/products-after.svg
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/products-after.svg
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/products-before.png b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/products-before.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/products-before.png
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/products-before.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/scope-results.png b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/scope-results.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/img/scope-results.png
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/img/scope-results.png
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/migrating-to-patternfly.md b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/migrating-to-patternfly.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/migrating-to-patternfly.md
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/migrating-to-patternfly.md
index 58f30885f8..5bc215482b 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/migrating-to-patternfly.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/migrating-to-patternfly.md
@@ -1,6 +1,6 @@
 ---
 id: AI-assisted code migration
-section: PatternFly-AI
+section: AI
 ---
 
 This guide explores a workflow that enables developers to leverage AI to accelerate code migrations, with best practices and recommendations to follow when replicating the process.  
@@ -56,7 +56,7 @@ For example, you could use AI to migrate a simple Angular feature like this tabl
         
 ![Before migration - Angular Products page](./img/products-before.png)
 
-During the development phase, you could take a couple of different approaches to migrate code. You might be able to simply change the code within the same file or you might want to start fresh, using the patternfly-react-seed and following [our rapid prototyping guide.](https://www.patternfly.org/patternfly-ai/rapid-prototyping/new-prototypes)
+During the development phase, you could take a couple of different approaches to migrate code. You might be able to simply change the code within the same file or you might want to start fresh, using the patternfly-react-seed and following [our rapid prototyping guide.](https://www.patternfly.org/AI/rapid-prototyping/new-prototypes)
 
 In this example, we created a placeholder page (PF6placeholder.js) and asked AI to replicate the Angular component on the new page, using PatternFly. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/new-prototypes.md b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/new-prototypes.md
similarity index 83%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/new-prototypes.md
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/new-prototypes.md
index f84212c7c9..086dd57d21 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/new-prototypes.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/new-prototypes.md
@@ -1,6 +1,6 @@
 ---
 id: Rapid prototyping
-section: PatternFly-AI
+section: AI
 source: new-prototypes
 sortValue: 2
 ---
@@ -9,9 +9,9 @@ sortValue: 2
 
 This guide provides instructions for setting up new PatternFly prototypes using AI-assisted development tools.
 
-Before you get started, review [best practices for AI-assisted prototyping](/patternfly-ai/rapid-prototyping/rapid-prototyping#best-practices-for-ai-assisted-prototyping).
+Before you get started, review [best practices for AI-assisted prototyping](/AI/rapid-prototyping/rapid-prototyping#best-practices-for-ai-assisted-prototyping).
 
-If you need to add AI tools to existing codebases instead, follow our guidelines for [enhancing existing projects](/patternfly-ai/rapid-prototyping/enhancing-existing-projects).
+If you need to add AI tools to existing codebases instead, follow our guidelines for [enhancing existing projects](/AI/rapid-prototyping/enhancing-existing-projects).
 
 ## Project setup
 
@@ -35,7 +35,7 @@ The patternfly-react-seed ai_enabled branch comes pre-configured with:
 
 Once you've installed and set up the patternfly-react-seed ai_enabled branch, with the [patternfly-ai-coding tool](https://github.com/patternfly/patternfly-ai-coding), follow these steps to begin prototyping: 
 
-1. **Define your scope**: Clearly articulate what you want to build using [vibe coding principles](/patternfly-ai/rapid-prototyping/rapid-prototyping#effective-prompting-with-vibe-coding). Describe the experience, not the technical implementation.
+1. **Define your scope**: Clearly articulate what you want to build using [vibe coding principles](/AI/rapid-prototyping/rapid-prototyping#effective-prompting-with-vibe-coding). Describe the experience, not the technical implementation.
 2. **Leverage AI assistance**: Use AI tools to generate PatternFly components based on your requirements, communicating through natural language descriptions of user needs and design intent.
 3. **Iterate and refine**: Review generated code and make adjustments as needed, continuing to use vibe coding to guide refinements.
 4. **Test and validate**: Ensure your prototype meets design and functional requirements.
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/rapid-prototyping.md b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/rapid-prototyping.md
similarity index 89%
rename from packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/rapid-prototyping.md
rename to packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/rapid-prototyping.md
index b9e005430d..e60511c998 100644
--- a/packages/documentation-site/patternfly-docs/content/PatternFly-AI/rapid-prototyping/rapid-prototyping.md
+++ b/packages/documentation-site/patternfly-docs/content/AI/rapid-prototyping/rapid-prototyping.md
@@ -1,6 +1,6 @@
 ---
 id: Rapid prototyping
-section: PatternFly-AI
+section: AI
 source: about-rapid-prototyping
 sortValue: 2
 ---
@@ -26,8 +26,8 @@ Rapid prototyping with PatternFly code offers several key benefits:
 
 Choose your path based on your current situation:
 
-- **[Starting a new prototype](/patternfly-ai/rapid-prototyping/new-prototypes):** Use the [patternfly-react-seed (ai_enabled branch)](https://github.com/patternfly/patternfly-react-seed/tree/ai_enabled) application for optimal setup.
-- **[Enhancing existing projects](/patternfly-ai/rapid-prototyping/enhancing-existing-projects):** Integrate AI tools into your current codebase.
+- **[Starting a new prototype](/AI/rapid-prototyping/new-prototypes):** Use the [patternfly-react-seed (ai_enabled branch)](https://github.com/patternfly/patternfly-react-seed/tree/ai_enabled) application for optimal setup.
+- **[Enhancing existing projects](/AI/rapid-prototyping/enhancing-existing-projects):** Integrate AI tools into your current codebase.
 
 ## Best practices for AI-assisted prototyping
 
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/PF-a11y.png b/packages/documentation-site/patternfly-docs/content/accessibility/PF-a11y.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/PF-a11y.png
rename to packages/documentation-site/patternfly-docs/content/accessibility/PF-a11y.png
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/Popover.png b/packages/documentation-site/patternfly-docs/content/accessibility/Popover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/Popover.png
rename to packages/documentation-site/patternfly-docs/content/accessibility/Popover.png
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/a11y-scores.js b/packages/documentation-site/patternfly-docs/content/accessibility/a11y-scores.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/a11y-scores.js
rename to packages/documentation-site/patternfly-docs/content/accessibility/a11y-scores.js
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-datalist.js b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-datalist.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-datalist.js
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-datalist.js
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-design.md b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-design.md
similarity index 81%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-design.md
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-design.md
index c9bf515783..788bff874d 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-design.md
+++ b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-design.md
@@ -1,11 +1,12 @@
 ---
-id: Design for accessibility
+id: Design 
+title: Design for accessibility
 section: accessibility
 ---
 
 import { Card, CardBody, Grid, GridItem } from '@patternfly/react-core';
 
-As described in our [accessibility guidelines](/accessibility/about-accessibility), users may interact with your product through a variety of assistive technologies. In addition to [developing for accessibility](/accessibility/develop-for-accessibility), you must also incorporate it into your product's visual design. 
+As described in our [accessibility guidelines](/accessibility/overview), users may interact with your product through a variety of assistive technologies. In addition to [developing for accessibility](/accessibility/develop-for-accessibility), you must also incorporate it into your product's visual design. 
 
 ## Color and contrast
 
@@ -15,7 +16,7 @@ For example, you should consider contrast when using colors commonly affected by
 
 Designing with contrast in mind also benefits users with light sensitivity.
 
-PatternFly components use [our color palettes](/design-foundations/colors) to pass color contrast tests. As long as you follow our recommendations, any UI built with PatternFly components should have proper contrast between colors, making them distinguishable for users with different types of color perception and light sensitivity. 
+PatternFly components use [our color palettes](/foundations-and-styles/colors) to pass color contrast tests. As long as you follow our recommendations, any UI built with PatternFly components should have proper contrast between colors, making them distinguishable for users with different types of color perception and light sensitivity. 
 
 It's important not to solely rely on color for conveying information. Even though PatternFly components pass color contrast tests, they also use icons to further help with identification, which can be especially helpful for users with a form of color blindness.
 
@@ -29,7 +30,7 @@ If you go beyond our recommendations to combine PatternFly colors in other ways,
 
 The text in your UI should also be accessible to users with low vision. For example, links should be descriptive and concise, essential content should not be hidden in the UI, and text should scale appropriately as the UI window is resized or magnified. 
 
-To help simplify and strengthen the way that users process content, it is important to carefully consider your text size, font, letter spacing, margins, and spacing. PatternFly supports accessibility in these areas through our [typography](/design-foundations/typography) and [spacing](/design-foundations/spacers) guidelines.
+To help simplify and strengthen the way that users process content, it is important to carefully consider your text size, font, letter spacing, margins, and spacing. PatternFly supports accessibility in these areas through our [typography](/foundations-and-styles/typography) and [spacing](/foundations-and-styles/spacers) guidelines.
 
 ## Understanding low vision 
 
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-development.md b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-development.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-development.md
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-development.md
index d2bf6450fe..2a9dff2257 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-development.md
+++ b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-development.md
@@ -1,5 +1,6 @@
 ---
-id: Develop for accessibility
+id: Develop
+title: Develop for accessibility
 section: accessibility
 ---
 import { AccessibilityDatalist } from './accessibility-datalist.js';
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/about-accessibility.md b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-overview.md
similarity index 55%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/about-accessibility.md
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-overview.md
index 627709780d..3af7814c0f 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/about-accessibility.md
+++ b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-overview.md
@@ -1,6 +1,8 @@
 ---
-id: About accessibility 
+id: Overview
+title: Accessibility overview
 section: accessibility
+sortValue: 1
 ---
 
 # Accessibility fundamentals 
@@ -41,7 +43,7 @@ Users with no vision rely on screen readers to access web sites and applications
 
 To design for users with no vision:
 
-- Use [semantic elements](www.w3schools.com/html/html5_semantic_elements.asp).
+- Use [semantic elements](https://www.w3schools.com/html/html5_semantic_elements.asp).
 - Write labels that are meaningful when pulled out of context.
 
 #### Low vision
@@ -93,3 +95,37 @@ To help you achieve this, consider these guidelines:
   - Make content that appears on hover available to a screen reader by using `aria-describedby` (refer to [Tooltips & Toggletips example from Inclusive Components](https://inclusive-components.design/tooltips-toggletips/)).
 
 When building accessible user experiences, solving for one can extend to many. Humans are diverse and unique, and designing for accessibility takes that into consideration to create truly inclusive products.
+
+
+## PatternFly component accessibility 
+
+We do our best to build accessibility into PatternFly's components to take some of the accessibility work off your hands.
+
+As PatternFly is updated and enhanced, we check the accessibility of updates through a combination of automated and manual testing. We use [aXe: The Accessibility Engine](https://www.deque.com/axe/) to ensure that all components pass an accessibility audit before they’re added to PatternFly. 
+
+We also regularly audit keyboard accessibility with both manual testing and integration tests. We aim to provide full support for VoiceOver as our main screen reader, but we still test our components through NVDA and JAWS. As part of our manual audit, every component is run through VoiceOver to make sure they’ll be as accessible as possible in your products.
+
+### Accessibility standards
+
+We strive for compliance in accordance to [level AA in the Web Content Accessibility Guidelines 2.2](https://www.w3.org/WAI/WCAG22/quickref/?versions=2.2&currentsidebar=%23col_customize&levels=aaa) across the core PatternFly HTML and React libraries, as well as our extensions and component groups. If you use or contribute to PatternFly, the following accessibility guidelines are some that you can expect PatternFly to adhere to (keep in mind this is not an exhaustive list):
+
+| Guideline  | Link  | Applies to  | Tested |
+| --- | --- | --- | --- |
+| Semantic HTML structures are used to accurately communicate the purpose and relationship of UI elements. | [WCAG 1.3.1](//www.w3.org/WAI/WCAG22/quickref#info-and-relationships) | `design` `html` `css` | Automated testing with aXe and manual testing |
+|Color is not the only method of communication. Providing meaning with color is supplementary to providing meaning with text. | [WCAG 1.4.1](//www.w3.org/WAI/WCAG22/quickref#use-of-color) | `design` `html` `css` | Manual testing and aXe used |
+| Colors used provide sufficient contrast | [WCAG 1.4.3](//www.w3.org/WAI/WCAG22/quickref#contrast-minimum) and [1.4.11](//www.w3.org/WAI/WCAG22/quickref#non-text-contrast) | `css` | Automated testing with aXe |
+| Font sizes can scale up to 200% without loss of content or functionality, and up to 400% without needing to scroll in more than one direction.  | [WCAG&nbsp;1.4.4](//www.w3.org/WAI/WCAG22/quickref#resize-text) and [1.4.10](//www.w3.org/WAI/WCAG22/quickref#reflow) | `css` | Manual testing |
+| Styles that affect text spacing (line height, space between paragraphs, letter spacing, and word spacing) can be increased without loss of content or functionality. | [WCAG 1.4.12](//www.w3.org/WAI/WCAG22/quickref#text-spacing) | `css` | Manual testing and aXe used |
+| Contents that appear on hover and focus are dismissible, hoverable, and persistent. | [WCAG 1.4.13](//www.w3.org/WAI/WCAG22/quickref#content-on-hover-or-focus) | `html` `css` `js` | Manual testing | 
+| All functionality is keyboard accessible. | [WCAG 2.1.1](//www.w3.org/WAI/WCAG22/quickref#keyboard) and [2.1.2](//www.w3.org/WAI/WCAG22/quickref#no-keyboard-trap) | `html` | Manual testing |
+| Elements in the HTML and in the layout follow a logical order. | [WCAG 1.3.2](//www.w3.org/WAI/WCAG22/quickref#meaningful-sequence) and [2.4.3](//www.w3.org/WAI/WCAG22/quickref#focus-order) | `design` `html` `css` | Manual testing |
+| Flashing content does not flash more than three times in any one-second period, or the flash is below the general flash and red flash thresholds. | [WCAG 2.3.1](//www.w3.org/WAI/WCAG22/quickref/?showtechniques=231#three-flashes-or-below-threshold) | `css` | Manual testing|
+| Elements with focus are clearly visible. | [WCAG 2.4.7](//www.w3.org/WAI/WCAG22/quickref#focus-visible) | `css` | Manual testing |
+| Elements that are focusable are not entirely obscured. | [WCAG 2.4.11](//www.w3.org/WAI/WCAG22/quickref#focus-not-obscured-minimum) | `design` | Manual testing |
+| Functionality that uses complex gestures can also be operated with a single pointer without a path-based gesture. | [WCAG 2.5.1](//www.w3.org/WAI/WCAG22/quickref#pointer-gestures) | `design` | Manual testing |
+| Pointer events can be canceled.  | [WCAG 2.5.2](//www.w3.org/WAI/WCAG22/quickref#pointer-cancellation) | `js` | Manual testing |
+| Visible labels of UI components are either the same as the accessible name or used in the beginning of the accessible name. | [WCAG 2.5.3](//www.w3.org/WAI/WCAG22/quickref#label-in-name) | `html` | Automated testing with aXe and manual testing |
+| Any action that involves dragging has a pointer alternative. | [WCAG 2.5.7](//www.w3.org/WAI/WCAG22/quickref#dragging-movements) | `js` | Manual testing |
+| The target area for clickable elements is at least 24 by 24 [CSS pixels](//www.w3.org/TR/WCAG22#dfn-css-pixels), with specific exceptions. | [WCAG 2.5.8](//www.w3.org/WAI/WCAG22/quickref/#target-size-minimum) | `css` | Manual testing |
+| An accessible name, role, and value are provided for all user interface elements. | [WCAG 4.1.2](//www.w3.org/WAI/WCAG22/quickref#name-role-value) | `design` `html` | Automated testing with aXe and manual testing with VoiceOver
+| Status messages can be programmatically determined through role or properties. | [WCAG 4.1.3](//www.w3.org/WAI/WCAG22/quickref#status-messages) | `html` | Manual testing |
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-scorecard.js b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-scorecard.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-scorecard.js
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-scorecard.js
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-scorecard.md b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-scorecard.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-scorecard.md
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-scorecard.md
index a889c1450a..60a2f006dd 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-scorecard.md
+++ b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-scorecard.md
@@ -1,5 +1,5 @@
 ---
-id: Accessibility scorecard
+id: Product scorecard
 section: accessibility
 ---
 import { AccessibilityScorecard } from './accessibility-scorecard.js';
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-testing.md b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-testing.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-testing.md
rename to packages/documentation-site/patternfly-docs/content/accessibility/accessibility-testing.md
index f8569475df..5356e94019 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/accessibility-testing.md
+++ b/packages/documentation-site/patternfly-docs/content/accessibility/accessibility-testing.md
@@ -1,5 +1,5 @@
 ---
-id: Testing your accessibility
+id: Test your product
 section: accessibility
 ---
 import { Checkbox } from '@patternfly/react-core';
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/ally-color-example.png b/packages/documentation-site/patternfly-docs/content/accessibility/ally-color-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/ally-color-example.png
rename to packages/documentation-site/patternfly-docs/content/accessibility/ally-color-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/ally-contrast-example.png b/packages/documentation-site/patternfly-docs/content/accessibility/ally-contrast-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/ally-contrast-example.png
rename to packages/documentation-site/patternfly-docs/content/accessibility/ally-contrast-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/about-modal/about-modal.md b/packages/documentation-site/patternfly-docs/content/components/about-modal/about-modal.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/about-modal/about-modal.md
rename to packages/documentation-site/patternfly-docs/content/components/about-modal/about-modal.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/about-modal/img/about-dropdown.png b/packages/documentation-site/patternfly-docs/content/components/about-modal/img/about-dropdown.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/about-modal/img/about-dropdown.png
rename to packages/documentation-site/patternfly-docs/content/components/about-modal/img/about-dropdown.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/about-modal/img/about-modal.png b/packages/documentation-site/patternfly-docs/content/components/about-modal/img/about-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/about-modal/img/about-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/about-modal/img/about-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/about-modal/about-modal.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/about-modal/about-modal.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/about-modal/about-modal.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/about-modal/about-modal.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/accordion/accordion.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/accordion/accordion.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/accordion/accordion.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/accordion/accordion.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/action-list/action-list.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/action-list/action-list.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/action-list/action-list.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/action-list/action-list.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/alert/alert.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/alert/alert.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/accessibility/alert/alert.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/alert/alert.md
index 00fe91f1d4..abaf70754b 100644
--- a/packages/documentation-site/patternfly-docs/content/accessibility/alert/alert.md
+++ b/packages/documentation-site/patternfly-docs/content/components/accessibility/alert/alert.md
@@ -104,11 +104,11 @@ Toast alerts present special challenges for accessibility. Assistive technologie
  
 For example, the following toast alert is not accessible because it does not include text that explains to the user where to go within the UI to perform the action:
 
-<img src="../../design-guidelines/components/alert/img/alert-no-description.png" alt="toast alert without descriptive text" width="600px"/>
+<img src="../../alert/img/alert-no-description.png" alt="toast alert without descriptive text" width="600px"/>
 
 In contrast, the following toast alert is accessible to users with total, limited, or no vision because it includes text that explains to the user where to go within the UI to perform the action:
 
-<img src="../../design-guidelines/components/alert/img/alert-description.png" alt="alert with descriptive text" width="600px"/>
+<img src="../../alert/img/alert-description.png" alt="alert with descriptive text" width="600px"/>
 
 ### Aria-live
 
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/application-launcher/application-launcher.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/application-launcher/application-launcher.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/application-launcher/application-launcher.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/application-launcher/application-launcher.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/avatar/avatar.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/avatar/avatar.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/avatar/avatar.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/avatar/avatar.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/backdrop/backdrop.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/backdrop/backdrop.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/backdrop/backdrop.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/backdrop/backdrop.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/background-image/background-image.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/background-image/background-image.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/background-image/background-image.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/background-image/background-image.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/badge/badge-no-color-no-icons.png b/packages/documentation-site/patternfly-docs/content/components/accessibility/badge/badge-no-color-no-icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/badge/badge-no-color-no-icons.png
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/badge/badge-no-color-no-icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/badge/badge-no-color-with-icons.png b/packages/documentation-site/patternfly-docs/content/components/accessibility/badge/badge-no-color-with-icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/badge/badge-no-color-with-icons.png
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/badge/badge-no-color-with-icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/badge/badge.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/badge/badge.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/badge/badge.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/badge/badge.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/banner/banner.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/banner/banner.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/banner/banner.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/banner/banner.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/brand/brand.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/brand/brand.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/brand/brand.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/brand/brand.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/breadcrumb/breadcrumb.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/breadcrumb/breadcrumb.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/breadcrumb/breadcrumb.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/breadcrumb/breadcrumb.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/button/button.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/button/button.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/button/button.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/button/button.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/calendar-month/calendar-month.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/calendar-month/calendar-month.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/calendar-month/calendar-month.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/calendar-month/calendar-month.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/card/card.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/card/card.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/card/card.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/card/card.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/checkbox/checkbox.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/checkbox/checkbox.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/checkbox/checkbox.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/checkbox/checkbox.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/chip/chip.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/chip/chip.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/chip/chip.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/chip/chip.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/clipboard-copy/clipboard-copy.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/clipboard-copy/clipboard-copy.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/clipboard-copy/clipboard-copy.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/clipboard-copy/clipboard-copy.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/code-editor/code-editor.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/code-editor/code-editor.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/code-editor/code-editor.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/code-editor/code-editor.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/context-selector/context-selector.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/context-selector/context-selector.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/context-selector/context-selector.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/context-selector/context-selector.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/expandable-section/expandable-section.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/expandable-section/expandable-section.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/expandable-section/expandable-section.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/expandable-section/expandable-section.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/helper-text/helper-text.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/helper-text/helper-text.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/helper-text/helper-text.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/helper-text/helper-text.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/jump-links/jump-links.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/jump-links/jump-links.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/jump-links/jump-links.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/jump-links/jump-links.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/jump-links/rotor-menu.png b/packages/documentation-site/patternfly-docs/content/components/accessibility/jump-links/rotor-menu.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/jump-links/rotor-menu.png
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/jump-links/rotor-menu.png
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/label/label.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/label/label.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/label/label.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/label/label.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/label/labels-no-icons.png b/packages/documentation-site/patternfly-docs/content/components/accessibility/label/labels-no-icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/label/labels-no-icons.png
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/label/labels-no-icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/label/labels-with-icons.png b/packages/documentation-site/patternfly-docs/content/components/accessibility/label/labels-with-icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/label/labels-with-icons.png
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/label/labels-with-icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/menu-toggle/menu-toggle.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/menu-toggle/menu-toggle.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/menu-toggle/menu-toggle.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/menu-toggle/menu-toggle.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/menu/menu.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/menu/menu.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/menu/menu.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/menu/menu.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/modal/modal.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/modal/modal.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/modal/modal.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/modal/modal.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/navigation/navigation.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/navigation/navigation.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/navigation/navigation.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/navigation/navigation.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/page/page.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/page/page.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/page/page.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/page/page.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/progress-stepper/progress-stepper.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/progress-stepper/progress-stepper.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/progress-stepper/progress-stepper.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/progress-stepper/progress-stepper.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/progress/progress.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/progress/progress.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/progress/progress.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/progress/progress.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/radio/radio.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/radio/radio.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/radio/radio.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/radio/radio.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/sidebar/sidebar.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/sidebar/sidebar.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/sidebar/sidebar.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/sidebar/sidebar.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/skeleton/skeleton.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/skeleton/skeleton.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/skeleton/skeleton.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/skeleton/skeleton.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/skip-to-content/skip-to-content.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/skip-to-content/skip-to-content.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/skip-to-content/skip-to-content.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/skip-to-content/skip-to-content.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/switch/switch.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/switch/switch.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/switch/switch.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/switch/switch.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/tabs/tabs.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/tabs/tabs.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/tabs/tabs.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/tabs/tabs.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/title/title.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/title/title.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/title/title.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/title/title.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/tooltip/tooltip.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/tooltip/tooltip.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/tooltip/tooltip.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/tooltip/tooltip.md
diff --git a/packages/documentation-site/patternfly-docs/content/accessibility/tree-view/tree-view.md b/packages/documentation-site/patternfly-docs/content/components/accessibility/tree-view/tree-view.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/accessibility/tree-view/tree-view.md
rename to packages/documentation-site/patternfly-docs/content/components/accessibility/tree-view/tree-view.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/accordion.md b/packages/documentation-site/patternfly-docs/content/components/accordion/accordion.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/accordion.md
rename to packages/documentation-site/patternfly-docs/content/components/accordion/accordion.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/img/accordion-elements.svg b/packages/documentation-site/patternfly-docs/content/components/accordion/img/accordion-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/img/accordion-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/accordion/img/accordion-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/img/multi-expand-accordion.svg b/packages/documentation-site/patternfly-docs/content/components/accordion/img/multi-expand-accordion.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/img/multi-expand-accordion.svg
rename to packages/documentation-site/patternfly-docs/content/components/accordion/img/multi-expand-accordion.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/img/single-expand-accordion.svg b/packages/documentation-site/patternfly-docs/content/components/accordion/img/single-expand-accordion.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/accordion/img/single-expand-accordion.svg
rename to packages/documentation-site/patternfly-docs/content/components/accordion/img/single-expand-accordion.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/action-list.md b/packages/documentation-site/patternfly-docs/content/components/action-list/action-list.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/action-list.md
rename to packages/documentation-site/patternfly-docs/content/components/action-list/action-list.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/img/action-modal.svg b/packages/documentation-site/patternfly-docs/content/components/action-list/img/action-modal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/img/action-modal.svg
rename to packages/documentation-site/patternfly-docs/content/components/action-list/img/action-modal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/img/action-toolbar.svg b/packages/documentation-site/patternfly-docs/content/components/action-list/img/action-toolbar.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/img/action-toolbar.svg
rename to packages/documentation-site/patternfly-docs/content/components/action-list/img/action-toolbar.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/img/action-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/action-list/img/action-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/action-list/img/action-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/action-list/img/action-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/alert.md b/packages/documentation-site/patternfly-docs/content/components/alert/alert.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/alert.md
rename to packages/documentation-site/patternfly-docs/content/components/alert/alert.md
index 7665839a41..c279d21807 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/alert.md
+++ b/packages/documentation-site/patternfly-docs/content/components/alert/alert.md
@@ -57,7 +57,7 @@ The status icon, background, and alert title are coded to communicate the severi
 |Critical |fa-exclamation-circle | Use to indicate that a critical or blocking error has occurred
 |Success  |fa-check-circle | Use to indicate that a task or process has completed successfully
 
-For more information about what colors to use for status and severity, visit the [Colors page](/design-foundations/colors/#status-and-state-colors).
+For more information about what colors to use for status and severity, visit the [Colors page](/foundations-and-styles/colors/#status-and-state-colors).
 
 ## Usage
 
@@ -65,7 +65,7 @@ Use an alert component when you are trying to give the user essential informatio
 
 ### Customizing alerts
 
-If your use case falls outside of PatternFly's standard alert variations, use [icons](/design-foundations/icons) and [colors](/design-foundations/colors) to create custom alerts that meet your needs.
+If your use case falls outside of PatternFly's standard alert variations, use [icons](/foundations-and-styles/iconography) and [colors](/foundations-and-styles/colors) to create custom alerts that meet your needs.
 
 View custom alerts in action in our [custom alert examples](/components/alert#custom-icons).
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/Multiplealert.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/Multiplealert.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/Multiplealert.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/Multiplealert.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/Notification-content-accessible.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/Notification-content-accessible.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/Notification-content-accessible.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/Notification-content-accessible.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/Notification-content-not-accessible.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/Notification-content-not-accessible.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/Notification-content-not-accessible.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/Notification-content-not-accessible.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-description.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-description.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-description.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-description.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-desktop.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-desktop.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-desktop.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-desktop.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-elements.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-mobile.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-mobile.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-mobile.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-mobile.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-with-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-with-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-group-with-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-group-with-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-no-description.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-no-description.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-no-description.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-no-description.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-status.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-status.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-status.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-status.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-types.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/alert-types.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/alert-types.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/alert-types.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/below-tab-alert.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/below-tab-alert.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/below-tab-alert.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/below-tab-alert.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/below-tab-alert.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/below-tab-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/below-tab-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/below-tab-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-modal-with-existing-alert.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-modal-with-existing-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-modal-with-existing-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-modal-with-existing-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-modal-with-link-one.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-modal-with-link-one.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-modal-with-link-one.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-modal-with-link-one.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-modal-with-link-two.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-modal-with-link-two.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-modal-with-link-two.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-modal-with-link-two.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-page-level-with-link.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-page-level-with-link.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-page-level-with-link.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-page-level-with-link.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-page-level.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-page-level.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-page-level.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-page-level.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-specific-context.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-specific-context.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-alert-specific-context.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-alert-specific-context.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-header-alert.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-header-alert.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-header-alert.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-header-alert.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-header-alert.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-header-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-header-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-header-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-interactive-alert.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-interactive-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-interactive-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-interactive-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-notification.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/inline-notification.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/inline-notification.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/inline-notification.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/modal-notification.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/modal-notification.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/modal-notification.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/modal-notification.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/multiple-alerts.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/multiple-alerts.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/multiple-alerts.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/multiple-alerts.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/no-alert-for-confirmation-modal.png b/packages/documentation-site/patternfly-docs/content/components/alert/img/no-alert-for-confirmation-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/no-alert-for-confirmation-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/no-alert-for-confirmation-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/option-alert.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/option-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/option-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/option-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/plain-inline-notification.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/plain-inline-notification.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/plain-inline-notification.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/plain-inline-notification.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/toast-alert-desktop.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/toast-alert-desktop.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/toast-alert-desktop.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/toast-alert-desktop.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/toast-notification-multiple.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/toast-notification-multiple.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/toast-notification-multiple.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/toast-notification-multiple.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/toast-notification.svg b/packages/documentation-site/patternfly-docs/content/components/alert/img/toast-notification.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/alert/img/toast-notification.svg
rename to packages/documentation-site/patternfly-docs/content/components/alert/img/toast-notification.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/application-launcher.md b/packages/documentation-site/patternfly-docs/content/components/application-launcher/application-launcher.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/application-launcher.md
rename to packages/documentation-site/patternfly-docs/content/components/application-launcher/application-launcher.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/img/app-launcher-elements.svg b/packages/documentation-site/patternfly-docs/content/components/application-launcher/img/app-launcher-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/img/app-launcher-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/application-launcher/img/app-launcher-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/img/app-launcher-ext-links.svg b/packages/documentation-site/patternfly-docs/content/components/application-launcher/img/app-launcher-ext-links.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/img/app-launcher-ext-links.svg
rename to packages/documentation-site/patternfly-docs/content/components/application-launcher/img/app-launcher-ext-links.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/img/app-launcher-fave-search.svg b/packages/documentation-site/patternfly-docs/content/components/application-launcher/img/app-launcher-fave-search.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/application-launcher/img/app-launcher-fave-search.svg
rename to packages/documentation-site/patternfly-docs/content/components/application-launcher/img/app-launcher-fave-search.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/avatar.md b/packages/documentation-site/patternfly-docs/content/components/avatar/avatar.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/avatar.md
rename to packages/documentation-site/patternfly-docs/content/components/avatar/avatar.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-elements.svg b/packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-lg.svg b/packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-lg.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-lg.svg
rename to packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-lg.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-sm-components.svg b/packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-sm-components.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-sm-components.svg
rename to packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-sm-components.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-sm-masthead.svg b/packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-sm-masthead.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-sm-masthead.svg
rename to packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-sm-masthead.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-xl.svg b/packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-xl.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-usage-xl.svg
rename to packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-usage-xl.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-variations.svg b/packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-variations.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/avatar/img/avatar-variations.svg
rename to packages/documentation-site/patternfly-docs/content/components/avatar/img/avatar-variations.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/back-to-top.md b/packages/documentation-site/patternfly-docs/content/components/back-to-top/back-to-top.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/back-to-top.md
rename to packages/documentation-site/patternfly-docs/content/components/back-to-top/back-to-top.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/img/backtotop.png b/packages/documentation-site/patternfly-docs/content/components/back-to-top/img/backtotop.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/img/backtotop.png
rename to packages/documentation-site/patternfly-docs/content/components/back-to-top/img/backtotop.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/img/elements.png b/packages/documentation-site/patternfly-docs/content/components/back-to-top/img/elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/img/elements.png
rename to packages/documentation-site/patternfly-docs/content/components/back-to-top/img/elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/img/up-arrow.png b/packages/documentation-site/patternfly-docs/content/components/back-to-top/img/up-arrow.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/back-to-top/img/up-arrow.png
rename to packages/documentation-site/patternfly-docs/content/components/back-to-top/img/up-arrow.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/backdrop/backdrop.md b/packages/documentation-site/patternfly-docs/content/components/backdrop/backdrop.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/backdrop/backdrop.md
rename to packages/documentation-site/patternfly-docs/content/components/backdrop/backdrop.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/background-image/background-image.md b/packages/documentation-site/patternfly-docs/content/components/background-image/background-image.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/background-image/background-image.md
rename to packages/documentation-site/patternfly-docs/content/components/background-image/background-image.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/badge/badge.md b/packages/documentation-site/patternfly-docs/content/components/badge/badge.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/badge/badge.md
rename to packages/documentation-site/patternfly-docs/content/components/badge/badge.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/banner.md b/packages/documentation-site/patternfly-docs/content/components/banner/banner.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/banner.md
rename to packages/documentation-site/patternfly-docs/content/components/banner/banner.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/banner-types.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/banner-types.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/banner-types.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/banner-types.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/banner-variations.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/banner-variations.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/banner-variations.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/banner-variations.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/example-1.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/example-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/example-1.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/example-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/example-2.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/example-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/example-2.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/example-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/example-3.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/example-3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/example-3.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/example-3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/padding-above.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/padding-above.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/padding-above.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/padding-above.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/padding-below.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/padding-below.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/padding-below.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/padding-below.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/placement-1.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/placement-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/placement-1.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/placement-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/placement-2.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/placement-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/placement-2.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/placement-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/placement-3.png b/packages/documentation-site/patternfly-docs/content/components/banner/img/placement-3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/banner/img/placement-3.png
rename to packages/documentation-site/patternfly-docs/content/components/banner/img/placement-3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/brand/brand.md b/packages/documentation-site/patternfly-docs/content/components/brand/brand.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/brand/brand.md
rename to packages/documentation-site/patternfly-docs/content/components/brand/brand.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/breadcrumb.md b/packages/documentation-site/patternfly-docs/content/components/breadcrumb/breadcrumb.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/breadcrumb.md
rename to packages/documentation-site/patternfly-docs/content/components/breadcrumb/breadcrumb.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/breadcrumb.png b/packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/breadcrumb.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/breadcrumb.png
rename to packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/breadcrumb.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/breadcrumbs-placement.svg b/packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/breadcrumbs-placement.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/breadcrumbs-placement.svg
rename to packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/breadcrumbs-placement.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/breadcrumbs-usage.svg b/packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/breadcrumbs-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/breadcrumbs-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/breadcrumbs-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/placement.png b/packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/placement.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/breadcrumb/img/placement.png
rename to packages/documentation-site/patternfly-docs/content/components/breadcrumb/img/placement.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/button.md b/packages/documentation-site/patternfly-docs/content/components/button/button.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/button.md
rename to packages/documentation-site/patternfly-docs/content/components/button/button.md
index 74f38ed549..0ffd4529d6 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/button.md
+++ b/packages/documentation-site/patternfly-docs/content/components/button/button.md
@@ -321,11 +321,11 @@ When writing button labels:
 * Avoid using articles (for example, write “Add source” instead of “Add a source”).
 * Avoid punctuation on buttons.
 * Add an icon to the button to call a user's attention to it or to clarify the button's action.
-* Do not create icons on buttons using punctuation (for example, "+"). Instead, refer to [PatternFly's icons page](/design-foundations/icons) for any icons you place on buttons.
+* Do not create icons on buttons using punctuation (for example, "+"). Instead, refer to [PatternFly's icons page](/foundations-and-styles/iconography) for any icons you place on buttons.
 
 ### Writing link labels
 
-Use specific, action-focused labels that match what the user will see when they arrive at their location. For example, if you are sending a user to a dashboard, your link label might read _View dashboard_. For a link directing a user to a support forum, the label might read _Get help in the support forum_. See [PatternFly's content guidelines](/ux-writing/about-ux-writing) for additional guidance.
+Use specific, action-focused labels that match what the user will see when they arrive at their location. For example, if you are sending a user to a dashboard, your link label might read _View dashboard_. For a link directing a user to a support forum, the label might read _Get help in the support forum_. See [PatternFly's content guidelines](/content-design/about-ux-writing) for additional guidance.
 
 ## Accessibility
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/CTAs.png b/packages/documentation-site/patternfly-docs/content/components/button/img/CTAs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/CTAs.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/CTAs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_16px.png b/packages/documentation-site/patternfly-docs/content/components/button/img/button_16px.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_16px.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/button_16px.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_action_group.png b/packages/documentation-site/patternfly-docs/content/components/button/img/button_action_group.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_action_group.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/button_action_group.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_stacked.png b/packages/documentation-site/patternfly-docs/content/components/button/img/button_stacked.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_stacked.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/button_stacked.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_wizard.png b/packages/documentation-site/patternfly-docs/content/components/button/img/button_wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/button_wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_wizard_stacked.png b/packages/documentation-site/patternfly-docs/content/components/button/img/button_wizard_stacked.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/button_wizard_stacked.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/button_wizard_stacked.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/buttons.png b/packages/documentation-site/patternfly-docs/content/components/button/img/buttons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/buttons.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/buttons.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/danger.png b/packages/documentation-site/patternfly-docs/content/components/button/img/danger.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/danger.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/danger.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/default-link-style.svg b/packages/documentation-site/patternfly-docs/content/components/button/img/default-link-style.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/default-link-style.svg
rename to packages/documentation-site/patternfly-docs/content/components/button/img/default-link-style.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/empty_state_links.png b/packages/documentation-site/patternfly-docs/content/components/button/img/empty_state_links.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/empty_state_links.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/empty_state_links.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/external-links.svg b/packages/documentation-site/patternfly-docs/content/components/button/img/external-links.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/external-links.svg
rename to packages/documentation-site/patternfly-docs/content/components/button/img/external-links.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/icon_button.png b/packages/documentation-site/patternfly-docs/content/components/button/img/icon_button.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/icon_button.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/icon_button.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/inline-link-in-text.svg b/packages/documentation-site/patternfly-docs/content/components/button/img/inline-link-in-text.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/inline-link-in-text.svg
rename to packages/documentation-site/patternfly-docs/content/components/button/img/inline-link-in-text.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/inline-link-styles.svg b/packages/documentation-site/patternfly-docs/content/components/button/img/inline-link-styles.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/inline-link-styles.svg
rename to packages/documentation-site/patternfly-docs/content/components/button/img/inline-link-styles.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_alert.png b/packages/documentation-site/patternfly-docs/content/components/button/img/link_alert.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_alert.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/link_alert.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_empty.png b/packages/documentation-site/patternfly-docs/content/components/button/img/link_empty.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_empty.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/link_empty.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_modal.png b/packages/documentation-site/patternfly-docs/content/components/button/img/link_modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_modal.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/link_modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_table.png b/packages/documentation-site/patternfly-docs/content/components/button/img/link_table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/link_table.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/link_table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/modal_exception.png b/packages/documentation-site/patternfly-docs/content/components/button/img/modal_exception.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/modal_exception.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/modal_exception.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/overflow_1.png b/packages/documentation-site/patternfly-docs/content/components/button/img/overflow_1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/overflow_1.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/overflow_1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/overflow_2.png b/packages/documentation-site/patternfly-docs/content/components/button/img/overflow_2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/overflow_2.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/overflow_2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/prim_ex_1.png b/packages/documentation-site/patternfly-docs/content/components/button/img/prim_ex_1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/prim_ex_1.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/prim_ex_1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/prim_ex_2.png b/packages/documentation-site/patternfly-docs/content/components/button/img/prim_ex_2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/prim_ex_2.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/prim_ex_2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/progress-button.png b/packages/documentation-site/patternfly-docs/content/components/button/img/progress-button.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/progress-button.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/progress-button.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/progress_bar_stages.png b/packages/documentation-site/patternfly-docs/content/components/button/img/progress_bar_stages.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/progress_bar_stages.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/progress_bar_stages.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/sec_ex.png b/packages/documentation-site/patternfly-docs/content/components/button/img/sec_ex.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/sec_ex.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/sec_ex.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/tert_edit.png b/packages/documentation-site/patternfly-docs/content/components/button/img/tert_edit.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/tert_edit.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/tert_edit.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/toolbar_exception.png b/packages/documentation-site/patternfly-docs/content/components/button/img/toolbar_exception.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/toolbar_exception.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/toolbar_exception.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/wizard.png b/packages/documentation-site/patternfly-docs/content/components/button/img/wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/button/img/wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/button/img/wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/calendar-month/calendar-month.md b/packages/documentation-site/patternfly-docs/content/components/calendar-month/calendar-month.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/calendar-month/calendar-month.md
rename to packages/documentation-site/patternfly-docs/content/components/calendar-month/calendar-month.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/calendar-month/img/calendar-month-elements.svg b/packages/documentation-site/patternfly-docs/content/components/calendar-month/img/calendar-month-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/calendar-month/img/calendar-month-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/calendar-month/img/calendar-month-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/card.md b/packages/documentation-site/patternfly-docs/content/components/card/card.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/card.md
rename to packages/documentation-site/patternfly-docs/content/components/card/card.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-borders.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-borders.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-borders.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-borders.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-borders.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-borders.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-borders.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-borders.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-catalog.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-catalog.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-catalog.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-catalog.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-clickable.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-clickable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-clickable.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-clickable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-dashboard.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-dashboard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-dashboard.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-dashboard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-elements.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-elements.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-expandable.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-expandable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-expandable.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-expandable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-expandable.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-expandable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-expandable.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-expandable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-images.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-images.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-images.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-images.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-images.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-images.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-images.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-images.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-primary-detail.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-primary-detail.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-primary-detail.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-primary-detail.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-selectable-clickable.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-selectable-clickable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-selectable-clickable.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-selectable-clickable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-selectable.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-selectable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-selectable.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-selectable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-types.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-types.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-types.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-types.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-variants.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-variants.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-variants.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-variants.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-variations.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-variations.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-variations.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-variations.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-withlink.png b/packages/documentation-site/patternfly-docs/content/components/card/img/card-withlink.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-withlink.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-withlink.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-withlink.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/card-withlink.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/card-withlink.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/card-withlink.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-clickable.png b/packages/documentation-site/patternfly-docs/content/components/card/img/cards-clickable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-clickable.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/cards-clickable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-dashboard.png b/packages/documentation-site/patternfly-docs/content/components/card/img/cards-dashboard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-dashboard.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/cards-dashboard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-multiselect-catalog.png b/packages/documentation-site/patternfly-docs/content/components/card/img/cards-multiselect-catalog.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-multiselect-catalog.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/cards-multiselect-catalog.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-primarydetail.png b/packages/documentation-site/patternfly-docs/content/components/card/img/cards-primarydetail.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-primarydetail.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/cards-primarydetail.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-selectable-clickable.png b/packages/documentation-site/patternfly-docs/content/components/card/img/cards-selectable-clickable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-selectable-clickable.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/cards-selectable-clickable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-selectable.png b/packages/documentation-site/patternfly-docs/content/components/card/img/cards-selectable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/cards-selectable.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/cards-selectable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/dashboard.png b/packages/documentation-site/patternfly-docs/content/components/card/img/dashboard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/dashboard.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/dashboard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/multi-select-cards.png b/packages/documentation-site/patternfly-docs/content/components/card/img/multi-select-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/multi-select-cards.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/multi-select-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/single-select-cards.png b/packages/documentation-site/patternfly-docs/content/components/card/img/single-select-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/single-select-cards.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/single-select-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/table-no-card.png b/packages/documentation-site/patternfly-docs/content/components/card/img/table-no-card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/table-no-card.png
rename to packages/documentation-site/patternfly-docs/content/components/card/img/table-no-card.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/tiles.svg b/packages/documentation-site/patternfly-docs/content/components/card/img/tiles.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/card/img/tiles.svg
rename to packages/documentation-site/patternfly-docs/content/components/card/img/tiles.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/about.md b/packages/documentation-site/patternfly-docs/content/components/charts/about/about.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/about.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/about.md
index d301c71891..ac68b17fa1 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/about.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/about/about.md
@@ -1,6 +1,8 @@
 ---
-id: About charts
-section: charts
+id: Overview
+title: Charts overview
+section: components
+subsection: charts
 sortValue: 1
 ---
 
@@ -76,4 +78,4 @@ To support dark-themed charts, you must:
 1. Import the stylesheet that contains dark theme styles by adding this line before importing your main application component: `import '@patternfly/patternfly/patternfly-charts.css';`
     - Once you import this file, you'll have access to [all chart variables](https://www.npmjs.com/package/@patternfly/patternfly?activeTab=code). Beyond dark theme, you could use these variables to match the style of other UI elements to your chart styles. 
 
-To display the list of all available chart tokens, filter for "charts" in [the PatternFly design tokens table](/tokens/all-patternfly-tokens). 
\ No newline at end of file
+To display the list of all available chart tokens, filter for "charts" in [the design tokens table](/foundations-and-styles/design-tokens/all-patternfly-tokens). 
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/axis-labels.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/axis-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/axis-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/axis-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/brush-and-zoom.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/brush-and-zoom.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/brush-and-zoom.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/brush-and-zoom.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/chart-legend.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/chart-legend.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/chart-legend.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/chart-legend.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/chart-on-a-card.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/chart-on-a-card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/chart-on-a-card.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/chart-on-a-card.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/interaction-legend-hide.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/interaction-legend-hide.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/interaction-legend-hide.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/interaction-legend-hide.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/interaction-legend-hover.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/interaction-legend-hover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/interaction-legend-hover.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/interaction-legend-hover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/sparkline-card.png b/packages/documentation-site/patternfly-docs/content/components/charts/about/img/sparkline-card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/about/img/sparkline-card.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/about/img/sparkline-card.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/area-chart/area-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/area-chart/area-chart.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/area-chart/area-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/area-chart/area-chart.md
index c54626aea9..3df1047fc9 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/area-chart/area-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/area-chart/area-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Area chart
-section: charts
+section: components
+subsection: charts
 ---
 An **area chart** is used to provide metrics for a single data point. While similar to a line chart in both form and function, it offers an area fill for visual emphasis. The area fill below the line also functions to indicate cumulative data.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/area-chart/img/area-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/area-chart/img/area-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/area-chart/img/area-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/area-chart/img/area-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/bar-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/bar-chart.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/bar-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/bar-chart.md
index 00116463bf..937fff675e 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/bar-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/bar-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Bar chart
-section: charts
+section: components
+subsection: charts
 ---
 A **bar chart** is used to easily display two variables, one on the horizontal x-axis and one on the vertical y-axis. They are helpful to visualize and compare categorical data.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/img/horizontal-bar-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/img/horizontal-bar-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/img/horizontal-bar-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/img/horizontal-bar-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/img/vertical-bar-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/img/vertical-bar-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bar-chart/img/vertical-bar-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/bar-chart/img/vertical-bar-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bullet-chart/bullet-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/bullet-chart/bullet-chart.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bullet-chart/bullet-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/bullet-chart/bullet-chart.md
index c18ab79415..123f60b0b2 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bullet-chart/bullet-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/bullet-chart/bullet-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Bullet chart
-section: charts
+section: components
+subsection: charts
 ---
 A **bullet chart** can be thought of as an extension to a bar chart that measures a dynamic value with thresholds and target values. While similar to [donut utilization charts](/charts/donut-utilization-chart), bullet charts can show underages and overages of data (below 0% and above 100%), visualize horizontally or vertically, and pack large amounts of information into a compact space. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bullet-chart/img/bullet-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/bullet-chart/img/bullet-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/bullet-chart/img/bullet-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/bullet-chart/img/bullet-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-for-charts.css b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-for-charts.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-for-charts.css
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-for-charts.css
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-for-charts.md b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-for-charts.md
similarity index 92%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-for-charts.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-for-charts.md
index 4a4b728d83..9c23382ecd 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-for-charts.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-for-charts.md
@@ -1,6 +1,7 @@
 ---
 id: Colors for charts
-section: charts
+section: components
+subsection: charts
 hideSource: true
 sortValue: 2
 ---
@@ -9,13 +10,13 @@ import { Alert, Grid, GridItem, Divider } from '@patternfly/react-core';
 import ColorsGrid from './colors-grid.js';
 import './colors-for-charts.css';
 
-import '../../components/components.css';
+import '../../components.css';
 
-**Note:** Our charts use separate design tokens from our standard library. To view a list of all chart tokens, apply the "chart" category filter to [the PatternFly design tokens table](/tokens/all-patternfly-tokens).
+**Note:** Our charts use separate design tokens from our standard library. To view a list of all chart tokens, apply the "chart" category filter to [the design tokens table](/foundations-and-styles/design-tokens/all-patternfly-tokens).
 
 ## Color palettes
 
-To create well-designed charts, you typically need to use multiple colors to best communicate your data. Our chart color options are all pulled from [standard PatternFly color palettes](/design-foundations/charts), but the amount of hues within each color family are more limited to ensure that your chart colors are distinct enough from each other. Your data will determine the number of colors and the type of colors you will need. 
+To create well-designed charts, you typically need to use multiple colors to best communicate your data. Our chart color options are all pulled from [standard PatternFly color palettes](/foundations-and-styles/colors), but the amount of hues within each color family are more limited to ensure that your chart colors are distinct enough from each other. Your data will determine the number of colors and the type of colors you will need. 
  
 <ColorsGrid />
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-grid.js b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-grid.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/colors-grid.js
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/colors-grid.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/example-palette.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/example-palette.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/example-palette.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/example-palette.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/few-variables.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/few-variables.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/few-variables.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/few-variables.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/figma-colorscale.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/figma-colorscale.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/figma-colorscale.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/figma-colorscale.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/many-variables.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/many-variables.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/many-variables.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/many-variables.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/monochromatic-annotated.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/monochromatic-annotated.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/monochromatic-annotated.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/monochromatic-annotated.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/monochromatic.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/monochromatic.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/monochromatic.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/monochromatic.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/nested-variables.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/nested-variables.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/nested-variables.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/nested-variables.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/success-and-failure.svg b/packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/success-and-failure.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors-for-charts/img/success-and-failure.svg
rename to packages/documentation-site/patternfly-docs/content/components/charts/colors-for-charts/img/success-and-failure.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-chart/donut-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/donut-chart/donut-chart.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-chart/donut-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-chart/donut-chart.md
index 1f2132fc6b..f7efeacde4 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-chart/donut-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/donut-chart/donut-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Donut chart
-section: charts
+section: components
+subsection: charts
 ---
 A **donut chart** represents relative amounts that must add up to 100%.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-chart/img/donut-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/donut-chart/img/donut-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-chart/img/donut-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-chart/img/donut-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/donut-utilization-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/donut-utilization-chart.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/donut-utilization-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/donut-utilization-chart.md
index 727c9102cb..e075322e9c 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/donut-utilization-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/donut-utilization-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Donut utilization chart
-section: charts
+section: components
+subsection: charts
 ---
 A **donut utlization chart** is a donut chart used specifically to show utilization metrics. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-2.png b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-2.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-hover.png b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-hover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-hover.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-hover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-with-threshold-hover.png b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-with-threshold-hover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-with-threshold-hover.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-with-threshold-hover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-with-threshold.png b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-with-threshold.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization-with-threshold.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization-with-threshold.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization.png b/packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/donut-utilization-chart/img/donut-utilization.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/donut-utilization-chart/img/donut-utilization.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/legend-chart/legend-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/legend-chart/legend-chart.md
similarity index 83%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/legend-chart/legend-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/legend-chart/legend-chart.md
index 83f9951e78..2cba8c16ed 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/legend-chart/legend-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/legend-chart/legend-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Legends
-section: charts
+section: components
+subsection: charts
 ---
 
 A **legend chart** is a chart with a legend next to it, showing the different data entries or values being represented, often by category. A legend can be added to any chart type.
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/line-chart/img/line-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/line-chart/img/line-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/line-chart/img/line-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/line-chart/img/line-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/line-chart/line-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/line-chart/line-chart.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/line-chart/line-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/line-chart/line-chart.md
index da40ed1f78..02ef258871 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/line-chart/line-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/line-chart/line-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Line chart
-section: charts
+section: components
+subsection: charts
 ---
 A **line chart** plots a series of discrete data samples to show continuous data and trend information. Sample values on the line can be measured and extracted.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/pie-chart/img/pie-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/pie-chart/img/pie-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/pie-chart/img/pie-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/pie-chart/img/pie-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/pie-chart/pie-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/pie-chart/pie-chart.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/pie-chart/pie-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/pie-chart/pie-chart.md
index a0236e7056..65d8d19bcc 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/pie-chart/pie-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/pie-chart/pie-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Pie chart
-section: charts
+section: components
+subsection: charts
 ---
 A **pie chart** is commonly used to show percentages or proportional data.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/scatter-chart/scatter-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/scatter-chart/scatter-chart.md
similarity index 82%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/scatter-chart/scatter-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/scatter-chart/scatter-chart.md
index fe165394a7..dc20117cc0 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/scatter-chart/scatter-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/scatter-chart/scatter-chart.md
@@ -1,5 +1,6 @@
 ---
 id: Scatter chart
-section: charts
+section: components
+subsection: charts
 ---
  A **scatter chart** uses dots to represent values in a chart. These dots can be added to area and line charts to outline specific interactive points along a line.
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/sparkline-chart/img/sparkline.png b/packages/documentation-site/patternfly-docs/content/components/charts/sparkline-chart/img/sparkline.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/sparkline-chart/img/sparkline.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/sparkline-chart/img/sparkline.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/sparkline-chart/sparkline-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/sparkline-chart/sparkline-chart.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/sparkline-chart/sparkline-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/sparkline-chart/sparkline-chart.md
index d6049d5fd5..bb7d181079 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/sparkline-chart/sparkline-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/sparkline-chart/sparkline-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Sparkline chart
-section: charts
+section: components
+subsection: charts
 ---
 
 A **sparkline** is a small chart that helps users analyze data and understand trends and patterns.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/img/horizontal-stacked-bar-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/img/horizontal-stacked-bar-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/img/horizontal-stacked-bar-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/img/horizontal-stacked-bar-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/img/vertical-stacked-bar-chart.png b/packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/img/vertical-stacked-bar-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/img/vertical-stacked-bar-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/img/vertical-stacked-bar-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/stacked-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/stacked-chart.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/stacked-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/stacked-chart.md
index 5a7f2e9e97..9028ec6e48 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/stacked-chart/stacked-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/stacked-chart/stacked-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Stack chart
-section: charts
+section: components
+subsection: charts
 ---
 A **stacked bar chart** describes totals while allowing a degree of internal breakdown of its data. Stacked bar charts can be illustrated vertically and horizontally depending on available space and the described data.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/threshold-chart/threshold-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/threshold-chart/threshold-chart.md
similarity index 76%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/threshold-chart/threshold-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/threshold-chart/threshold-chart.md
index 467decbe8c..0c046be607 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/threshold-chart/threshold-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/threshold-chart/threshold-chart.md
@@ -1,5 +1,6 @@
 ---
 id: Threshold chart
-section: charts
+section: components
+subsection: charts
 ---
 A **threshold chart** can be used to visually specify a threshold for certain variables on the chart.
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/tooltip-chart/img/chart-tooltip.png b/packages/documentation-site/patternfly-docs/content/components/charts/tooltip-chart/img/chart-tooltip.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/tooltip-chart/img/chart-tooltip.png
rename to packages/documentation-site/patternfly-docs/content/components/charts/tooltip-chart/img/chart-tooltip.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/tooltip-chart/tooltip-chart.md b/packages/documentation-site/patternfly-docs/content/components/charts/tooltip-chart/tooltip-chart.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/charts/tooltip-chart/tooltip-chart.md
rename to packages/documentation-site/patternfly-docs/content/components/charts/tooltip-chart/tooltip-chart.md
index 10a4cf2234..39be0ac763 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/tooltip-chart/tooltip-chart.md
+++ b/packages/documentation-site/patternfly-docs/content/components/charts/tooltip-chart/tooltip-chart.md
@@ -1,6 +1,7 @@
 ---
 id: Tooltips
-section: charts
+section: components
+subsection: charts
 ---
 
 A **tooltip chart** is a chart with tooltips that appear when users hover over items within it.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/checkbox.md b/packages/documentation-site/patternfly-docs/content/components/checkbox/checkbox.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/checkbox.md
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/checkbox.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-alignment.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-alignment.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-alignment.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-alignment.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-nested.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-nested.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-nested.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-nested.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-usage-multi.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-usage-multi.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-usage-multi.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-usage-multi.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-usage-single.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-usage-single.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-usage-single.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-usage-single.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-vs-switch-1.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-vs-switch-1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-vs-switch-1.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-vs-switch-1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-vs-switch-2.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-vs-switch-2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-vs-switch-2.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-vs-switch-2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-vs-switch-3.svg b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-vs-switch-3.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/CB-vs-switch-3.svg
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/CB-vs-switch-3.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/checkbox-horizontal.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/checkbox-horizontal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/checkbox-horizontal.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/checkbox-horizontal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/checkbox-vertical.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/checkbox-vertical.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/checkbox-vertical.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/checkbox-vertical.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/group-checkbox.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/group-checkbox.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/group-checkbox.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/group-checkbox.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/nested-controls-checkbox.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/nested-controls-checkbox.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/nested-controls-checkbox.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/nested-controls-checkbox.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/one-checkbox.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/one-checkbox.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/one-checkbox.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/one-checkbox.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/switch-check-1.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/switch-check-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/switch-check-1.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/switch-check-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/switch-check-2.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/switch-check-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/switch-check-2.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/switch-check-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/switch-check-3.png b/packages/documentation-site/patternfly-docs/content/components/checkbox/img/switch-check-3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/checkbox/img/switch-check-3.png
rename to packages/documentation-site/patternfly-docs/content/components/checkbox/img/switch-check-3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/chip/chip.md b/packages/documentation-site/patternfly-docs/content/components/chip/chip.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/chip/chip.md
rename to packages/documentation-site/patternfly-docs/content/components/chip/chip.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/chip/img/chip-group-elements.png b/packages/documentation-site/patternfly-docs/content/components/chip/img/chip-group-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/chip/img/chip-group-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/chip/img/chip-group-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/chip/img/chip-group.png b/packages/documentation-site/patternfly-docs/content/components/chip/img/chip-group.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/chip/img/chip-group.png
rename to packages/documentation-site/patternfly-docs/content/components/chip/img/chip-group.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/clipboard-copy.md b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/clipboard-copy.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/clipboard-copy.md
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/clipboard-copy.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-description-list.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-description-list.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-description-list.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-description-list.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-editable.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-editable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-editable.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-editable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-elements.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-expandable.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-expandable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-expandable.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-expandable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-form.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-form.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-form.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-form.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-inline-compact-1.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-inline-compact-1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-inline-compact-1.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-inline-compact-1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-inline-compact-2.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-inline-compact-2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-inline-compact-2.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-inline-compact-2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-inline-compact-4.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-inline-compact-4.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-inline-compact-4.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-inline-compact-4.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-readonly.svg b/packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-readonly.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/clipboard-copy/img/clipboard-copy-readonly.svg
rename to packages/documentation-site/patternfly-docs/content/components/clipboard-copy/img/clipboard-copy-readonly.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/code-block.md b/packages/documentation-site/patternfly-docs/content/components/code-block/code-block.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/code-block.md
rename to packages/documentation-site/patternfly-docs/content/components/code-block/code-block.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-collapsed-expanded.png b/packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-collapsed-expanded.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-collapsed-expanded.png
rename to packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-collapsed-expanded.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-elements.svg b/packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-expanded.svg b/packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-expanded.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-expanded.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-expanded.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-multiple-actions.png b/packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-multiple-actions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-multiple-actions.png
rename to packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-multiple-actions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-multiple-actions.svg b/packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-multiple-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-multiple-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-multiple-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-structure.png b/packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-structure.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-block/img/code-block-structure.png
rename to packages/documentation-site/patternfly-docs/content/components/code-block/img/code-block-structure.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/code-editor.md b/packages/documentation-site/patternfly-docs/content/components/code-editor/code-editor.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/code-editor.md
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/code-editor.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/basic-code-editor.png b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/basic-code-editor.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/basic-code-editor.png
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/basic-code-editor.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-actions.png b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-actions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-actions.png
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-actions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-actions.svg b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-dark.png b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-dark.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-dark.png
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-dark.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-dark.svg b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-dark.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-dark.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-dark.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-empty.png b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-empty.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-empty.png
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-empty.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-empty.svg b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-empty.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-empty.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-empty.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-light.svg b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-light.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-light.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-light.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-read-only.png b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-read-only.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-read-only.png
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-read-only.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-read-only.svg b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-read-only.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-read-only.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-read-only.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-shortcuts.png b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-shortcuts.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-shortcuts.png
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-shortcuts.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-shortcuts.svg b/packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-shortcuts.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/code-editor/img/code-editor-shortcuts.svg
rename to packages/documentation-site/patternfly-docs/content/components/code-editor/img/code-editor-shortcuts.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/components.css b/packages/documentation-site/patternfly-docs/content/components/components.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/components.css
rename to packages/documentation-site/patternfly-docs/content/components/components.css
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/content.md b/packages/documentation-site/patternfly-docs/content/components/content/content.md
similarity index 69%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/content.md
rename to packages/documentation-site/patternfly-docs/content/components/content/content.md
index 7fab5f7a56..bf3f58abf7 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/content.md
+++ b/packages/documentation-site/patternfly-docs/content/components/content/content.md
@@ -5,7 +5,7 @@ section: components
 
 ## Usage
 
-Content can be used anywhere in your designs and can take on different formats. Read [PatternFly’s typography page](/design-foundations/typography) for more guidelines on how to use content in your UIs, and the different styles available.
+Content can be used anywhere in your designs and can take on different formats. Read [PatternFly’s typography page](/foundations-and-styles/typography) for more guidelines on how to use content in your UIs, and the different styles available.
 
 When using the content component, the content type that you use will align with our specific design recommendation for that type. For example, heading content will align with our heading text styles, while body content will align with our body text styles. 
 
@@ -15,7 +15,7 @@ Margins will be automatically applied to the content component, based on its loc
 
 ### Line length 
 
-Follow our [typography guidelines](/design-guidelines/typography#line-length) for line length, which recommend staying between 20 and 100 characters for better readability. 
+Follow our [typography guidelines](/foundations-and-styles/typography#line-length) for line length, which recommend staying between 20 and 100 characters for better readability. 
 
 ### When to use content vs. title
 
@@ -30,11 +30,11 @@ Follow our [typography guidelines](/design-guidelines/typography#line-length) fo
 
 ### Body content
 
-[Body content](/design-foundations/typography#body-text) makes up the majority of the content on a page and is used across PatternFly components.
+[Body content](/foundations-and-styles/typography#body-text) makes up the majority of the content on a page and is used across PatternFly components.
 
 ### Headings 
 
-[Headings](/design-foundations/typography#headings) utilize bold and prominent styling to help users quickly understand the subject of a page or section. 
+[Headings](/foundations-and-styles/typography#headings) utilize bold and prominent styling to help users quickly understand the subject of a page or section. 
 
 ### Editorial content 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/img/content-types.png b/packages/documentation-site/patternfly-docs/content/components/content/img/content-types.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/img/content-types.png
rename to packages/documentation-site/patternfly-docs/content/components/content/img/content-types.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/img/editorial-content.png b/packages/documentation-site/patternfly-docs/content/components/content/img/editorial-content.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/content/img/editorial-content.png
rename to packages/documentation-site/patternfly-docs/content/components/content/img/editorial-content.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/context-selector.md b/packages/documentation-site/patternfly-docs/content/components/context-selector/context-selector.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/context-selector.md
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/context-selector.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/context-selector-elements.svg b/packages/documentation-site/patternfly-docs/content/components/context-selector/img/context-selector-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/context-selector-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/img/context-selector-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/context-selector-footer.svg b/packages/documentation-site/patternfly-docs/content/components/context-selector/img/context-selector-footer.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/context-selector-footer.svg
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/img/context-selector-footer.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/context-selector-search.svg b/packages/documentation-site/patternfly-docs/content/components/context-selector/img/context-selector-search.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/context-selector-search.svg
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/img/context-selector-search.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/masthead-context-selector.svg b/packages/documentation-site/patternfly-docs/content/components/context-selector/img/masthead-context-selector.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/masthead-context-selector.svg
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/img/masthead-context-selector.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/nav-context-selector.svg b/packages/documentation-site/patternfly-docs/content/components/context-selector/img/nav-context-selector.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/nav-context-selector.svg
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/img/nav-context-selector.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/page-context-selector.svg b/packages/documentation-site/patternfly-docs/content/components/context-selector/img/page-context-selector.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/context-selector/img/page-context-selector.svg
rename to packages/documentation-site/patternfly-docs/content/components/context-selector/img/page-context-selector.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/data-list.md b/packages/documentation-site/patternfly-docs/content/components/data-list/data-list.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/data-list.md
rename to packages/documentation-site/patternfly-docs/content/components/data-list/data-list.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/actionable-data-list.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/actionable-data-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/actionable-data-list.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/actionable-data-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/actionable-list.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/actionable-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/actionable-list.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/actionable-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/compact-and-default-list.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/compact-and-default-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/compact-and-default-list.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/compact-and-default-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/compact-datalist.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/compact-datalist.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/compact-datalist.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/compact-datalist.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/compact-list.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/compact-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/compact-list.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/compact-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-clickable.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-clickable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-clickable.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-clickable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-clickable.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-clickable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-clickable.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-clickable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable1.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable1.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable1.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable1.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable2.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable2.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable2.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable2.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable3.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable3.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable3.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable3.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable4.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable4.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-draggable4.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-draggable4.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-elements.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-elements.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-expandable.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-expandable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-expandable.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-expandable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-expandable.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-expandable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-expandable.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-expandable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-selectable.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-selectable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-selectable.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-selectable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-selectable.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-selectable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-selectable.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-selectable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-variations.svg b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-variations.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalist-variations.svg
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalist-variations.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalistdraggable1.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalistdraggable1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalistdraggable1.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalistdraggable1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalistdraggable2.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/datalistdraggable2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/datalistdraggable2.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/datalistdraggable2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/default-datalist.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/default-datalist.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/default-datalist.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/default-datalist.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/expandable-data-list.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/expandable-data-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/expandable-data-list.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/expandable-data-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/expandable-list.png b/packages/documentation-site/patternfly-docs/content/components/data-list/img/expandable-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/data-list/img/expandable-list.png
rename to packages/documentation-site/patternfly-docs/content/components/data-list/img/expandable-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/date-picker.md b/packages/documentation-site/patternfly-docs/content/components/date-picker/date-picker.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/date-picker.md
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/date-picker.md
index a8da2a634d..d9955ff13d 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/date-picker.md
+++ b/packages/documentation-site/patternfly-docs/content/components/date-picker/date-picker.md
@@ -111,7 +111,7 @@ Some use cases will call for more advanced scheduling options, such as schedulin
 ### Date format
 Date formats are product-specific and often depend on user locale. To minimize confusion, choose one date format and keep it consistent. If one date picker displays MM/DD/YYYY, be sure to repeat the same date format throughout your interface.
 
-Learn more about recommended date and time conventions in our [date and time guidelines](/ux-writing/numerics).
+Learn more about recommended date and time conventions in our [date and time guidelines](/content-design/numerics).
 
 ### Placeholder text
 Always use placeholder text in date fields to provide an example of the accepted date format. Placeholder text will disappear after users begin inputting their own date.
@@ -139,4 +139,4 @@ Examples:
 
 <img src="./img/Error message date picker.png" alt="Date picker with error message" width="200"/>
 
-For more information about writing effective error messages, see our [writing guide.](/ux-writing/error-messages)
+For more information about writing effective error messages, see our [writing guide.](/content-design/error-messages)
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Advance scheduling modal.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Advance scheduling modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Advance scheduling modal.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Advance scheduling modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Custom date range - the most frequent options.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Custom date range - the most frequent options.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Custom date range - the most frequent options.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Custom date range - the most frequent options.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Custom date range filtering.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Custom date range filtering.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Custom date range filtering.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Custom date range filtering.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Date picker in form.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Date picker in form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Date picker in form.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Date picker in form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Date picker in toolbar.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Date picker in toolbar.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Date picker in toolbar.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Date picker in toolbar.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Date range selection.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Date range selection.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Date range selection.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Date range selection.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Error message date picker.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Error message date picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Error message date picker.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Error message date picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/In toolbar attribute filter.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/In toolbar attribute filter.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/In toolbar attribute filter.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/In toolbar attribute filter.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/In toolbar filter group vertical.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/In toolbar filter group vertical.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/In toolbar filter group vertical.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/In toolbar filter group vertical.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Picker with All day checkbox.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Picker with All day checkbox.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Picker with All day checkbox.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Picker with All day checkbox.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Time and Date picker horizontal.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Time and Date picker horizontal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Time and Date picker horizontal.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Time and Date picker horizontal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Time and Date picker vertical with labels.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/Time and Date picker vertical with labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/Time and Date picker vertical with labels.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/Time and Date picker vertical with labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/date-picker.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/date-picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/date-picker.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/date-picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/helper text date picker.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/helper text date picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/helper text date picker.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/helper text date picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/placeholder date picker.png b/packages/documentation-site/patternfly-docs/content/components/date-picker/img/placeholder date picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/date-picker/img/placeholder date picker.png
rename to packages/documentation-site/patternfly-docs/content/components/date-picker/img/placeholder date picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/description-list.md b/packages/documentation-site/patternfly-docs/content/components/description-list/description-list.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/description-list.md
rename to packages/documentation-site/patternfly-docs/content/components/description-list/description-list.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/description-list-elements.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/description-list-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/description-list-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/description-list-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-columns1.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-columns1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-columns1.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-columns1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-columns2.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-columns2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-columns2.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-columns2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-default.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-default.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-default.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-default.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-helptext.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-helptext.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-helptext.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-helptext.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-horizontal.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-horizontal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-horizontal.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-horizontal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-usage.svg b/packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/description-list/img/descriptionlist-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/description-list/img/descriptionlist-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/divider.md b/packages/documentation-site/patternfly-docs/content/components/divider/divider.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/divider.md
rename to packages/documentation-site/patternfly-docs/content/components/divider/divider.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/img/dashboard-dividers.png b/packages/documentation-site/patternfly-docs/content/components/divider/img/dashboard-dividers.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/img/dashboard-dividers.png
rename to packages/documentation-site/patternfly-docs/content/components/divider/img/dashboard-dividers.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/img/menu-divider.png b/packages/documentation-site/patternfly-docs/content/components/divider/img/menu-divider.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/img/menu-divider.png
rename to packages/documentation-site/patternfly-docs/content/components/divider/img/menu-divider.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/img/vertical-divider.png b/packages/documentation-site/patternfly-docs/content/components/divider/img/vertical-divider.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/divider/img/vertical-divider.png
rename to packages/documentation-site/patternfly-docs/content/components/divider/img/vertical-divider.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/drag.md b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/drag.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/drag.md
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/drag.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-1.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-1.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-2.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-2.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-3.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-3.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-4-error.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-4-error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Card-drag-4-error.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Card-drag-4-error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-1.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-1.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-2.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-2.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-3.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-3.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-4-error.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-4-error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Multiple-list-drag-4-error.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Multiple-list-drag-4-error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-1.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-1.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-2-3.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-2-3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-2-3.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-2-3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-4.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-4.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-4.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-4.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-5-error.png b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-5-error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/Simple-list-drag-5-error.png
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/Simple-list-drag-5-error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards1.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards1.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards2.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards2.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards3.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards3.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards3.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards3.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards4.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards4.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-cards4.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-cards4.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi1.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi1.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi2.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi2.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi3.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi3.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi3.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi3.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi4.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi4.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-multi4.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-multi4.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple1.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple1.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple23.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple23.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple23.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple23.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple4.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple4.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple4.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple4.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple5.svg b/packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple5.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drag-and-drop/img/dnd-simple5.svg
rename to packages/documentation-site/patternfly-docs/content/components/drag-and-drop/img/dnd-simple5.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/drawer.md b/packages/documentation-site/patternfly-docs/content/components/drawer/drawer.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/drawer.md
rename to packages/documentation-site/patternfly-docs/content/components/drawer/drawer.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-inline.svg b/packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-inline.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-inline.svg
rename to packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-inline.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-overlay.svg b/packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-overlay.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-overlay.svg
rename to packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-overlay.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-placement-bottom.svg b/packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-placement-bottom.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-placement-bottom.svg
rename to packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-placement-bottom.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-placement-left.svg b/packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-placement-left.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-placement-left.svg
rename to packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-placement-left.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-placement-right.svg b/packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-placement-right.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-placement-right.svg
rename to packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-placement-right.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-splitter.svg b/packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-splitter.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/drawer/img/drawer-splitter.svg
rename to packages/documentation-site/patternfly-docs/content/components/drawer/img/drawer-splitter.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/dropdown.md b/packages/documentation-site/patternfly-docs/content/components/dropdown/dropdown.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/dropdown.md
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/dropdown.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/dropdown-checkbox.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/dropdown-checkbox.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/dropdown-checkbox.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/dropdown-checkbox.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/dropdown-elements.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/dropdown-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/dropdown-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/dropdown-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/dropdown-variations.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/dropdown-variations.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/dropdown-variations.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/dropdown-variations.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/icon-toggle.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/icon-toggle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/icon-toggle.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/icon-toggle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/plain-toggle.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/plain-toggle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/plain-toggle.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/plain-toggle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/primary-toggle.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/primary-toggle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/primary-toggle.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/primary-toggle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/secondary-toggle.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/secondary-toggle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/secondary-toggle.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/secondary-toggle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/split-button-actions.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/split-button-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/split-button-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/split-button-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/split-button-behavior.svg b/packages/documentation-site/patternfly-docs/content/components/dropdown/img/split-button-behavior.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dropdown/img/split-button-behavior.svg
rename to packages/documentation-site/patternfly-docs/content/components/dropdown/img/split-button-behavior.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/dual-list-selector.md b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/dual-list-selector.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/dual-list-selector.md
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/dual-list-selector.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/basic-dual-list.svg b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/basic-dual-list.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/basic-dual-list.svg
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/basic-dual-list.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/dual-list-1.gif b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/dual-list-1.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/dual-list-1.gif
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/dual-list-1.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/dual-list-2.gif b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/dual-list-2.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/dual-list-2.gif
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/dual-list-2.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/dual-list-elements.svg b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/dual-list-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/dual-list-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/dual-list-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/expandable-dual-list.svg b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/expandable-dual-list.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/expandable-dual-list.svg
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/expandable-dual-list.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/ghost-row.svg b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/ghost-row.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/ghost-row.svg
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/ghost-row.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/ondrag-event.svg b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/ondrag-event.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/ondrag-event.svg
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/ondrag-event.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/postdrag-event.svg b/packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/postdrag-event.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/dual-list-selector/img/postdrag-event.svg
rename to packages/documentation-site/patternfly-docs/content/components/dual-list-selector/img/postdrag-event.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/empty-state.md b/packages/documentation-site/patternfly-docs/content/components/empty-state/empty-state.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/empty-state.md
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/empty-state.md
index 2cfa1905ec..3e3fce4a1e 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/empty-state.md
+++ b/packages/documentation-site/patternfly-docs/content/components/empty-state/empty-state.md
@@ -341,7 +341,7 @@ State what isn't there, and then give the user a next step. Empty states should
 </div>
 
 ### Capitalization and punctuation 
-Use [sentence case](/ux-writing/capitalization) in your empty states: Capitalize only the first letter of the first word in the heading, body, buttons, or links. However, be sure to capitalize the first letter in all proper nouns, product names, acronyms, and initialisms, regardless of where they appear in the heading, body, buttons, or links.
+Use [sentence case](/content-design/capitalization) in your empty states: Capitalize only the first letter of the first word in the heading, body, buttons, or links. However, be sure to capitalize the first letter in all proper nouns, product names, acronyms, and initialisms, regardless of where they appear in the heading, body, buttons, or links.
 
 Add a period at the end of full sentences in the body, but do not add a period at the end of headings or buttons. 
 
@@ -350,7 +350,7 @@ Add a period at the end of full sentences in the body, but do not add a period a
 </div>
 
 ### Voice and tone
-Pay close attention to the [voice and tone](/ux-writing/brand-voice-and-tone) in your empty state. Your voice should align with your company’s unique brand voice. Your tone, on the other hand, should adjust depending on the context—consider the user’s emotions and adjust your approach accordingly. 
+Pay close attention to the [voice and tone](/content-design/brand-voice-and-tone) in your empty state. Your voice should align with your company’s unique brand voice. Your tone, on the other hand, should adjust depending on the context—consider the user’s emotions and adjust your approach accordingly. 
 
 It’s OK to use “you” and “your,” but never assign blame to the user. Also, avoid using “please” in an empty state. It’s extraneous and can make your message sound too formal.  
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/access-denied.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/access-denied.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/access-denied.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/access-denied.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/add-card-empty-state.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/add-card-empty-state.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/add-card-empty-state.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/add-card-empty-state.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/add-or-create.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/add-or-create.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/add-or-create.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/add-or-create.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/add.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/add.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/add.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/add.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/back-end-failure.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/back-end-failure.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/back-end-failure.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/back-end-failure.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/config.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/config.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/config.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/config.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/configuration.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/configuration.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/configuration.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/configuration.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/desktop-page-es.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/desktop-page-es.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/desktop-page-es.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/desktop-page-es.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/elements.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/empty-state.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/empty-state.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/empty-state.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/empty-state.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/error.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/error.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-button-action.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-button-action.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-button-action.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-button-action.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-capitalization.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-capitalization.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-capitalization.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-capitalization.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-card.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-card.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-card.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-card.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-creation.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-creation.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-creation.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-creation.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-details.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-details.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-details.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-details.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-elements.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-failure.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-failure.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-failure.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-failure.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-full-page-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-full-page-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-full-page-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-full-page-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-getting-started.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-getting-started.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-getting-started.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-getting-started.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-link-action.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-link-action.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-link-action.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-link-action.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-mobile-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-mobile-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-mobile-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-mobile-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-multi-action.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-multi-action.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-multi-action.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-multi-action.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-no-access.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-no-access.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-no-access.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-no-access.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-no-results.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-no-results.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-no-results.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-no-results.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-required-config.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-required-config.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-required-config.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-required-config.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-secondary-action-multi.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-secondary-action-multi.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-secondary-action-multi.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-secondary-action-multi.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-secondary-action.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-secondary-action.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-secondary-action.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-secondary-action.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-success-page.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-success-page.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-success-page.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-success-page.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-success-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-success-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-success-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-success-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-table-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-table-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/es-table-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/es-table-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/get started icon copy 3.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/get started icon copy 3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/get started icon copy 3.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/get started icon copy 3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/level-of-detail.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/level-of-detail.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/level-of-detail.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/level-of-detail.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/lock.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/lock.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/lock.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/lock.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/mobile-page-es.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/mobile-page-es.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/mobile-page-es.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/mobile-page-es.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/no-data.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/no-data.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/no-data.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/no-data.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/one-cta-body.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/one-cta-body.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/one-cta-body.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/one-cta-body.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/one-cta-primary.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/one-cta-primary.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/one-cta-primary.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/one-cta-primary.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/rocket.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/rocket.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/rocket.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/rocket.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/search.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/search.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/search.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/search.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/sentence-case.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/sentence-case.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/sentence-case.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/sentence-case.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/solo-link.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/solo-link.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/solo-link.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/solo-link.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/success-wizard.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/success-wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/success-wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/success-wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/success.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/success.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/success.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/success.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/table-es.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/table-es.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/table-es.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/table-es.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/two-ctas-body.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/two-ctas-body.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/two-ctas-body.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/two-ctas-body.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/two-ctas-primary.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/two-ctas-primary.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/two-ctas-primary.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/two-ctas-primary.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/xl-getstarted.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/xl-getstarted.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/xl-getstarted.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/xl-getstarted.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/xl-success.png b/packages/documentation-site/patternfly-docs/content/components/empty-state/img/xl-success.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/empty-state/img/xl-success.png
rename to packages/documentation-site/patternfly-docs/content/components/empty-state/img/xl-success.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/expandable-section.md b/packages/documentation-site/patternfly-docs/content/components/expandable-section/expandable-section.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/expandable-section.md
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/expandable-section.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/disclosure.png b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/disclosure.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/disclosure.png
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/disclosure.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/documentation.png b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/documentation.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/documentation.png
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/documentation.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/elements.png b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/elements.png
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-disclosure.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-disclosure.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-disclosure.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-disclosure.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-docs-page.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-docs-page.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-docs-page.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-docs-page.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-elements.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-form.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-form.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-form.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-form.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-inline-alert.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-inline-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-inline-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-inline-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-panel.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-panel.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-panel.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-panel.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-truncate.svg b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-truncate.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/exp-sect-truncate.svg
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/exp-sect-truncate.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/form.png b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/form.png
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/inline-alert.png b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/inline-alert.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/inline-alert.png
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/inline-alert.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/side-panel.png b/packages/documentation-site/patternfly-docs/content/components/expandable-section/img/side-panel.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/expandable-section/img/side-panel.png
rename to packages/documentation-site/patternfly-docs/content/components/expandable-section/img/side-panel.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/file-upload-multiple.md b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/file-upload-multiple.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/file-upload-multiple.md
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/file-upload-multiple.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/best-practices.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/best-practices.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/best-practices.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/best-practices.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/elements.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/loading-states.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/loading-states.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/loading-states.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/loading-states.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/multi-upload-usage.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/multi-upload-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/multi-upload-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/multi-upload-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-button-2.png b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-button-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-button-2.png
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-button-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-button.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-button.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-button.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-button.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-drag-drop.png b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-drag-drop.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-drag-drop.png
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-drag-drop.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-drag-drop.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-drag-drop.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/upload-via-drag-drop.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/upload-via-drag-drop.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/validation.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/validation.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload-multiple/img/validation.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload-multiple/img/validation.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/Fileupload.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/Fileupload.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/Fileupload.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/Fileupload.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/Loading.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/Loading.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/Loading.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/Loading.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/file-upload.md b/packages/documentation-site/patternfly-docs/content/components/file-upload/file-upload.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/file-upload.md
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/file-upload.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/FileError.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/img/FileError.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/FileError.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/img/FileError.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/Fileupload.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/img/Fileupload.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/Fileupload.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/img/Fileupload.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/Loading.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/img/Loading.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/Loading.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/img/Loading.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/Noneditable.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/img/Noneditable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/Noneditable.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/img/Noneditable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/editable.svg b/packages/documentation-site/patternfly-docs/content/components/file-upload/img/editable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/file-upload/img/editable.svg
rename to packages/documentation-site/patternfly-docs/content/components/file-upload/img/editable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/form-control.md b/packages/documentation-site/patternfly-docs/content/components/form-control/form-control.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/form-control.md
rename to packages/documentation-site/patternfly-docs/content/components/form-control/form-control.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-custom-icons.svg b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-custom-icons.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-custom-icons.svg
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-custom-icons.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-disabled.svg b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-disabled.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-disabled.svg
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-disabled.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-errors.gif b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-errors.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-errors.gif
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-errors.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-read-only-boxed.svg b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-read-only-boxed.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-read-only-boxed.svg
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-read-only-boxed.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-read-only-plain.svg b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-read-only-plain.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-read-only-plain.svg
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-read-only-plain.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-success.svg b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-success.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-success.svg
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-success.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-variations.svg b/packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-variations.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/FC-variations.svg
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/FC-variations.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/disable_example.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/disable_example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/disable_example.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/disable_example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/formControlTypes.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/formControlTypes.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/formControlTypes.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/formControlTypes.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/formcontrol.gif b/packages/documentation-site/patternfly-docs/content/components/form-control/img/formcontrol.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/formcontrol.gif
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/formcontrol.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout-2023.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout-2023.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout-2023.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout-2023.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout-boxed.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout-boxed.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout-boxed.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout-boxed.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout-plain.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout-plain.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout-plain.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout-plain.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/greyedout.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/greyedout.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/search.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/search.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/search.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/search.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/success_example.png b/packages/documentation-site/patternfly-docs/content/components/form-control/img/success_example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-control/img/success_example.png
rename to packages/documentation-site/patternfly-docs/content/components/form-control/img/success_example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-select/form-select.md b/packages/documentation-site/patternfly-docs/content/components/form-select/form-select.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form-select/form-select.md
rename to packages/documentation-site/patternfly-docs/content/components/form-select/form-select.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/forms.md b/packages/documentation-site/patternfly-docs/content/components/form/forms.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/forms.md
rename to packages/documentation-site/patternfly-docs/content/components/form/forms.md
index d0e07bab52..e722dc3515 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/forms.md
+++ b/packages/documentation-site/patternfly-docs/content/components/form/forms.md
@@ -307,13 +307,13 @@ Because field groups call for more clicks, tabs, and interactions to reach form
 ![Example of nested expandable field groups in a form.](./img/form-multi-groups.svg)
 </div>
 
-To view an interactive example of field groups, see our [field groups demo](/components/form#field-groups).
+To view an interactive example of field groups, see our [field groups demo](/components/forms/form#field-groups).
 
 ## Spacing
 Forms may be placed in several contexts including on a page, in a wizard, or in a modal. Your chosen form placement may impact specific spacing considerations, but general form spacing requirements apply across these contexts.
 
 ### General spacing
-Always add 24px of spacing underneath each form input. If a form input includes helper text, this 24px spacing should start below the helper text. Spacing between data inputs like checkboxes and radio buttons should also be 24px when on the same line or stacked on one another. For more spacing information, consult the [PatternFly spacer guidelines](/design-foundations/spacers#considering-line-height-and-padding).
+Always add 24px of spacing underneath each form input. If a form input includes helper text, this 24px spacing should start below the helper text. Spacing between data inputs like checkboxes and radio buttons should also be 24px when on the same line or stacked on one another. For more spacing information, consult the [PatternFly spacer guidelines](/foundations-and-styles/spacers#considering-line-height-and-padding).
 
 <div class="ws-docs-content-img">
 ![Example of a basic form with spacers to show how elements should be spaced within it.](./img/form-spacing.svg)
@@ -458,7 +458,7 @@ If a user formats an input incorrectly, avoid unclear error messages like *Inval
 * *Date format must be MM-DD-YYYY*
 * *Enter a valid email: email@provider.com*
 
-For more error message guidance, see our [UX writing style guide](/ux-writing/error-messages).
+For more error message guidance, see our [UX writing style guide](/content-design/error-messages).
 
 ### Buttons
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/button-placement.png b/packages/documentation-site/patternfly-docs/content/components/form/img/button-placement.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/button-placement.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/button-placement.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/data-inputs.png b/packages/documentation-site/patternfly-docs/content/components/form/img/data-inputs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/data-inputs.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/data-inputs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/error-message.png b/packages/documentation-site/patternfly-docs/content/components/form/img/error-message.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/error-message.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/error-message.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/field-groups.png b/packages/documentation-site/patternfly-docs/content/components/form/img/field-groups.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/field-groups.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/field-groups.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-button-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-button-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-button-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-button-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-button-validation.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-button-validation.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-button-validation.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-button-validation.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-columns-rules-1.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-columns-rules-1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-columns-rules-1.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-columns-rules-1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-columns-rules-2.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-columns-rules-2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-columns-rules-2.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-columns-rules-2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-columns.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-data-columns.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-columns.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-data-columns.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-horizontal.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-data-horizontal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-horizontal.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-data-horizontal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-inputs.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-data-inputs.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-inputs.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-data-inputs.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-vertical.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-data-vertical.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-data-vertical.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-data-vertical.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-elements.png b/packages/documentation-site/patternfly-docs/content/components/form/img/form-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-elements.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-error-validation.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-error-validation.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-error-validation.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-error-validation.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-errors.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-errors.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-errors.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-errors.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-helper-text.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-helper-text.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-helper-text.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-helper-text.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-left-labels.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-left-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-left-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-left-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-modal.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-modal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-modal.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-modal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-multi-groups.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-multi-groups.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-multi-groups.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-multi-groups.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-page-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-page-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-page-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-page-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-placeholders.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-placeholders.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-placeholders.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-placeholders.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-popovers.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-popovers.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-popovers.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-popovers.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-progressive-disclosure.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-progressive-disclosure.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-progressive-disclosure.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-progressive-disclosure.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-required-field.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-required-field.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-required-field.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-required-field.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-required-message.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-required-message.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-required-message.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-required-message.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-sections.png b/packages/documentation-site/patternfly-docs/content/components/form/img/form-sections.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-sections.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-sections.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-sections.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-sections.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-sections.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-sections.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-spacing.png b/packages/documentation-site/patternfly-docs/content/components/form/img/form-spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-spacing.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-top-labels.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-top-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-top-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-top-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-wizard-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/form/img/form-wizard-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/form-wizard-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/form/img/form-wizard-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/helper-text.png b/packages/documentation-site/patternfly-docs/content/components/form/img/helper-text.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/helper-text.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/helper-text.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/horizontal-list.png b/packages/documentation-site/patternfly-docs/content/components/form/img/horizontal-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/horizontal-list.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/horizontal-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/inline-validation-on-fields.png b/packages/documentation-site/patternfly-docs/content/components/form/img/inline-validation-on-fields.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/inline-validation-on-fields.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/inline-validation-on-fields.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/input-width.png b/packages/documentation-site/patternfly-docs/content/components/form/img/input-width.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/input-width.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/input-width.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/left-labels.png b/packages/documentation-site/patternfly-docs/content/components/form/img/left-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/left-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/left-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/modal-form.png b/packages/documentation-site/patternfly-docs/content/components/form/img/modal-form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/modal-form.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/modal-form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/multi-column-eg.png b/packages/documentation-site/patternfly-docs/content/components/form/img/multi-column-eg.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/multi-column-eg.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/multi-column-eg.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/multi-column-read.png b/packages/documentation-site/patternfly-docs/content/components/form/img/multi-column-read.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/multi-column-read.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/multi-column-read.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/multicolumn-list.png b/packages/documentation-site/patternfly-docs/content/components/form/img/multicolumn-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/multicolumn-list.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/multicolumn-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/page-form.png b/packages/documentation-site/patternfly-docs/content/components/form/img/page-form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/page-form.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/page-form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/placeholder-example.png b/packages/documentation-site/patternfly-docs/content/components/form/img/placeholder-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/placeholder-example.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/placeholder-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/placeholder-format.png b/packages/documentation-site/patternfly-docs/content/components/form/img/placeholder-format.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/placeholder-format.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/placeholder-format.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/placeholder-text.png b/packages/documentation-site/patternfly-docs/content/components/form/img/placeholder-text.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/placeholder-text.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/placeholder-text.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/popover.png b/packages/documentation-site/patternfly-docs/content/components/form/img/popover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/popover.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/popover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/progressive-disclosure.png b/packages/documentation-site/patternfly-docs/content/components/form/img/progressive-disclosure.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/progressive-disclosure.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/progressive-disclosure.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/radio-check.png b/packages/documentation-site/patternfly-docs/content/components/form/img/radio-check.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/radio-check.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/radio-check.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/required-field.png b/packages/documentation-site/patternfly-docs/content/components/form/img/required-field.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/required-field.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/required-field.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/required-optional-forms.png b/packages/documentation-site/patternfly-docs/content/components/form/img/required-optional-forms.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/required-optional-forms.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/required-optional-forms.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/top-labels.png b/packages/documentation-site/patternfly-docs/content/components/form/img/top-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/top-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/top-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/validation-submission.png b/packages/documentation-site/patternfly-docs/content/components/form/img/validation-submission.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/validation-submission.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/validation-submission.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/vertical-list.png b/packages/documentation-site/patternfly-docs/content/components/form/img/vertical-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/vertical-list.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/vertical-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/wizard-form.png b/packages/documentation-site/patternfly-docs/content/components/form/img/wizard-form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/form/img/wizard-form.png
rename to packages/documentation-site/patternfly-docs/content/components/form/img/wizard-form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/helper-text.md b/packages/documentation-site/patternfly-docs/content/components/helper-text/helper-text.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/helper-text.md
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/helper-text.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/coloredhelptext.png b/packages/documentation-site/patternfly-docs/content/components/helper-text/img/coloredhelptext.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/coloredhelptext.png
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/img/coloredhelptext.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/correctcolors.png b/packages/documentation-site/patternfly-docs/content/components/helper-text/img/correctcolors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/correctcolors.png
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/img/correctcolors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/errorhelptext.png b/packages/documentation-site/patternfly-docs/content/components/helper-text/img/errorhelptext.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/errorhelptext.png
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/img/errorhelptext.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/helpertextexample.png b/packages/documentation-site/patternfly-docs/content/components/helper-text/img/helpertextexample.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/helpertextexample.png
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/img/helpertextexample.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/placeholdercopy.png b/packages/documentation-site/patternfly-docs/content/components/helper-text/img/placeholdercopy.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/placeholdercopy.png
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/img/placeholdercopy.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/popoverexample.png b/packages/documentation-site/patternfly-docs/content/components/helper-text/img/popoverexample.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/helper-text/img/popoverexample.png
rename to packages/documentation-site/patternfly-docs/content/components/helper-text/img/popoverexample.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/hint/hint.md b/packages/documentation-site/patternfly-docs/content/components/hint/hint.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/hint/hint.md
rename to packages/documentation-site/patternfly-docs/content/components/hint/hint.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/hint/img/hint-element.svg b/packages/documentation-site/patternfly-docs/content/components/hint/img/hint-element.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/hint/img/hint-element.svg
rename to packages/documentation-site/patternfly-docs/content/components/hint/img/hint-element.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/elements-form-inline-edit.png b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/elements-form-inline-edit.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/elements-form-inline-edit.png
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/elements-form-inline-edit.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-behavior.gif b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-behavior.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-behavior.gif
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-behavior.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-field-specific.svg b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-field-specific.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-field-specific.svg
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-field-specific.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-full-page.svg b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-full-page.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-full-page.svg
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-full-page.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-page-elements-1.svg b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-page-elements-1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-page-elements-1.svg
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-page-elements-1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-page-elements-2.svg b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-page-elements-2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-page-elements-2.svg
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-page-elements-2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-table-rows.svg b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-table-rows.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-table-rows.svg
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-table-rows.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-table.svg b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-table.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit-table.svg
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit-table.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit.gif b/packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/img/inline-edit.gif
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/img/inline-edit.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/inline-edit.md b/packages/documentation-site/patternfly-docs/content/components/inline-edit/inline-edit.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/inline-edit/inline-edit.md
rename to packages/documentation-site/patternfly-docs/content/components/inline-edit/inline-edit.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/input-group/img/input-group-usage.svg b/packages/documentation-site/patternfly-docs/content/components/input-group/img/input-group-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/input-group/img/input-group-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/input-group/img/input-group-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/input-group/img/input-group.png b/packages/documentation-site/patternfly-docs/content/components/input-group/img/input-group.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/input-group/img/input-group.png
rename to packages/documentation-site/patternfly-docs/content/components/input-group/img/input-group.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/input-group/input-group.md b/packages/documentation-site/patternfly-docs/content/components/input-group/input-group.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/input-group/input-group.md
rename to packages/documentation-site/patternfly-docs/content/components/input-group/input-group.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-elements.png b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-horizontal.png b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-horizontal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-horizontal.png
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-horizontal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-elements.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-expandable.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-expandable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-expandable.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-expandable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-horizontal.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-horizontal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-horizontal.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-horizontal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-mobile.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-mobile.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-mobile.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-mobile.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-placement-left.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-placement-left.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-placement-left.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-placement-left.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-placement-right.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-placement-right.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-placement-right.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-placement-right.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-subsections.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-subsections.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-subsections.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-subsections.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-vertical.svg b/packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-vertical.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/img/jump-links-vertical.svg
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/img/jump-links-vertical.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/jump-link.md b/packages/documentation-site/patternfly-docs/content/components/jump-link/jump-link.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/jump-link/jump-link.md
rename to packages/documentation-site/patternfly-docs/content/components/jump-link/jump-link.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/Filled-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/Filled-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/Filled-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/Filled-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/Unfilled-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/Unfilled-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/Unfilled-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/Unfilled-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/added-label.png b/packages/documentation-site/patternfly-docs/content/components/label/img/added-label.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/added-label.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/added-label.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/added-label.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/added-label.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/added-label.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/added-label.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-modal.png b/packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-modal.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-modal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-modal.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-modal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-options.png b/packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-options.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-options.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-options.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-options.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-options.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label-options.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/adding-label-options.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label.png b/packages/documentation-site/patternfly-docs/content/components/label/img/adding-label.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/adding-label.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/adding-label.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/adding-label.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/adding-label.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/card-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/card-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/card-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/card-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-view-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/card-view-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-view-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/card-view-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-view-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/card-view-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/card-view-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/card-view-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/catalog-view.png b/packages/documentation-site/patternfly-docs/content/components/label/img/catalog-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/catalog-view.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/catalog-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/clickable-label.png b/packages/documentation-site/patternfly-docs/content/components/label/img/clickable-label.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/clickable-label.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/clickable-label.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/clickable-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/clickable-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/clickable-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/clickable-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/clickable-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/clickable-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/clickable-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/clickable-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/description-list-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/description-list-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/description-list-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/description-list-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/description-list-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/description-list-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/description-list-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/description-list-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/description-list.png b/packages/documentation-site/patternfly-docs/content/components/label/img/description-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/description-list.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/description-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/dismissible-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/dismissible-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/dismissible-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/dismissible-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/dismissible-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/dismissible-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/dismissible-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/dismissible-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/edit-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/edit-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/edit-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/edit-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-feature.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-feature.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-feature.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-feature.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_1-1.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_1-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_1-1.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_1-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_1.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_1.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_2.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_2.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_2_1.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_2_1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_2_1.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_2_1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_3.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_3.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_3_1.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_3_1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_3_1.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_3_1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_3_2.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_3_2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_3_2.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_3_2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_4.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_4.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_4.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_4.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_4_1_add-label-model.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_4_1_add-label-model.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_4_1_add-label-model.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_4_1_add-label-model.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_4_2.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_4_2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-label-group-in-a-table_4_2.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-label-group-in-a-table_4_2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/editable-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/editable-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/editable-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/filled-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/filled-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/filled-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/filled-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-elements.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-elements.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/label-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-features-type.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-features-type.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-features-type.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-features-type.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-features.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-features.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-features.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-features.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-filters.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-filters.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-filters.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-filters.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-filters.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/label-filters.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-filters.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-filters.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-elements.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-group-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-group-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-elements.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/label-group-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-group-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-popover.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-group-popover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-popover.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-group-popover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-popover.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/label-group-popover.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-group-popover.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-group-popover.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-sizes.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-sizes.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-sizes.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-sizes.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-sizes.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/label-sizes.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-sizes.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-sizes.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-table-view.png b/packages/documentation-site/patternfly-docs/content/components/label/img/label-table-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/label-table-view.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/label-table-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/labels-with-icons.png b/packages/documentation-site/patternfly-docs/content/components/label/img/labels-with-icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/labels-with-icons.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/labels-with-icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/labels-with-icons2.png b/packages/documentation-site/patternfly-docs/content/components/label/img/labels-with-icons2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/labels-with-icons2.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/labels-with-icons2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/nonstatus-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/nonstatus-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/nonstatus-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/nonstatus-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/nonstatus-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/nonstatus-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/nonstatus-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/nonstatus-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/status-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/status-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/status-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/status-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/status-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/status-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/status-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/status-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-view-2.png b/packages/documentation-site/patternfly-docs/content/components/label/img/table-view-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-view-2.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/table-view-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-view.png b/packages/documentation-site/patternfly-docs/content/components/label/img/table-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-view.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/table-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-label-group.png b/packages/documentation-site/patternfly-docs/content/components/label/img/table-with-label-group.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-label-group.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/table-with-label-group.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-label-group.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/table-with-label-group.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-label-group.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/table-with-label-group.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/table-with-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/table-with-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-labels.svg b/packages/documentation-site/patternfly-docs/content/components/label/img/table-with-labels.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/table-with-labels.svg
rename to packages/documentation-site/patternfly-docs/content/components/label/img/table-with-labels.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/unfilled-labels.png b/packages/documentation-site/patternfly-docs/content/components/label/img/unfilled-labels.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/img/unfilled-labels.png
rename to packages/documentation-site/patternfly-docs/content/components/label/img/unfilled-labels.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/label.md b/packages/documentation-site/patternfly-docs/content/components/label/label.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/label.md
rename to packages/documentation-site/patternfly-docs/content/components/label/label.md
index 0f326e4ff0..b0f1c7b49a 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/label/label.md
+++ b/packages/documentation-site/patternfly-docs/content/components/label/label.md
@@ -65,7 +65,7 @@ Labels are typically used in filter and selection use cases to indicate what sel
 
 #### Color considerations
 
-Labels can utilize both our [status](/design-foundations/colors#status-and-state-colors)  and [nonstatus](/design-foundations/colors#nonstatus-colors) color palettes.
+Labels can utilize both our [status](/foundations-and-styles/colors#status-and-state-colors)  and [nonstatus](/foundations-and-styles/colors#nonstatus-colors) color palettes.
 
 While you may use other colors for your labels, we recommend using the ones provided as they have been carefully selected to be accessible with the PatternFly library. If you choose to use other colors, be mindful of picking [accessible text color and icon color](/accessibility/testing-your-accessibility) to go with the label background.
 
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/components/components-data.json b/packages/documentation-site/patternfly-docs/content/components/landing-page/components-data.json
similarity index 99%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/components/components-data.json
rename to packages/documentation-site/patternfly-docs/content/components/landing-page/components-data.json
index cde9244e95..0eb572189e 100644
--- a/packages/documentation-site/patternfly-docs/pages/landing-pages/components/components-data.json
+++ b/packages/documentation-site/patternfly-docs/content/components/landing-page/components-data.json
@@ -169,7 +169,7 @@
   },
   "icon": {
     "illustration": "./images/component-illustrations/icon.png",
-    "summary": "An <b>icon</b> component is a container that supports <Link to='/design-foundations/icons#all-icons'>icons</Link> of varying dimensions and styles, as well as <Link to='/components/spinner'>spinners.</Link>"
+    "summary": "An <b>icon</b> component is a container that supports <Link to='/foundations-and-styles/iconography#all-icons'>icons</Link> of varying dimensions and styles, as well as <Link to='/components/spinner'>spinners.</Link>"
   },
   "inline-edit": {
     "illustration": "./images/component-illustrations/inline-edit.png",
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/components/view-all-components.md b/packages/documentation-site/patternfly-docs/content/components/landing-page/view-all-components.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/components/view-all-components.md
rename to packages/documentation-site/patternfly-docs/content/components/landing-page/view-all-components.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/icons.png b/packages/documentation-site/patternfly-docs/content/components/list/img/icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/icons.png
rename to packages/documentation-site/patternfly-docs/content/components/list/img/icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-ordered.svg b/packages/documentation-site/patternfly-docs/content/components/list/img/list-ordered.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-ordered.svg
rename to packages/documentation-site/patternfly-docs/content/components/list/img/list-ordered.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-unordered1.svg b/packages/documentation-site/patternfly-docs/content/components/list/img/list-unordered1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-unordered1.svg
rename to packages/documentation-site/patternfly-docs/content/components/list/img/list-unordered1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-unordered2.svg b/packages/documentation-site/patternfly-docs/content/components/list/img/list-unordered2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-unordered2.svg
rename to packages/documentation-site/patternfly-docs/content/components/list/img/list-unordered2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-withicons.svg b/packages/documentation-site/patternfly-docs/content/components/list/img/list-withicons.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/list-withicons.svg
rename to packages/documentation-site/patternfly-docs/content/components/list/img/list-withicons.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/ordered.png b/packages/documentation-site/patternfly-docs/content/components/list/img/ordered.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/ordered.png
rename to packages/documentation-site/patternfly-docs/content/components/list/img/ordered.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/unordered.png b/packages/documentation-site/patternfly-docs/content/components/list/img/unordered.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/unordered.png
rename to packages/documentation-site/patternfly-docs/content/components/list/img/unordered.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/unordered_horizontal.png b/packages/documentation-site/patternfly-docs/content/components/list/img/unordered_horizontal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/img/unordered_horizontal.png
rename to packages/documentation-site/patternfly-docs/content/components/list/img/unordered_horizontal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/list.md b/packages/documentation-site/patternfly-docs/content/components/list/list.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/list/list.md
rename to packages/documentation-site/patternfly-docs/content/components/list/list.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/caps-lock.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/caps-lock.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/caps-lock.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/caps-lock.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/client_side_error.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/client_side_error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/client_side_error.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/client_side_error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/elements.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/elements.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/empty-fields.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/empty-fields.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/empty-fields.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/empty-fields.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/invalid-characters.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/invalid-characters.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/invalid-characters.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/invalid-characters.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-authentication-more-options.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-authentication-more-options.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-authentication-more-options.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-authentication-more-options.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-authentication-multi-factor.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-authentication-multi-factor.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-authentication-multi-factor.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-authentication-multi-factor.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-authentication-sso.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-authentication-sso.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-authentication-sso.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-authentication-sso.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-caps-warning.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-caps-warning.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-caps-warning.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-caps-warning.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-client-errors.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-client-errors.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-client-errors.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-client-errors.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-elements.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-empty-field-error.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-empty-field-error.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-empty-field-error.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-empty-field-error.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-general-warnings.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-general-warnings.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-general-warnings.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-general-warnings.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-invalid-error.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-invalid-error.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-invalid-error.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-invalid-error.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-no-account-error.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-no-account-error.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-no-account-error.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-no-account-error.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-server-errors.svg b/packages/documentation-site/patternfly-docs/content/components/login-page/img/login-server-errors.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/login-server-errors.svg
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/login-server-errors.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/multi-factor.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/multi-factor.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/multi-factor.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/multi-factor.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/server-side-error.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/server-side-error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/server-side-error.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/server-side-error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/sso.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/sso.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/sso.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/sso.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/verifications-methods.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/verifications-methods.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/verifications-methods.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/verifications-methods.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/warning-message.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/warning-message.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/warning-message.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/warning-message.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/wrong-password.png b/packages/documentation-site/patternfly-docs/content/components/login-page/img/wrong-password.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/img/wrong-password.png
rename to packages/documentation-site/patternfly-docs/content/components/login-page/img/wrong-password.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/login-page.md b/packages/documentation-site/patternfly-docs/content/components/login-page/login-page.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/login-page/login-page.md
rename to packages/documentation-site/patternfly-docs/content/components/login-page/login-page.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/masthead/img/masthead-elements.svg b/packages/documentation-site/patternfly-docs/content/components/masthead/img/masthead-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/masthead/img/masthead-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/masthead/img/masthead-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/masthead/masthead.md b/packages/documentation-site/patternfly-docs/content/components/masthead/masthead.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/masthead/masthead.md
rename to packages/documentation-site/patternfly-docs/content/components/masthead/masthead.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu-toggle/menu-toggle.md b/packages/documentation-site/patternfly-docs/content/components/menu-toggle/menu-toggle.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu-toggle/menu-toggle.md
rename to packages/documentation-site/patternfly-docs/content/components/menu-toggle/menu-toggle.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/basic-menu.png b/packages/documentation-site/patternfly-docs/content/components/menu/img/basic-menu.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/basic-menu.png
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/basic-menu.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-action.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-action.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-action.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-action.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-disabled.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-disabled.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-disabled.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-disabled.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-drilldown-back.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-drilldown-back.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-drilldown-back.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-drilldown-back.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-drilldown-breadcrumbs.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-drilldown-breadcrumbs.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-drilldown-breadcrumbs.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-drilldown-breadcrumbs.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-drilldown.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-drilldown.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-drilldown.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-drilldown.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-favoriting.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-favoriting.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-favoriting.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-favoriting.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-filtering.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-filtering.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-filtering.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-filtering.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-grouped.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-grouped.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-grouped.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-grouped.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-multi-level.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-multi-level.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-multi-level.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-multi-level.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-option-select.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-option-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-option-select.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-option-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-red-text.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/menu-red-text.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/menu-red-text.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/menu-red-text.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/search-menu-no-results.svg b/packages/documentation-site/patternfly-docs/content/components/menu/img/search-menu-no-results.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/img/search-menu-no-results.svg
rename to packages/documentation-site/patternfly-docs/content/components/menu/img/search-menu-no-results.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/menu.md b/packages/documentation-site/patternfly-docs/content/components/menu/menu.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/menu/menu.md
rename to packages/documentation-site/patternfly-docs/content/components/menu/menu.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/center-aligned-modal.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/center-aligned-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/center-aligned-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/center-aligned-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/destructive-confirmation-dialog-steps.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/destructive-confirmation-dialog-steps.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/destructive-confirmation-dialog-steps.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/destructive-confirmation-dialog-steps.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/destructive-confirmation-dialog.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/destructive-confirmation-dialog.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/destructive-confirmation-dialog.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/destructive-confirmation-dialog.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/error-dialog.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/error-dialog.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/error-dialog.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/error-dialog.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/exclamation-circle.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/exclamation-circle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/exclamation-circle.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/exclamation-circle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/exclamation-triangle.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/exclamation-triangle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/exclamation-triangle.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/exclamation-triangle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/info-circle.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/info-circle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/info-circle.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/info-circle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-basic.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-basic.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-basic.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-basic.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-call-outs.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-call-outs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-call-outs.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-call-outs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-center.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-center.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-center.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-center.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-destructive-text-input.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-destructive-text-input.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-destructive-text-input.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-destructive-text-input.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-destructive.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-destructive.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-destructive.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-destructive.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-edit-dialog.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-edit-dialog.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-edit-dialog.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-edit-dialog.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-elements.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-error-dialog.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-error-dialog.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-error-dialog.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-error-dialog.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-non-destructive.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-non-destructive.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-non-destructive.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-non-destructive.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-passive-dialog.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-passive-dialog.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-passive-dialog.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-passive-dialog.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-top.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-top.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-top.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-top.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-with-help.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-with-help.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-with-help.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-with-help.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-with-help.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/modal-with-help.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/modal-with-help.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/modal-with-help.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/non-destructive-confirmation-dialog.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/non-destructive-confirmation-dialog.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/non-destructive-confirmation-dialog.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/non-destructive-confirmation-dialog.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/passive-dialog.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/passive-dialog.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/passive-dialog.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/passive-dialog.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/secondary-destructive-action.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/secondary-destructive-action.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/secondary-destructive-action.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/secondary-destructive-action.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/times-circle.svg b/packages/documentation-site/patternfly-docs/content/components/modal/img/times-circle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/times-circle.svg
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/times-circle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/top-aligned-modal.png b/packages/documentation-site/patternfly-docs/content/components/modal/img/top-aligned-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/img/top-aligned-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/modal/img/top-aligned-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/modal.md b/packages/documentation-site/patternfly-docs/content/components/modal/modal.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/modal.md
rename to packages/documentation-site/patternfly-docs/content/components/modal/modal.md
index 03cd8125a1..23ba823c46 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/modal/modal.md
+++ b/packages/documentation-site/patternfly-docs/content/components/modal/modal.md
@@ -103,7 +103,7 @@ When using destructive actions, ensure that the user is informed about the conse
 
 Use an error dialog to inform users of problems that interrupt normal or expected behavior. Briefly contextualize the problem and why it happened, then provide actionable steps toward a solution.
 
-Learn more about writing error messages in our [error message guidelines](/ux-writing/error-messages).
+Learn more about writing error messages in our [error message guidelines](/content-design/error-messages).
 
 Error dialogs may use an error icon for visual emphasis.
 
@@ -182,7 +182,7 @@ Example headline: *Permanently delete database?*<br />
 Example buttons: *Delete* and *Cancel* <br />
 For more button guidance, see our [button label guidelines](/components/button/design-guidelines#content).
 
-For general content guidance to help write effective modal dialogs, see our [UX writing style guide](/ux-writing/about-ux-writing).
+For general content guidance to help write effective modal dialogs, see our [UX writing style guide](/content-design/about-ux-writing).
 
 
 ### Icon use in modal dialogs
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/drill-down-to-expansion.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/drill-down-to-expansion.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/drill-down-to-expansion.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/drill-down-to-expansion.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/drill-down.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/drill-down.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/drill-down.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/drill-down.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/expandable-nav-tertiary.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/expandable-nav-tertiary.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/expandable-nav-tertiary.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/expandable-nav-tertiary.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/expandable-nav.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/expandable-nav.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/expandable-nav.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/expandable-nav.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/expansion-to-drill-down.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/expansion-to-drill-down.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/expansion-to-drill-down.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/expansion-to-drill-down.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/fly-out.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/fly-out.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/fly-out.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/fly-out.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/flyout-to-drill-down.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/flyout-to-drill-down.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/flyout-to-drill-down.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/flyout-to-drill-down.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/horizontal-nav.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/horizontal-nav.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/horizontal-nav.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/horizontal-nav.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/horizontal-primary.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/horizontal-primary.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/horizontal-primary.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/horizontal-primary.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-elements.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-elements.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-horizontal.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-horizontal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-horizontal.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-horizontal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-mobile.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-mobile.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-mobile.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-mobile.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-secondary-horizontal.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-secondary-horizontal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-secondary-horizontal.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-secondary-horizontal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-secondary-vertical.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-secondary-vertical.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-secondary-vertical.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-secondary-vertical.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-drilldown-flyout.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-drilldown-flyout.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-drilldown-flyout.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-drilldown-flyout.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-drilldown-tertiary-expansion.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-drilldown-tertiary-expansion.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-drilldown-tertiary-expansion.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-drilldown-tertiary-expansion.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-drilldown.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-drilldown.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-drilldown.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-drilldown.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-expand1.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-expand1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-expand1.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-expand1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-expand2.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-expand2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-expand2.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-expand2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-expansion-drilldown.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-expansion-drilldown.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-expansion-drilldown.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-expansion-drilldown.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-flyout.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-flyout.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-flyout.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-flyout.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-grouped.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-grouped.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-grouped.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-grouped.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-simple.svg b/packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-simple.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/nav-vertical-simple.svg
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/nav-vertical-simple.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/sec-nav-mobile.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/sec-nav-mobile.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/sec-nav-mobile.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/sec-nav-mobile.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/secondary-horizontal-nav.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/secondary-horizontal-nav.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/secondary-horizontal-nav.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/secondary-horizontal-nav.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/single-level.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/single-level.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/single-level.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/single-level.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/tertiary-nav.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/tertiary-nav.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/tertiary-nav.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/tertiary-nav.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/two-level.png b/packages/documentation-site/patternfly-docs/content/components/navigation/img/two-level.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/img/two-level.png
rename to packages/documentation-site/patternfly-docs/content/components/navigation/img/two-level.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/navigation.md b/packages/documentation-site/patternfly-docs/content/components/navigation/navigation.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/navigation/navigation.md
rename to packages/documentation-site/patternfly-docs/content/components/navigation/navigation.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-badge/img/badge-elements.svg b/packages/documentation-site/patternfly-docs/content/components/notification-badge/img/badge-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-badge/img/badge-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/notification-badge/img/badge-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-badge/img/notification-badge.png b/packages/documentation-site/patternfly-docs/content/components/notification-badge/img/notification-badge.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-badge/img/notification-badge.png
rename to packages/documentation-site/patternfly-docs/content/components/notification-badge/img/notification-badge.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-badge/notification-badge.md b/packages/documentation-site/patternfly-docs/content/components/notification-badge/notification-badge.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-badge/notification-badge.md
rename to packages/documentation-site/patternfly-docs/content/components/notification-badge/notification-badge.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/Complex-Notification-Drawer.png b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/Complex-Notification-Drawer.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/Complex-Notification-Drawer.png
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/Complex-Notification-Drawer.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/Notification-drawer-in-page.png b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/Notification-drawer-in-page.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/Notification-drawer-in-page.png
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/Notification-drawer-in-page.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/Simple-Notification-Drawer.png b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/Simple-Notification-Drawer.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/Simple-Notification-Drawer.png
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/Simple-Notification-Drawer.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/drawer-elements.svg b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/drawer-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/drawer-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/drawer-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/drawer-placement.svg b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/drawer-placement.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/drawer-placement.svg
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/drawer-placement.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/grouped-drawer-elements.svg b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/grouped-drawer-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/img/grouped-drawer-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/img/grouped-drawer-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/notification-drawer.md b/packages/documentation-site/patternfly-docs/content/components/notification-drawer/notification-drawer.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/notification-drawer/notification-drawer.md
rename to packages/documentation-site/patternfly-docs/content/components/notification-drawer/notification-drawer.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/img/number_input_anatomy.svg b/packages/documentation-site/patternfly-docs/content/components/number input/img/number_input_anatomy.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/img/number_input_anatomy.svg
rename to packages/documentation-site/patternfly-docs/content/components/number input/img/number_input_anatomy.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/img/number_input_states.svg b/packages/documentation-site/patternfly-docs/content/components/number input/img/number_input_states.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/img/number_input_states.svg
rename to packages/documentation-site/patternfly-docs/content/components/number input/img/number_input_states.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/img/with_threshold.svg b/packages/documentation-site/patternfly-docs/content/components/number input/img/with_threshold.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/img/with_threshold.svg
rename to packages/documentation-site/patternfly-docs/content/components/number input/img/with_threshold.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/number-input.md b/packages/documentation-site/patternfly-docs/content/components/number input/number-input.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/number-input.md
rename to packages/documentation-site/patternfly-docs/content/components/number input/number-input.md
index 33e66a9044..fa7bee4220 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/number input/number-input.md	
+++ b/packages/documentation-site/patternfly-docs/content/components/number input/number-input.md	
@@ -34,7 +34,7 @@ import '../components.css';
 * Keep labels concise and specific to effectively communicate what value the user should enter into the input field.
 * Determine an increment size relative to your specific value range. Scale your increment size to accommodate for the types of values users will input in context.
 For example: If your range is from 0-10, have increments of 1, but if your range is from 0-100, have increments of 10.
-* Include unit symbols to the right of the text input and increase button, depending on your use case. Always use a unit’s standard abbreviation or symbol. For a list of recommended symbols, see our <a href="https://v4-archive.patternfly.org/v4/ux-writing/units-and-symbols#writing-units-of-measure">Units and symbols page</a>.
+* Include unit symbols to the right of the text input and increase button, depending on your use case. Always use a unit’s standard abbreviation or symbol. For a list of recommended symbols, see our <a href="https://v4-archive.patternfly.org/v4/content-design/units-and-symbols#writing-units-of-measure">Units and symbols page</a>.
 
 <div class="ws-docs-content-img">
 ![Number input states](./img/number_input_states.svg)
@@ -62,6 +62,6 @@ When adding thresholds to a number input, be sure to inform users with text to m
 Consider the following guidance to ensure that your number input is <a href="https://www.section508.gov/">508 compliant</a>:
 
 * Use clear and descriptive labels for each button and fields. Specific language makes it easier for users with assistive technology to understand the required value.
-* Include error validation messages to guide users who enter values incorrectly. For more information about writing effective error messages, see our <a href="https://v4-archive.patternfly.org/v4/ux-writing/error-messages">UX writing style guide</a>.
+* Include error validation messages to guide users who enter values incorrectly. For more information about writing effective error messages, see our <a href="https://v4-archive.patternfly.org/v4/content-design/error-messages">UX writing style guide</a>.
 
 For more in-depth accessibility guidance, see the <a href="https://v4-archive.patternfly.org/v4/components/accordion/design-guidelines/#accessibility">PatternFly accessibility guide</a>.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/card-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/card-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/card-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/card-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/mobile-table-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/mobile-table-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/mobile-table-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/mobile-table-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/mobile-toolbar-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/mobile-toolbar-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/mobile-toolbar-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/mobile-toolbar-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/table-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/table-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/table-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/table-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/toolbar-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/toolbar-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/img/toolbar-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/overflow-menu/img/toolbar-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/overflow-menu.md b/packages/documentation-site/patternfly-docs/content/components/overflow-menu/overflow-menu.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/overflow-menu/overflow-menu.md
rename to packages/documentation-site/patternfly-docs/content/components/overflow-menu/overflow-menu.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/masthead.png b/packages/documentation-site/patternfly-docs/content/components/page/img/masthead.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/masthead.png
rename to packages/documentation-site/patternfly-docs/content/components/page/img/masthead.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/page-horizontal-nav.svg b/packages/documentation-site/patternfly-docs/content/components/page/img/page-horizontal-nav.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/page-horizontal-nav.svg
rename to packages/documentation-site/patternfly-docs/content/components/page/img/page-horizontal-nav.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/page-sections.png b/packages/documentation-site/patternfly-docs/content/components/page/img/page-sections.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/page-sections.png
rename to packages/documentation-site/patternfly-docs/content/components/page/img/page-sections.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/page-vertical-nav.svg b/packages/documentation-site/patternfly-docs/content/components/page/img/page-vertical-nav.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/img/page-vertical-nav.svg
rename to packages/documentation-site/patternfly-docs/content/components/page/img/page-vertical-nav.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/page.md b/packages/documentation-site/patternfly-docs/content/components/page/page.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/page/page.md
rename to packages/documentation-site/patternfly-docs/content/components/page/page.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/compact-pagination.svg b/packages/documentation-site/patternfly-docs/content/components/pagination/img/compact-pagination.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/compact-pagination.svg
rename to packages/documentation-site/patternfly-docs/content/components/pagination/img/compact-pagination.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/indeterminate-pagination.svg b/packages/documentation-site/patternfly-docs/content/components/pagination/img/indeterminate-pagination.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/indeterminate-pagination.svg
rename to packages/documentation-site/patternfly-docs/content/components/pagination/img/indeterminate-pagination.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/mobile-pagination.svg b/packages/documentation-site/patternfly-docs/content/components/pagination/img/mobile-pagination.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/mobile-pagination.svg
rename to packages/documentation-site/patternfly-docs/content/components/pagination/img/mobile-pagination.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/pagination-elements.svg b/packages/documentation-site/patternfly-docs/content/components/pagination/img/pagination-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/pagination-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/pagination/img/pagination-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/toolbar-pagination.svg b/packages/documentation-site/patternfly-docs/content/components/pagination/img/toolbar-pagination.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/img/toolbar-pagination.svg
rename to packages/documentation-site/patternfly-docs/content/components/pagination/img/toolbar-pagination.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/pagination.md b/packages/documentation-site/patternfly-docs/content/components/pagination/pagination.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/pagination/pagination.md
rename to packages/documentation-site/patternfly-docs/content/components/pagination/pagination.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/panel/img/basic-panel.svg b/packages/documentation-site/patternfly-docs/content/components/panel/img/basic-panel.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/panel/img/basic-panel.svg
rename to packages/documentation-site/patternfly-docs/content/components/panel/img/basic-panel.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/panel/img/search-panel.svg b/packages/documentation-site/patternfly-docs/content/components/panel/img/search-panel.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/panel/img/search-panel.svg
rename to packages/documentation-site/patternfly-docs/content/components/panel/img/search-panel.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/panel/panel.md b/packages/documentation-site/patternfly-docs/content/components/panel/panel.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/panel/panel.md
rename to packages/documentation-site/patternfly-docs/content/components/panel/panel.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/password-strength/img/password-strong.svg b/packages/documentation-site/patternfly-docs/content/components/password-strength/img/password-strong.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/password-strength/img/password-strong.svg
rename to packages/documentation-site/patternfly-docs/content/components/password-strength/img/password-strong.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/password-strength/img/password-weak.svg b/packages/documentation-site/patternfly-docs/content/components/password-strength/img/password-weak.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/password-strength/img/password-weak.svg
rename to packages/documentation-site/patternfly-docs/content/components/password-strength/img/password-weak.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/password-strength/password-strength.md b/packages/documentation-site/patternfly-docs/content/components/password-strength/password-strength.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/password-strength/password-strength.md
rename to packages/documentation-site/patternfly-docs/content/components/password-strength/password-strength.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/Popover-form.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/Popover-form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/Popover-form.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/Popover-form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/alert_popover_examples.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/alert_popover_examples.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/alert_popover_examples.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/alert_popover_examples.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/alert_popover_usage.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/alert_popover_usage.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/alert_popover_usage.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/alert_popover_usage.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/help-elements.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/help-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/help-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/help-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/hints.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/hints.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/hints.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/hints.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/persistent-text.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/persistent-text.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/persistent-text.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/persistent-text.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-alert.svg b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-behavior.svg b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-behavior.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-behavior.svg
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-behavior.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-email.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-email.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-email.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-email.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-example.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-example.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-linked-question.svg b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-linked-question.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-linked-question.svg
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-linked-question.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-states.svg b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-states.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-states.svg
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-states.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-usage.svg b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-variations-alert.svg b/packages/documentation-site/patternfly-docs/content/components/popover/img/popover-variations-alert.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popover-variations-alert.svg
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popover-variations-alert.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popovers-1.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/popovers-1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popovers-1.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popovers-1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popovers-2.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/popovers-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popovers-2.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popovers-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popovers-colors.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/popovers-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/popovers-colors.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/popovers-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/tooltips.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/tooltips.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/tooltips.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/tooltips.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/use-popovers.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/use-popovers.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/use-popovers.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/use-popovers.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/use-tooltips.png b/packages/documentation-site/patternfly-docs/content/components/popover/img/use-tooltips.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/img/use-tooltips.png
rename to packages/documentation-site/patternfly-docs/content/components/popover/img/use-tooltips.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/popover.md b/packages/documentation-site/patternfly-docs/content/components/popover/popover.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/popover/popover.md
rename to packages/documentation-site/patternfly-docs/content/components/popover/popover.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/multi-stepper-card.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/multi-stepper-card.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/multi-stepper-card.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/multi-stepper-card.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-basic.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-basic.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-basic.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-basic.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-card.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-card.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-card.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-card.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-compact.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-compact.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-compact.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-compact.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-custom-icons.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-custom-icons.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-custom-icons.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-custom-icons.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-elements.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-help-popover.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-help-popover.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-help-popover.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-help-popover.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-popover.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-popover.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-popover.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-popover.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-table.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-table.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-table.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-table.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-vertical.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-vertical.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-vertical.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-vertical.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-with-descriptions.svg b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-with-descriptions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/img/stepper-with-descriptions.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/img/stepper-with-descriptions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/progress-stepper.md b/packages/documentation-site/patternfly-docs/content/components/progress-stepper/progress-stepper.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress-stepper/progress-stepper.md
rename to packages/documentation-site/patternfly-docs/content/components/progress-stepper/progress-stepper.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/card-dashboard.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/card-dashboard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/card-dashboard.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/card-dashboard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/error.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/error.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/error.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/error.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/in-progress.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/in-progress.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/in-progress.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/in-progress.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-bar-callouts.png b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-bar-callouts.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-bar-callouts.png
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-bar-callouts.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-elements.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-file-download.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-file-download.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-file-download.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-file-download.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-number-above.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-number-above.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-number-above.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-number-above.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-number-outside.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-number-outside.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-number-outside.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-number-outside.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-placement.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-placement.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-placement.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-placement.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-sizes.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-sizes.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-sizes.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-sizes.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-table-multiple.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-table-multiple.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-table-multiple.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-table-multiple.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-table.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-table.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-table.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-table.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress_bar_blue_animated.gif b/packages/documentation-site/patternfly-docs/content/components/progress/img/progress_bar_blue_animated.gif
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/progress_bar_blue_animated.gif
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/progress_bar_blue_animated.gif
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/success.svg b/packages/documentation-site/patternfly-docs/content/components/progress/img/success.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/img/success.svg
rename to packages/documentation-site/patternfly-docs/content/components/progress/img/success.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/progress.md b/packages/documentation-site/patternfly-docs/content/components/progress/progress.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/progress.md
rename to packages/documentation-site/patternfly-docs/content/components/progress/progress.md
index 1077cfe399..72ac184292 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/progress/progress.md
+++ b/packages/documentation-site/patternfly-docs/content/components/progress/progress.md
@@ -75,7 +75,7 @@ A `--pf-t--global--color--brand--default` progress bar represents a process that
 
 ### Error state or failure
 
-A `--pf-t--global--color--status--danger--default` progress bar represents a process that has failed. Accompany a failed progress bar with a [danger icon](/design-foundations/icons/#all-icons) to demonstrate that an error occurred in the process.
+A `--pf-t--global--color--status--danger--default` progress bar represents a process that has failed. Accompany a failed progress bar with a [danger icon](/foundations-and-styles/iconography/#all-icons) to demonstrate that an error occurred in the process.
 
 <div class="ws-docs-content-img">
 ![Example of a progress bar in the error or failed state.](./img/error.svg)
@@ -83,7 +83,7 @@ A `--pf-t--global--color--status--danger--default` progress bar represents a pro
 
 ### Complete or success
 
-A `--pf-t--global--color--status--success--default` progress bar represents the successful completion of a process. Accompany a complete progress bar with a [check-circle icon](/design-foundations/icons/#all-icons) to demonstrate that the process has finished with no errors.
+A `--pf-t--global--color--status--success--default` progress bar represents the successful completion of a process. Accompany a complete progress bar with a [check-circle icon](/foundations-and-styles/iconography/#all-icons) to demonstrate that the process has finished with no errors.
 
 <div class="ws-docs-content-img">
 ![Example of a progress bar in the complete or successful state.](./img/success.svg)
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/nested-controls-radio.png b/packages/documentation-site/patternfly-docs/content/components/radio/img/nested-controls-radio.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/nested-controls-radio.png
rename to packages/documentation-site/patternfly-docs/content/components/radio/img/nested-controls-radio.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/radio-nested.svg b/packages/documentation-site/patternfly-docs/content/components/radio/img/radio-nested.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/radio-nested.svg
rename to packages/documentation-site/patternfly-docs/content/components/radio/img/radio-nested.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/radio-usage.svg b/packages/documentation-site/patternfly-docs/content/components/radio/img/radio-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/radio-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/radio/img/radio-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/radio.png b/packages/documentation-site/patternfly-docs/content/components/radio/img/radio.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/img/radio.png
rename to packages/documentation-site/patternfly-docs/content/components/radio/img/radio.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/radio.md b/packages/documentation-site/patternfly-docs/content/components/radio/radio.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/radio/radio.md
rename to packages/documentation-site/patternfly-docs/content/components/radio/radio.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/img/active-table.svg b/packages/documentation-site/patternfly-docs/content/components/search-input/img/active-table.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/img/active-table.svg
rename to packages/documentation-site/patternfly-docs/content/components/search-input/img/active-table.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/img/search-advanced.svg b/packages/documentation-site/patternfly-docs/content/components/search-input/img/search-advanced.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/img/search-advanced.svg
rename to packages/documentation-site/patternfly-docs/content/components/search-input/img/search-advanced.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/img/search-find.svg b/packages/documentation-site/patternfly-docs/content/components/search-input/img/search-find.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/img/search-find.svg
rename to packages/documentation-site/patternfly-docs/content/components/search-input/img/search-find.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/search-input.md b/packages/documentation-site/patternfly-docs/content/components/search-input/search-input.md
similarity index 93%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/search-input.md
rename to packages/documentation-site/patternfly-docs/content/components/search-input/search-input.md
index d10061fc6d..78ac94a948 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/search-input/search-input.md
+++ b/packages/documentation-site/patternfly-docs/content/components/search-input/search-input.md
@@ -33,9 +33,9 @@ Another way to use search input is as a find function. This would mean that the
 
 3. **Optional navigation:** The navigation feature allows the user to navigate 1-by-1 through the matched results. It will correspond to the count that is within the badge.
 
-4. **Match highlight:** All matches will be highlighted using `gold-50`from the [PatternFly color palette](/design-foundations/colors#color-palette).
+4. **Match highlight:** All matches will be highlighted using `gold-50`from the [PatternFly color palette](/foundations-and-styles/colors#color-palette).
 
-5. **Current highlight:** The active match will be highlighted with `gold-100` from the [PatternFly color palette](/design-foundations/colors#color-palette). In this case, since the user is on match 2 of 5, “Node” in “Node 2” is highlighted.
+5. **Current highlight:** The active match will be highlighted with `gold-100` from the [PatternFly color palette](/foundations-and-styles/colors#color-palette). In this case, since the user is on match 2 of 5, “Node” in “Node 2” is highlighted.
 
 ### Advanced search
 The [advanced search variant](/components/search-input#advanced) is intended for more advanced search use cases across multiple attribute-value pairs. It allows users to enter complex search queries from the keyboard or to fill out a search form. Use this component for search or filter queries that involve many attributes and when you want to give the user the option to use a form to complete the search criteria.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/checkbox-select.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/checkbox-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/checkbox-select.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/checkbox-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/multiple-select.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/multiple-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/multiple-select.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/multiple-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-descriptions.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/select-descriptions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-descriptions.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/select-descriptions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-elements.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/select-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/select-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-favorites.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/select-favorites.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-favorites.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/select-favorites.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-item-count.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/select-item-count.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-item-count.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/select-item-count.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-validated.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/select-validated.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-validated.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/select-validated.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-view-more.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/select-view-more.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/select-view-more.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/select-view-more.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/single-select.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/single-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/single-select.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/single-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/typeahead-search-no-results.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/typeahead-search-no-results.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/typeahead-search-no-results.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/typeahead-search-no-results.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/typeahead-select.svg b/packages/documentation-site/patternfly-docs/content/components/select/img/typeahead-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/img/typeahead-select.svg
rename to packages/documentation-site/patternfly-docs/content/components/select/img/typeahead-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/select.md b/packages/documentation-site/patternfly-docs/content/components/select/select.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/select/select.md
rename to packages/documentation-site/patternfly-docs/content/components/select/select.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/sidebar/sidebar.md b/packages/documentation-site/patternfly-docs/content/components/sidebar/sidebar.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/sidebar/sidebar.md
rename to packages/documentation-site/patternfly-docs/content/components/sidebar/sidebar.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/simple-list/img/simple-list.png b/packages/documentation-site/patternfly-docs/content/components/simple-list/img/simple-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/simple-list/img/simple-list.png
rename to packages/documentation-site/patternfly-docs/content/components/simple-list/img/simple-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/simple-list/img/simplelist-elements.svg b/packages/documentation-site/patternfly-docs/content/components/simple-list/img/simplelist-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/simple-list/img/simplelist-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/simple-list/img/simplelist-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/simple-list/simple-list.md b/packages/documentation-site/patternfly-docs/content/components/simple-list/simple-list.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/simple-list/simple-list.md
rename to packages/documentation-site/patternfly-docs/content/components/simple-list/simple-list.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/skeleton/skeleton.md b/packages/documentation-site/patternfly-docs/content/components/skeleton/skeleton.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/skeleton/skeleton.md
rename to packages/documentation-site/patternfly-docs/content/components/skeleton/skeleton.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/skip-to-content/skip-to-content.md b/packages/documentation-site/patternfly-docs/content/components/skip-to-content/skip-to-content.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/skip-to-content/skip-to-content.md
rename to packages/documentation-site/patternfly-docs/content/components/skip-to-content/skip-to-content.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/default-input-value.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/default-input-value.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/default-input-value.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/default-input-value.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/locked.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/locked.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/locked.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/locked.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-continuous.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/slider-continuous.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-continuous.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/slider-continuous.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-discrete.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/slider-discrete.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-discrete.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/slider-discrete.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-elements.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/slider-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/slider-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-with-actions.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/slider-with-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/slider-with-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/slider-with-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/thumb-value.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/thumb-value.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/thumb-value.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/thumb-value.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/unlocked.svg b/packages/documentation-site/patternfly-docs/content/components/slider/img/unlocked.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/img/unlocked.svg
rename to packages/documentation-site/patternfly-docs/content/components/slider/img/unlocked.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/slider.md b/packages/documentation-site/patternfly-docs/content/components/slider/slider.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/slider/slider.md
rename to packages/documentation-site/patternfly-docs/content/components/slider/slider.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-full-page.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-full-page.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-full-page.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-full-page.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-cards.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-cards.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-modal.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-select.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-select.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-select.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-select.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-table.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-in-table.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-in-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-sizes.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-sizes.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/spinner-sizes.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/spinner-sizes.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/wizard-with-spinner.png b/packages/documentation-site/patternfly-docs/content/components/spinner/img/wizard-with-spinner.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/img/wizard-with-spinner.png
rename to packages/documentation-site/patternfly-docs/content/components/spinner/img/wizard-with-spinner.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/spinner.md b/packages/documentation-site/patternfly-docs/content/components/spinner/spinner.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/spinner/spinner.md
rename to packages/documentation-site/patternfly-docs/content/components/spinner/spinner.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-do-dont.png b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-do-dont.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-do-dont.png
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-do-dont.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-elements.png b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-elements.svg b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-form.png b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-form.png
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-intermediate.png b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-intermediate.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-intermediate.png
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-intermediate.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-masthead.png b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-masthead.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-masthead.png
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-masthead.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-multiple-independent.png b/packages/documentation-site/patternfly-docs/content/components/switch/img/switch-multiple-independent.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/img/switch-multiple-independent.png
rename to packages/documentation-site/patternfly-docs/content/components/switch/img/switch-multiple-independent.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/switch.md b/packages/documentation-site/patternfly-docs/content/components/switch/switch.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/switch/switch.md
rename to packages/documentation-site/patternfly-docs/content/components/switch/switch.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/8-or-more-labels-in-modal.png b/packages/documentation-site/patternfly-docs/content/components/table/img/8-or-more-labels-in-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/8-or-more-labels-in-modal.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/8-or-more-labels-in-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Label-with-popover.png b/packages/documentation-site/patternfly-docs/content/components/table/img/Label-with-popover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Label-with-popover.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/Label-with-popover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Label-with-tooltip.png b/packages/documentation-site/patternfly-docs/content/components/table/img/Label-with-tooltip.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Label-with-tooltip.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/Label-with-tooltip.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Labels-with-popover.png b/packages/documentation-site/patternfly-docs/content/components/table/img/Labels-with-popover.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Labels-with-popover.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/Labels-with-popover.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Mobile-data-table-example.png b/packages/documentation-site/patternfly-docs/content/components/table/img/Mobile-data-table-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/Mobile-data-table-example.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/Mobile-data-table-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/actionable-table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/actionable-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/actionable-table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/actionable-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/compact-and-default-table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/compact-and-default-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/compact-and-default-table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/compact-and-default-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/compact-data-table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/compact-data-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/compact-data-table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/compact-data-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/compact-spacing.png b/packages/documentation-site/patternfly-docs/content/components/table/img/compact-spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/compact-spacing.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/compact-spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/comparison-table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/comparison-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/comparison-table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/comparison-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/data-table-example.png b/packages/documentation-site/patternfly-docs/content/components/table/img/data-table-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/data-table-example.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/data-table-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/default-spacing.png b/packages/documentation-site/patternfly-docs/content/components/table/img/default-spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/default-spacing.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/default-spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/expandable-data-table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/expandable-data-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/expandable-data-table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/expandable-data-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/expandable_data_table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/expandable_data_table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/expandable_data_table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/expandable_data_table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/link_table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/link_table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/link_table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/link_table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/page-action.png b/packages/documentation-site/patternfly-docs/content/components/table/img/page-action.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/page-action.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/page-action.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/row-striping-example.png b/packages/documentation-site/patternfly-docs/content/components/table/img/row-striping-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/row-striping-example.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/row-striping-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/sortable-data-table.png b/packages/documentation-site/patternfly-docs/content/components/table/img/sortable-data-table.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/sortable-data-table.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/sortable-data-table.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-actionable.png b/packages/documentation-site/patternfly-docs/content/components/table/img/table-actionable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-actionable.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-actionable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-actionable.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-actionable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-actionable.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-actionable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-column-sorting.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-column-sorting.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-column-sorting.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-column-sorting.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-compact-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-compact-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-compact-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-compact-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-comparison.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-comparison.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-comparison.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-comparison.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-compound-expand.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-compound-expand.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-compound-expand.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-compound-expand.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-compoundexpandable.png b/packages/documentation-site/patternfly-docs/content/components/table/img/table-compoundexpandable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-compoundexpandable.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-compoundexpandable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-dataexample.png b/packages/documentation-site/patternfly-docs/content/components/table/img/table-dataexample.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-dataexample.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-dataexample.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-default-spacing.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-default-spacing.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-default-spacing.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-default-spacing.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-elements.png b/packages/documentation-site/patternfly-docs/content/components/table/img/table-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-elements.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-expandable.png b/packages/documentation-site/patternfly-docs/content/components/table/img/table-expandable.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-expandable.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-expandable.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-expandable.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-expandable.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-expandable.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-expandable.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-favoriting.png b/packages/documentation-site/patternfly-docs/content/components/table/img/table-favoriting.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-favoriting.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-favoriting.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-favoriting.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-favoriting.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-favoriting.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-favoriting.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-mobile.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-mobile.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-mobile.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-mobile.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-page.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-page.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-page.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-page.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-popover.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-popover.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-popover.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-popover.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-row-striping.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-row-striping.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-row-striping.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-row-striping.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-search-modal.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-search-modal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-search-modal.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-search-modal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-variations.svg b/packages/documentation-site/patternfly-docs/content/components/table/img/table-variations.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/table-variations.svg
rename to packages/documentation-site/patternfly-docs/content/components/table/img/table-variations.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/tableoverflow.png b/packages/documentation-site/patternfly-docs/content/components/table/img/tableoverflow.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/img/tableoverflow.png
rename to packages/documentation-site/patternfly-docs/content/components/table/img/tableoverflow.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/table.md b/packages/documentation-site/patternfly-docs/content/components/table/table.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/table.md
rename to packages/documentation-site/patternfly-docs/content/components/table/table.md
index 0564f51574..ffcc04dce3 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/table/table.md
+++ b/packages/documentation-site/patternfly-docs/content/components/table/table.md
@@ -97,7 +97,7 @@ Both default and compact tables can be further enhanced and customized with a va
 - [Favoriting](#favoriting)
 
 ### Tabular numerals
-To apply a tabular style to numerals in a table, we offer a font modifier `.pf-v6-m-tabular-nums`. [Learn more about tabular font styling.](/design-foundations/typography#tabular-font-styling)
+To apply a tabular style to numerals in a table, we offer a font modifier `.pf-v6-m-tabular-nums`. [Learn more about tabular font styling.](/foundations-and-styles/typography#tabular-font-styling)
 
 ### Row striping
 Row striping can help improve legibility of a table by visually separating rows in large and dense data sets. With row striping enabled, table rows will alternate between `--pf-t--global--background--color--primary--default` and `--pf-t--global--background--color--secondary--default`.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/Horizontal-overflow.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/Horizontal-overflow.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/Horizontal-overflow.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/Horizontal-overflow.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/boxed-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/boxed-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/boxed-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/boxed-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/default-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/default-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/default-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/default-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/default-vs-filled-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/default-vs-filled-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/default-vs-filled-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/default-vs-filled-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/disabled-tab.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/disabled-tab.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/disabled-tab.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/disabled-tab.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/hierarchy-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/hierarchy-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/hierarchy-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/hierarchy-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/nested-tabs-unindented.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/nested-tabs-unindented.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/nested-tabs-unindented.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/nested-tabs-unindented.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/primary-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/primary-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/primary-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/primary-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/secondary-1-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/secondary-1-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/secondary-1-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/secondary-1-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/secondary-2-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/secondary-2-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/secondary-2-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/secondary-2-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-boxed.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-boxed.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-boxed.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-boxed.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-default.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-default.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-default.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-default.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-disabled.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-disabled.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-disabled.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-disabled.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-horizontal-overflow.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-horizontal-overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-horizontal-overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-horizontal-overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-modal.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-modal.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-modal.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-modal.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-primary.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-primary.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-primary.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-primary.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-secondary.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-secondary.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-secondary.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-secondary.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-vertical.svg b/packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-vertical.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/tabs-vertical.svg
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/tabs-vertical.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/vertical-tabs.png b/packages/documentation-site/patternfly-docs/content/components/tabs/img/vertical-tabs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/img/vertical-tabs.png
rename to packages/documentation-site/patternfly-docs/content/components/tabs/img/vertical-tabs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/tabs.md b/packages/documentation-site/patternfly-docs/content/components/tabs/tabs.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tabs/tabs.md
rename to packages/documentation-site/patternfly-docs/content/components/tabs/tabs.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/template/index.md.template b/packages/documentation-site/patternfly-docs/content/components/template/index.md.template
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/template/index.md.template
rename to packages/documentation-site/patternfly-docs/content/components/template/index.md.template
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-area/text-area.md b/packages/documentation-site/patternfly-docs/content/components/text-area/text-area.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-area/text-area.md
rename to packages/documentation-site/patternfly-docs/content/components/text-area/text-area.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/attribute-value-filter.png b/packages/documentation-site/patternfly-docs/content/components/text-input-group/img/attribute-value-filter.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/attribute-value-filter.png
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/img/attribute-value-filter.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/auto-complete-search.png b/packages/documentation-site/patternfly-docs/content/components/text-input-group/img/auto-complete-search.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/auto-complete-search.png
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/img/auto-complete-search.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-elements.png b/packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-group-attributes.svg b/packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-group-attributes.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-group-attributes.svg
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-group-attributes.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-group-auto-complete.svg b/packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-group-auto-complete.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-group-auto-complete.svg
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-group-auto-complete.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-group-elements.svg b/packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-group-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/img/text-input-group-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/img/text-input-group-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/text-input-group.md b/packages/documentation-site/patternfly-docs/content/components/text-input-group/text-input-group.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input-group/text-input-group.md
rename to packages/documentation-site/patternfly-docs/content/components/text-input-group/text-input-group.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/error.png b/packages/documentation-site/patternfly-docs/content/components/text-input/img/error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/error.png
rename to packages/documentation-site/patternfly-docs/content/components/text-input/img/error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/input-group.png b/packages/documentation-site/patternfly-docs/content/components/text-input/img/input-group.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/input-group.png
rename to packages/documentation-site/patternfly-docs/content/components/text-input/img/input-group.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/text-input-elements.svg b/packages/documentation-site/patternfly-docs/content/components/text-input/img/text-input-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/text-input-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/text-input/img/text-input-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/text-input-errors.svg b/packages/documentation-site/patternfly-docs/content/components/text-input/img/text-input-errors.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/text-input-errors.svg
rename to packages/documentation-site/patternfly-docs/content/components/text-input/img/text-input-errors.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/textinput-elements.png b/packages/documentation-site/patternfly-docs/content/components/text-input/img/textinput-elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/img/textinput-elements.png
rename to packages/documentation-site/patternfly-docs/content/components/text-input/img/textinput-elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/text-input.md b/packages/documentation-site/patternfly-docs/content/components/text-input/text-input.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/text-input.md
rename to packages/documentation-site/patternfly-docs/content/components/text-input/text-input.md
index 04db3b9d18..aa4293d23a 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/text-input/text-input.md
+++ b/packages/documentation-site/patternfly-docs/content/components/text-input/text-input.md
@@ -19,7 +19,7 @@ import '../components.css';
 
 ## Usage
 * Be sure to size input fields appropriately to anticipate the longest likely value (if a maximum character length is known).
-* When a value is too long to be fully displayed in a text field, use [truncation](/ux-writing/truncation).
+* When a value is too long to be fully displayed in a text field, use [truncation](/content-design/truncation).
 * Provide a [text area](/components/forms/text-area) for input anticipated to be longer than a single line.
 * Pre-populate fields with known values when possible, like a default IP address, for example.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/behavior.png b/packages/documentation-site/patternfly-docs/content/components/tile/img/behavior.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/behavior.png
rename to packages/documentation-site/patternfly-docs/content/components/tile/img/behavior.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/default.png b/packages/documentation-site/patternfly-docs/content/components/tile/img/default.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/default.png
rename to packages/documentation-site/patternfly-docs/content/components/tile/img/default.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/icon.png b/packages/documentation-site/patternfly-docs/content/components/tile/img/icon.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/icon.png
rename to packages/documentation-site/patternfly-docs/content/components/tile/img/icon.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/subtext.png b/packages/documentation-site/patternfly-docs/content/components/tile/img/subtext.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/subtext.png
rename to packages/documentation-site/patternfly-docs/content/components/tile/img/subtext.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/tileexample.png b/packages/documentation-site/patternfly-docs/content/components/tile/img/tileexample.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/img/tileexample.png
rename to packages/documentation-site/patternfly-docs/content/components/tile/img/tileexample.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/tile.md b/packages/documentation-site/patternfly-docs/content/components/tile/tile.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tile/tile.md
rename to packages/documentation-site/patternfly-docs/content/components/tile/tile.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Advance scheduling - time.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/Advance scheduling - time.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Advance scheduling - time.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/Advance scheduling - time.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Error message  time picker.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/Error message  time picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Error message  time picker.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/Error message  time picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Helper text -time picker.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/Helper text -time picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Helper text -time picker.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/Helper text -time picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Time picker- elements.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/Time picker- elements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Time picker- elements.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/Time picker- elements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Time range dropdown.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/Time range dropdown.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/Time range dropdown.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/Time range dropdown.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/placeholder text -time picker.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/placeholder text -time picker.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/placeholder text -time picker.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/placeholder text -time picker.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/time picker in a form.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/time picker in a form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/time picker in a form.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/time picker in a form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/time range.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/time range.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/time range.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/time range.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/time zone.png b/packages/documentation-site/patternfly-docs/content/components/time picker/img/time zone.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/img/time zone.png
rename to packages/documentation-site/patternfly-docs/content/components/time picker/img/time zone.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/time-picker.md b/packages/documentation-site/patternfly-docs/content/components/time picker/time-picker.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/time-picker.md
rename to packages/documentation-site/patternfly-docs/content/components/time picker/time-picker.md
index 760e61c7b8..4107a255e9 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/time picker/time-picker.md	
+++ b/packages/documentation-site/patternfly-docs/content/components/time picker/time-picker.md	
@@ -64,14 +64,14 @@ For some use cases, users may wish to customize their time display or selection
 
 <img src="./img/time zone.png" alt="time zone" width="260"/>
 
-Learn more about formatting and displaying time zones in our [date and time guidelines](/ux-writing/numerics).
+Learn more about formatting and displaying time zones in our [date and time guidelines](/content-design/numerics).
 
 ## Content considerations
 ### Time format
 
 Time formats are product-specific and often depend on user locale. To minimize confusion, choose one time format and keep it consistent. If one time picker displays HH:MM, be sure to repeat the same format throughout your interface.
 
-Learn more about date and time best practices in our [date and time guidelines](/ux-writing/numerics).
+Learn more about date and time best practices in our [date and time guidelines](/content-design/numerics).
 
 ### Placeholder text
 Always use placeholder text in time fields to provide an example of the accepted time format. Placeholder text will disappear after users begin inputting their own time.
@@ -98,4 +98,4 @@ Examples:
 
 <img src="./img/Error message  time picker.png" alt="time picker with an error message" width="200"/>
 
-For more information about writing effective error messages, see our <a href="https://v4-archive.patternfly.org/v4/ux-writing/error-messages/">UX writing style guide</a>.
+For more information about writing effective error messages, see our <a href="https://v4-archive.patternfly.org/v4/content-design/error-messages/">UX writing style guide</a>.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-24-hour-format.svg b/packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-24-hour-format.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-24-hour-format.svg
rename to packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-24-hour-format.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-Abbreviated-date.svg b/packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-Abbreviated-date.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-Abbreviated-date.svg
rename to packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-Abbreviated-date.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-elements.svg b/packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-using-am-pm.svg b/packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-using-am-pm.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/img/timestamp-using-am-pm.svg
rename to packages/documentation-site/patternfly-docs/content/components/timestamp/img/timestamp-using-am-pm.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/timestamp.md b/packages/documentation-site/patternfly-docs/content/components/timestamp/timestamp.md
similarity index 87%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/timestamp.md
rename to packages/documentation-site/patternfly-docs/content/components/timestamp/timestamp.md
index 51ccba50a7..dd12808188 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/timestamp/timestamp.md
+++ b/packages/documentation-site/patternfly-docs/content/components/timestamp/timestamp.md
@@ -11,9 +11,9 @@ import '../components.css';
 ![Timestamp with tooltip underline](./img/timestamp-elements.svg)
 </div>
 
-1. **Day:** Spelled out or abbreviated format. [See Numerics guidelines for more information](/ux-writing/numerics).
-2. **Date:** Can be spelled out, abbreviated form, or digit format. [See Numerics guidelines for more information](/ux-writing/numerics).
-3. **Time:** Should be displayed in 12-hour or 24-hour (HH:MM:SS). [See Numerics guidelines for more information](/ux-writing/numerics).
+1. **Day:** Spelled out or abbreviated format. [See Numerics guidelines for more information](/content-design/numerics).
+2. **Date:** Can be spelled out, abbreviated form, or digit format. [See Numerics guidelines for more information](/content-design/numerics).
+3. **Time:** Should be displayed in 12-hour or 24-hour (HH:MM:SS). [See Numerics guidelines for more information](/content-design/numerics).
 
 4. **UTC/Timezone:** Should always be displayed last, in shorthand form and be in 24-hour format.
 5. **Tooltip:** Dotted line displayed if there is tooltip available.
@@ -37,7 +37,7 @@ Use a timestamp when:
 - Displays time in UTC (Universal Coordinated Time).
 - Should be formatted the same as the timestamp. 
 
-See [numerics guidelines](/ux-writing/numerics) for more information about relative time best practices.
+See [numerics guidelines](/content-design/numerics) for more information about relative time best practices.
 
 ## Variations
 ### 12-hour format
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/title/title.md b/packages/documentation-site/patternfly-docs/content/components/title/title.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/title/title.md
rename to packages/documentation-site/patternfly-docs/content/components/title/title.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/elements-items.png b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/elements-items.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/elements-items.png
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/elements-items.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/form-view.png b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/form-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/form-view.png
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/form-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/multi-select.png b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/multi-select.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/multi-select.png
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/multi-select.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/multi-select.svg b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/multi-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/multi-select.svg
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/multi-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-elements.svg b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-form-view.svg b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-form-view.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-form-view.svg
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-form-view.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-table-view.svg b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-table-view.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-table-view.svg
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-table-view.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-typology.svg b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-typology.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/toggle-typology.svg
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/toggle-typology.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/topology-actions-2.png b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/topology-actions-2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/topology-actions-2.png
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/topology-actions-2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/topology-actions.png b/packages/documentation-site/patternfly-docs/content/components/toggle-group/img/topology-actions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/img/topology-actions.png
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/img/topology-actions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/toggle-group.md b/packages/documentation-site/patternfly-docs/content/components/toggle-group/toggle-group.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toggle-group/toggle-group.md
rename to packages/documentation-site/patternfly-docs/content/components/toggle-group/toggle-group.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/1-2-actions.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/1-2-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/1-2-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/1-2-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/3-actions.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/3-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/3-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/3-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/3-or-more-actions.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/3-or-more-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/3-or-more-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/3-or-more-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/bulk-selector.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/bulk-selector.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/bulk-selector.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/bulk-selector.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/buttons.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/buttons.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/buttons.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/buttons.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/divider.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/divider.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/divider.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/divider.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/filter-group.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/filter-group.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/filter-group.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/filter-group.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/filter-toggle.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/filter-toggle.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/filter-toggle.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/filter-toggle.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/icon-buttons.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/icon-buttons.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/icon-buttons.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/icon-buttons.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/overflow-small-view.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/overflow-small-view.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/overflow-small-view.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/overflow-small-view.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/overflow.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/overflow.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/overflow.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/overflow.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/pagination.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/pagination.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/pagination.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/pagination.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-basic.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-basic.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-basic.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-basic.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-card.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-card.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-card.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-card.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-custom.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-custom.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-custom.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-custom.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-elements.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-elements.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-elements.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-elements.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-icon-actions.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-icon-actions.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-icon-actions.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-icon-actions.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-mobile.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-mobile.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-mobile.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-mobile.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-multi-filters.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-multi-filters.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-multi-filters.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-multi-filters.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-page-header.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-page-header.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/toolbar-page-header.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/toolbar-page-header.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/without-pagination.svg b/packages/documentation-site/patternfly-docs/content/components/toolbar/img/without-pagination.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/img/without-pagination.svg
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/img/without-pagination.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/toolbar.md b/packages/documentation-site/patternfly-docs/content/components/toolbar/toolbar.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/toolbar/toolbar.md
rename to packages/documentation-site/patternfly-docs/content/components/toolbar/toolbar.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/bar-chart.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/bar-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/bar-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/bar-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/bar-chart.svg b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/bar-chart.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/bar-chart.svg
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/bar-chart.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/disabled-button.svg b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/disabled-button.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/disabled-button.svg
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/disabled-button.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/disabled-edit-button.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/disabled-edit-button.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/disabled-edit-button.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/disabled-edit-button.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/kebab-icon.svg b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/kebab-icon.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/kebab-icon.svg
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/kebab-icon.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/on-hyperlink.svg b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/on-hyperlink.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/on-hyperlink.svg
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/on-hyperlink.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-disabled-button.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-disabled-button.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-disabled-button.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-disabled-button.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-kebab-icon.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-kebab-icon.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-kebab-icon.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-kebab-icon.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-bar-chart.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-bar-chart.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-bar-chart.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-bar-chart.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-disabled-button.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-disabled-button.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-disabled-button.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-disabled-button.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-hyperlink.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-hyperlink.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-hyperlink.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-hyperlink.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-unlabeled-icons.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-unlabeled-icons.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltip-on-unlabeled-icons.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltip-on-unlabeled-icons.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltips.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltips.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/tooltips.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/tooltips.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/use-popovers.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/use-popovers.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/use-popovers.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/use-popovers.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/use-tooltips.png b/packages/documentation-site/patternfly-docs/content/components/tooltip/img/use-tooltips.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/img/use-tooltips.png
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/img/use-tooltips.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/tooltip.md b/packages/documentation-site/patternfly-docs/content/components/tooltip/tooltip.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/tooltip.md
rename to packages/documentation-site/patternfly-docs/content/components/tooltip/tooltip.md
index 59848febd4..604b09268a 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tooltip/tooltip.md
+++ b/packages/documentation-site/patternfly-docs/content/components/tooltip/tooltip.md
@@ -44,7 +44,7 @@ Both tooltips and [popovers](/components/popover/design-guidelines) provide more
 - Tooltips appear on hover, while popovers appear on click.   
 
 ## Content considerations
-For content guidance, refer to [our tooltip writing guide.](/ux-writing/tooltips)
+For content guidance, refer to [our tooltip writing guide.](/content-design/tooltips)
 
 ## Accessibility
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/default-treeview.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/default-treeview.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/default-treeview.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/default-treeview.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-action.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-action.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-action.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-action.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-badges.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-badges.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-badges.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-badges.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-checkboxes.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-checkboxes.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-checkboxes.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-checkboxes.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-compact.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-compact.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-compact.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-compact.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-icons.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-icons.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-icons.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-icons.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-primarydetail.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-primarydetail.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-primarydetail.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-primarydetail.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-search.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-search.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-search.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-search.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-usage.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-usage.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-usage.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-usage.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/img/treeview-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/img/treeview-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/tree-view.md b/packages/documentation-site/patternfly-docs/content/components/tree-view/tree-view.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/tree-view/tree-view.md
rename to packages/documentation-site/patternfly-docs/content/components/tree-view/tree-view.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/breadcrumb-truncate.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/breadcrumb-truncate.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/breadcrumb-truncate.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/breadcrumb-truncate.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/end-line.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/end-line.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/end-line.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/end-line.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/front-line.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/front-line.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/front-line.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/front-line.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/long-url.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/long-url.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/long-url.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/long-url.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/mid-line.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/mid-line.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/mid-line.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/mid-line.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/table-truncate.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/table-truncate.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/table-truncate.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/table-truncate.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/text-alerts.svg b/packages/documentation-site/patternfly-docs/content/components/truncate/img/text-alerts.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/img/text-alerts.svg
rename to packages/documentation-site/patternfly-docs/content/components/truncate/img/text-alerts.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/truncate.md b/packages/documentation-site/patternfly-docs/content/components/truncate/truncate.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/truncate/truncate.md
rename to packages/documentation-site/patternfly-docs/content/components/truncate/truncate.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/completion-screen.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/completion-screen.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/completion-screen.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/completion-screen.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/completion-screen.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/completion-screen.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/completion-screen.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/completion-screen.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/in-page-wizard.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/in-page-wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/in-page-wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/in-page-wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/in-page-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/in-page-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/in-page-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/in-page-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/mobile-wizard.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/mobile-wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/mobile-wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/mobile-wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/mobile-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/mobile-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/mobile-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/mobile-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/modal-wizard.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/modal-wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/modal-wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/modal-wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/modal-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/modal-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/modal-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/modal-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/progress-screen.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/progress-screen.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/progress-screen.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/progress-screen.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/review-screen.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/review-screen.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/review-screen.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/review-screen.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/simple-wizard.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/simple-wizard.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/simple-wizard.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/simple-wizard.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/simple-wizard.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/simple-wizard.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/simple-wizard.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/simple-wizard.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-config.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-config.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-config.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-config.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-drawer-closed.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-drawer-closed.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-drawer-closed.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-drawer-closed.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-drawer-open.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-drawer-open.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-drawer-open.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-drawer-open.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-optional.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-optional.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-optional.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-optional.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step1.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step1.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step1.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step1.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step1.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step1.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step2-new.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step2-new.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step2-new.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step2-new.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step2.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step2.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step2.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step2.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step3-new.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step3-new.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step3-new.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step3-new.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step3.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step3.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-progressive-step3.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-progressive-step3.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-responsive.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-responsive.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-responsive.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-responsive.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-review.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-review.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-review.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-review.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-substeps.svg b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-substeps.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-substeps.svg
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-substeps.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-drawer-closed.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-drawer-closed.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-drawer-closed.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-drawer-closed.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-drawer-open.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-drawer-open.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-drawer-open.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-drawer-open.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-optional-steps.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-optional-steps.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-optional-steps.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-optional-steps.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-substeps.png b/packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-substeps.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/img/wizard-with-substeps.png
rename to packages/documentation-site/patternfly-docs/content/components/wizard/img/wizard-with-substeps.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/wizard.md b/packages/documentation-site/patternfly-docs/content/components/wizard/wizard.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/components/wizard/wizard.md
rename to packages/documentation-site/patternfly-docs/content/components/wizard/wizard.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/about.md b/packages/documentation-site/patternfly-docs/content/content-design/about.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/about.md
rename to packages/documentation-site/patternfly-docs/content/content-design/about.md
index 5384fe7cd0..58c67d1f21 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/about.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/about.md
@@ -1,6 +1,7 @@
 ---
-id: About UX writing
-section: UX writing
+id: Overview
+title: Content design overview
+section: content-design
 sortValue: 1
 
 ---
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/writing-for-all-audiences.md b/packages/documentation-site/patternfly-docs/content/content-design/accessibility-and-localization.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/writing-for-all-audiences.md
rename to packages/documentation-site/patternfly-docs/content/content-design/accessibility-and-localization.md
index 01218f2010..7e3e393cbb 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/writing-for-all-audiences.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/accessibility-and-localization.md
@@ -1,6 +1,6 @@
 ---
-id: Writing for all audiences
-section: UX writing
+id: Accessiblity and localization
+section: content-design
 --- 
 
 By following accessibility and global writing best practices, you’ll be better equipped to create product experiences for users of all abilities and backgrounds. 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/ux-writing-best-practices.md b/packages/documentation-site/patternfly-docs/content/content-design/best-practices.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/ux-writing-best-practices.md
rename to packages/documentation-site/patternfly-docs/content/content-design/best-practices.md
index e9912318e1..05ec5e3317 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/ux-writing-best-practices.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/best-practices.md
@@ -1,6 +1,7 @@
 ---
-id: UX writing best practices
-section: UX writing
+id: Best practices
+title: Best content design practices 
+section: content-design
 ---
 
 Treat words as part of your design, not something to be added at the end. UX copy needs to be rooted in user information and context so that it can contribute to an effective, intuitive, and human-centric product experience. 
@@ -77,7 +78,7 @@ Stick with the same terminology to describe actions and objects across the entir
 </div>
 
 ## Align with your brand
-Make sure your UX copy reflects your brand voice (as we outline in [our brand voice and tone guide](/ux-writing/brand-voice-and-tone)). UX copy is not just for adding clarity and guiding users through the interface. You’re also creating an experience with your words, making a product interaction sound, feel, and look like a human conversation.
+Make sure your UX copy reflects your brand voice (as we outline in [our brand voice and tone guide](/content-design/brand-voice-and-tone)). UX copy is not just for adding clarity and guiding users through the interface. You’re also creating an experience with your words, making a product interaction sound, feel, and look like a human conversation.
 
 
 ## Lead with the benefit
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/brand-voice-and-tone.md b/packages/documentation-site/patternfly-docs/content/content-design/brand-voice-and-tone.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/brand-voice-and-tone.md
rename to packages/documentation-site/patternfly-docs/content/content-design/brand-voice-and-tone.md
index 567bbab640..e0e1eda6d8 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/brand-voice-and-tone.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/brand-voice-and-tone.md
@@ -1,6 +1,6 @@
 ---
 id: Brand voice and tone
-section: UX writing
+section: content-design
 ---
 
 In a business context, brand is the identity of a company that people recognize based on an emotional and psychological connection, as well as factual information.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/capitalization.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/capitalization.md
similarity index 83%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/capitalization.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/capitalization.md
index 72817a5cfe..524a23db3a 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/capitalization.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/capitalization.md
@@ -1,6 +1,7 @@
 ---
 id: Capitalization
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 # Capitalization guidelines
@@ -17,7 +18,7 @@ When you write for a product, make sure you adhere to the following capitalizati
 
 - Default to sentence case across all UI elements, including navigation items, page titles, buttons, and so on. 
 
-<div class="ws-image"> <img src="./img/navigation-capitalization.png"  alt="A side navigation menu, expanded to show capitalization styles." width="600px"/></div>
+<div class="ws-image"> <img src="../img/navigation-capitalization.png"  alt="A side navigation menu, expanded to show capitalization styles." width="600px"/></div>
 
 - Keep capitalization for custom resources the same as the capitalization style used during creation. 
     - For example, if a custom resource name was created with all lowercase letters, don't change any of the letters to uppercase when referencing this resource. 
@@ -35,11 +36,11 @@ When you write for a product, make sure you adhere to the following capitalizati
 
 It is common for page titles to appear as an item in a breadcrumb trail. Match the capitalization of the original page title in the corresponding breadcrumb item even when the item does not use sentence case, or when a breadcrumb trail contains mixed capitalization standards.
 
-<div class="ws-image"> <img src="./img/basic-breadcrumb.png"  alt="A breadcrumb trail with mixed capitalization styles due to page title formatting." width="600"/> </div>
+<div class="ws-image"> <img src="../img/basic-breadcrumb.png"  alt="A breadcrumb trail with mixed capitalization styles due to page title formatting." width="600"/> </div>
 
 Sometimes, user-named items will appear in a breadcrumb trail. If a custom resource name (for example, "customResource-name") is included in the breadcrumb trail, you should match the capitalization of the users' original entry. 
 
-<p class="ws-image"> <img src="./img/breadcrumb-custom-item.png"  alt="A breadcrumb trail with mixed capitalization styles due to custom resource naming." width="600"/></p>
+<p class="ws-image"> <img src="../img/breadcrumb-custom-item.png"  alt="A breadcrumb trail with mixed capitalization styles due to custom resource naming." width="600"/></p>
 
 ### Tools outside your product portfolio
 
@@ -57,7 +58,7 @@ There are additional capitalization guidelines that you should follow if you con
 
 Take the PatternFly website as an example, where all navigation items, button text, and headings are written in sentence case and all proper nouns are in title case:
 
-<div class="ws-image"><img src="./img/pf-home-caps.png"  alt="A PatternFly website screenshot showing sentence case copy." width="700"/>
+<div class="ws-image"><img src="../img/pf-home-caps.png"  alt="A PatternFly website screenshot showing sentence case copy." width="700"/>
 </div>
 
 - Write all components in lowercase unless they start a sentence. 
@@ -66,6 +67,6 @@ Take the PatternFly website as an example, where all navigation items, button te
 
 For example, the following image from our component documentation uses lowercase for the component name ("card") and capitalizes code appropriately ("isCompact" and "isLarge").
 
-<div class="ws-image"><img src="./img/component-docs.png"  alt="Component documentation showing sentence case copy and capitalization styling for code." width="700"/>
+<div class="ws-image"><img src="../img/component-docs.png"  alt="Component documentation showing sentence case copy and capitalization styling for code." width="700"/>
 </div>
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/numerics.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/numerics.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/numerics.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/numerics.md
index ad36d4cc34..6d210088c1 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/numerics.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/numerics.md
@@ -1,11 +1,12 @@
 ---
 id: Numerics
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 ## Font styling
 
-If needed, we offer a font modifier `.pf-v6-m-tabular-nums` that applies tabular styling to numerals. [Learn more about tabular font styling.](/design-foundations/typography#tabular-font-styling)
+If needed, we offer a font modifier `.pf-v6-m-tabular-nums` that applies tabular styling to numerals. [Learn more about tabular font styling.](/foundations-and-styles/typography#tabular-font-styling)
 
 ## Date and time formats
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/punctuation.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/punctuation.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/punctuation.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/punctuation.md
index ad3c104b31..26eb12387d 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/punctuation.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/punctuation.md
@@ -1,6 +1,7 @@
 ---
 id: Punctuation
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 ## Headings and titles
@@ -45,7 +46,7 @@ For clarity, avoid using **ampersands** (&), and use "and" instead.
 ## Buttons 
 Avoid using punctuation on **buttons**. 
 
-Do not use punctuation to create icons on buttons (for example, do not use a plus sign "+"). Instead, refer to [PatternFly's icons page](/design-foundations/icons) for any icons you place on buttons.
+Do not use punctuation to create icons on buttons (for example, do not use a plus sign "+"). Instead, refer to [PatternFly's icons page](/foundations-and-styles/iconography) for any icons you place on buttons.
 
 ## Colon and semicolon
 Use a **colon** to introduce a list or a series. You can also use it as a pause before introducing related information. For example:
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/sentence-structure.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/sentence-structure.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/sentence-structure.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/sentence-structure.md
index 055ec61c36..e9aa4dc7ef 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/sentence-structure.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/sentence-structure.md
@@ -1,6 +1,7 @@
 ---
 id: Sentence structure
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 ## Point of view 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/terminology.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/terminology.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/terminology.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/terminology.md
index b10413306b..ee74c5b6b8 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/terminology.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/terminology.md
@@ -1,6 +1,7 @@
 ---
 id: Terminology
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 This resource overviews common UI terms and their usage. 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/truncation.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/truncation.md
similarity index 92%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/truncation.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/truncation.md
index 1694e7dff9..84f3f99a62 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/truncation.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/truncation.md
@@ -1,13 +1,14 @@
 ---
 id: Truncation
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 **Truncate**, or shorten, your content whenever a string overflows the container and you don't want multiple lines of text. Typically, this is done by utilizing ellipses (...).
 
 For example, use truncation when a URL overflows its container:
 
-<img src="./img/longurl.png" alt="image showing long url truncation" width="500" />
+<img src="../img/longurl.png" alt="image showing long url truncation" width="500" />
 
 ## Where to truncate
 Whether you should truncate strings at the beginning, end, or in the middle requires a bit of research.
@@ -18,7 +19,7 @@ If the product doesn't have a default truncation scheme, think about how the pro
 
 If users are able to customize settings regarding truncation, then you should match their chosen preference:
 
-<img src="./img/truncation3@2x.jpg" alt="image showing user selected truncation options"/>
+<img src="../img/truncation3@2x.jpg" alt="image showing user selected truncation options"/>
 
 ## Truncation guidelines and best practices
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/units-and-symbols.md b/packages/documentation-site/patternfly-docs/content/content-design/grammar/units-and-symbols.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/units-and-symbols.md
rename to packages/documentation-site/patternfly-docs/content/content-design/grammar/units-and-symbols.md
index 086072b9b4..6ba2957ef9 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/units-and-symbols.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/grammar/units-and-symbols.md
@@ -1,6 +1,7 @@
 ---
 id: Units and symbols
-section: UX writing
+section: content-design
+subsection: grammar
 ---
 
 # Communicating measurements
@@ -29,7 +30,7 @@ When displaying quantitative values for measurements in your UI, use the [Intern
 
 ## Currency
 
-Wherever possible, display currency in three-letter code according to [ISO Standard 4217](https://www.iso.org/iso-4217-currency-codes.html). See our [numerics](/ux-writing/numerics#numbers-and-currency) guidelines for more information about writing currency.
+Wherever possible, display currency in three-letter code according to [ISO Standard 4217](https://www.iso.org/iso-4217-currency-codes.html). See our [numerics](/content-design/numerics#numbers-and-currency) guidelines for more information about writing currency.
 
 ## Data bandwidth
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/404-page.png b/packages/documentation-site/patternfly-docs/content/content-design/img/404-page.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/404-page.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/404-page.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/Testing.png b/packages/documentation-site/patternfly-docs/content/content-design/img/Testing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/Testing.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/Testing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/active.png b/packages/documentation-site/patternfly-docs/content/content-design/img/active.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/active.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/active.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/basic-breadcrumb.png b/packages/documentation-site/patternfly-docs/content/content-design/img/basic-breadcrumb.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/basic-breadcrumb.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/basic-breadcrumb.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/breadcrumb-custom-item.png b/packages/documentation-site/patternfly-docs/content/content-design/img/breadcrumb-custom-item.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/breadcrumb-custom-item.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/breadcrumb-custom-item.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/component-docs.png b/packages/documentation-site/patternfly-docs/content/content-design/img/component-docs.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/component-docs.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/component-docs.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/component-example-text.png b/packages/documentation-site/patternfly-docs/content/content-design/img/component-example-text.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/component-example-text.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/component-example-text.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/concise.png b/packages/documentation-site/patternfly-docs/content/content-design/img/concise.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/concise.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/concise.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/conversational.png b/packages/documentation-site/patternfly-docs/content/content-design/img/conversational.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/conversational.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/conversational.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/copydoc.png b/packages/documentation-site/patternfly-docs/content/content-design/img/copydoc.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/copydoc.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/copydoc.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/desguidelines1.png b/packages/documentation-site/patternfly-docs/content/content-design/img/desguidelines1.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/desguidelines1.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/desguidelines1.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/desguidelines2.png b/packages/documentation-site/patternfly-docs/content/content-design/img/desguidelines2.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/desguidelines2.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/desguidelines2.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/desguidelines3.png b/packages/documentation-site/patternfly-docs/content/content-design/img/desguidelines3.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/desguidelines3.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/desguidelines3.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/elements-example.png b/packages/documentation-site/patternfly-docs/content/content-design/img/elements-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/elements-example.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/elements-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/error.png b/packages/documentation-site/patternfly-docs/content/content-design/img/error.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/error.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/error.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/longurl.png b/packages/documentation-site/patternfly-docs/content/content-design/img/longurl.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/longurl.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/longurl.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/navigation-capitalization.png b/packages/documentation-site/patternfly-docs/content/content-design/img/navigation-capitalization.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/navigation-capitalization.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/navigation-capitalization.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/pf-component-caps.png b/packages/documentation-site/patternfly-docs/content/content-design/img/pf-component-caps.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/pf-component-caps.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/pf-component-caps.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/pf-home-caps.png b/packages/documentation-site/patternfly-docs/content/content-design/img/pf-home-caps.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/pf-home-caps.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/pf-home-caps.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/simple-tense.png b/packages/documentation-site/patternfly-docs/content/content-design/img/simple-tense.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/simple-tense.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/simple-tense.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/sliderelements.png b/packages/documentation-site/patternfly-docs/content/content-design/img/sliderelements.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/sliderelements.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/sliderelements.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/submit-form.png b/packages/documentation-site/patternfly-docs/content/content-design/img/submit-form.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/submit-form.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/submit-form.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation1@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation1@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation1@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation1@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation2@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation2@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation2@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation2@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation3@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation3@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation3@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation3@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation4@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation4@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation4@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation4@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation5@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation5@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation5@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation5@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation6@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation6@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation6@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation6@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation7@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation7@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation7@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation7@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation8@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation8@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation8@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation8@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation9@2x.jpg b/packages/documentation-site/patternfly-docs/content/content-design/img/truncation9@2x.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/truncation9@2x.jpg
rename to packages/documentation-site/patternfly-docs/content/content-design/img/truncation9@2x.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/useful.png b/packages/documentation-site/patternfly-docs/content/content-design/img/useful.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/useful.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/useful.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/user-menu-example.png b/packages/documentation-site/patternfly-docs/content/content-design/img/user-menu-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/img/user-menu-example.png
rename to packages/documentation-site/patternfly-docs/content/content-design/img/user-menu-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/cli-guidelines.md b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/cli-guidelines.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/cli-guidelines.md
rename to packages/documentation-site/patternfly-docs/content/content-design/writing-guides/cli-guidelines.md
index ee1c0bf24a..4d003c7d9e 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/cli-guidelines.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/cli-guidelines.md
@@ -2,7 +2,8 @@
 id: CLI handbook
 title: Command-line interface handbook
 source: overview
-section: developer-resources
+section: content-design
+subsection: writing-guides
 ---
 
 # Designing for command-line interfaces
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/cli-writing.md b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/cli-writing.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/cli-writing.md
rename to packages/documentation-site/patternfly-docs/content/content-design/writing-guides/cli-writing.md
index d9c2fde04f..aa9920bd9d 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/cli-writing.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/cli-writing.md
@@ -2,7 +2,8 @@
 id: CLI handbook
 title: Command-line interface handbook
 source: writing-guidelines
-section: developer-resources
+section: content-design
+subsection: writing-guides
 ---
 
 ## CLI outputs
@@ -33,7 +34,7 @@ Next steps:
 
 When errors occur, explain what happened, why, and how to fix it.
 
-Expanding on our [UI error writing guidelines](/ux-writing/error-messages), CLI errors should:
+Expanding on our [UI error writing guidelines](/content-design/error-messages), CLI errors should:
 - Use plain language, avoiding internal jargon.
 - Offer suggestions and actionable next steps.
 - Conclude with the most important information. This is the opposite of content design for products with GUIs.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/error-messages.md b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/error-messages.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/error-messages.md
rename to packages/documentation-site/patternfly-docs/content/content-design/writing-guides/error-messages.md
index 391abbffd2..7f29bd032f 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/error-messages.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/error-messages.md
@@ -1,6 +1,7 @@
 ---
 id: Error messages
-section: UX writing
+section: content-design
+subsection: writing-guides
 ---
 
 ## Error message structure
@@ -99,11 +100,11 @@ When providing users with a resolution, start the sentence with their goal ("the
 
 A **404 page** is an error page that a user lands on when the content they're trying to view either doesn’t exist or can’t be found. 404 pages are named after the type of error they communicate: “Error 404: Not found.”
 
-Write 404 pages with [error message best practices](/ux-writing/error-messages) in mind: Explain what a 404 error is, define how users can proceed, and provide the tools they need to get there.
+Write 404 pages with [error message best practices](/content-design/error-messages) in mind: Explain what a 404 error is, define how users can proceed, and provide the tools they need to get there.
 
 Effective 404 pages combine several elements to regroup, redirect, and empower lost users to reach their desired destination or find a new one.
 
-<img src="./img/404-page.png" alt="The PatternFly 404 page with added call outs to mark four main elements: Heading, next steps, suggested content, and a link to the home page." />
+<img src="../img/404-page.png" alt="The PatternFly 404 page with added call outs to mark four main elements: Heading, next steps, suggested content, and a link to the home page." />
 
 1. **Heading:** Communicates what a 404 error is in plain language that users can understand. Avoid including “404” or “404 error” unless it’s clearly defined after: “404: That page no longer exists.” Write 404 headings without end punctuation (no period), unless punctuated page headings align with your brand or product.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/writing-patternfly-design-guidelines.md b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/patternfly-design-guidelines.md
similarity index 90%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/writing-patternfly-design-guidelines.md
rename to packages/documentation-site/patternfly-docs/content/content-design/writing-guides/patternfly-design-guidelines.md
index 1c363e865b..01dd4a4af5 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/writing-patternfly-design-guidelines.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/patternfly-design-guidelines.md
@@ -1,6 +1,7 @@
 ---
-id: Writing PatternFly design guidelines
-section: UX writing
+id: PatternFly design guidelines
+section: content-design
+subsection: writing-guides
 ---
 
 This guide provides instructions for writing clear and consistent design documentation for PatternFly. PatternFly's design guidelines provide users with information regarding the design, usage, behavior, and more of PatternFly's elements and components.
@@ -15,7 +16,7 @@ Display an image of the component containing numbered annotation tags for each m
 
 For example:
 
-<img src="./img/elements-example.png" alt="A screenshot of the slider component's element section with 8 elements outlined."/>
+<img src="../img/elements-example.png" alt="A screenshot of the slider component's element section with 8 elements outlined."/>
 
 ### Usage (H2)
 Explain how the component is used, when to use it, and why it should be used. Include explanations of problems it could help solve and address its advantages over similar components. Include images for visual examples.
@@ -37,7 +38,7 @@ Additional sub-sections to include:
 #### When to use X variation vs. when to use Y variation (H3)
 
 ### Spacing (H2)
-Introduce spacing requirements for components and their content. For more information regarding proper spacing, refer to our [spacing guidelines.](/design-foundations/spacers)
+Introduce spacing requirements for components and their content. For more information regarding proper spacing, refer to our [spacing guidelines.](/foundations-and-styles/spacers)
 
 ### Placement (H2)
 Provide details on where components should be located in a UI and in relation to other components. 
@@ -62,7 +63,7 @@ The following best practices should inform the way that you format the content i
 
 ### Capitalization
 
-Our [capitalization style guidelines](/ux-writing/capitalization/) outline best practices for capitalization across PatternFly. 
+Our [capitalization style guidelines](/content-design/capitalization/) outline best practices for capitalization across PatternFly. 
 
 Always write headings in sentence case. Write component names in lowercase. 
 
@@ -98,7 +99,7 @@ Annotations highlight specific areas in an image. Follow these best practices wh
 
 - Use numbered callouts to call out multiple areas in your image, then use a corresponding numbered list to explain each one. For example:
 
-    ![Two callouts highlight multiple items on a toolbar.](./img/desguidelines2.png)
+    ![Two callouts highlight multiple items on a toolbar.](../img/desguidelines2.png)
 
     **1. Items in view:** Allows the user to select the item count (number of listed items) per page, as seen in full pagination
 
@@ -106,13 +107,13 @@ Annotations highlight specific areas in an image. Follow these best practices wh
 
 - Avoid using a callout to highlight a single item, unless you're pointing out a small part of a large view, or the item isn't clearly shown in your image. Use a blank, unnumbered callout to mark the area, then bold it in your explanation. For example:
 
-    ![#A single callout highlights the login button on a large screen.](./img/desguidelines3.png)
+    ![#A single callout highlights the login button on a large screen.](../img/desguidelines3.png)
 
     Always write your **login button** as two words: "Log in."
 
 ## Style, voice, and tone
 
-PatternFly's documentation is friendly and instructional. Learn more about voice in our [brand voice and tone section](/ux-writing/brand-voice-and-tone/).
+PatternFly's documentation is friendly and instructional. Learn more about voice in our [brand voice and tone section](/content-design/brand-voice-and-tone/).
 
 When writing design guidelines, use:
 
@@ -120,7 +121,7 @@ When writing design guidelines, use:
 - Second-person point of view ("you").
 - Active voice, unless you're using passive voice for emphasis.
 - Direct language and sentence structure.
-- Full words to introduce examples, instead of their abbreviations ("for example" instead of "e.g."), as seen on our [terms list](/ux-writing/terminology/).
+- Full words to introduce examples, instead of their abbreviations ("for example" instead of "e.g."), as seen on our [terms list](/content-design/terminology/).
 - Descriptive language instead of directional language (up, down, left, right) to refer to elements in your document.
 - Descriptive hyperlinks (not "click here").
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/product-tours.md b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/product-tours.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/product-tours.md
rename to packages/documentation-site/patternfly-docs/content/content-design/writing-guides/product-tours.md
index 194a6ea5d7..45531f49b2 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/product-tours.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/product-tours.md
@@ -1,6 +1,7 @@
 ---
 id: Product tours
-section: UX writing
+section: content-design
+subsection: writing-guides
 ---
 A product tour, also referred to as an "onboarding flow", includes a series of dialog boxes or pop-ups that introduce users to a new tool or a redesigned tool.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/tooltips.md b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/tooltips.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/content/tooltips.md
rename to packages/documentation-site/patternfly-docs/content/content-design/writing-guides/tooltips.md
index 7e3e9fc507..20a44b482d 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/content/tooltips.md
+++ b/packages/documentation-site/patternfly-docs/content/content-design/writing-guides/tooltips.md
@@ -1,6 +1,7 @@
 ---
 id: Tooltips
-section: UX writing
+section: content-design
+subsection: writing-guides
 ---
 
 import ArrowCircleUpIcon from '@patternfly/react-icons/dist/esm/icons/arrow-circle-up-icon';
@@ -79,4 +80,4 @@ In PatternFly, there are commonly used icons that hold universal meanings. These
 | <ExportIcon />  | pficon-export | Export |
 | <TaskIcon />  | pficon-task | Tasks | 
 
-You can learn more about the usage of these icons in our [design foundations.](/design-foundations/icons)
+You can learn more about the usage of these icons in our [design foundations.](/foundations-and-styles/iconography)
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/themed-charts/themed-charts.md b/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/themed-charts/themed-charts.md
deleted file mode 100644
index 2c765a4668..0000000000
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/charts/themed-charts/themed-charts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-id: Themes
-section: charts
----
-A **themed chart** is a chart with different theme and color treatments applied to it. Themed charts can help visually distinguish between different categories and data collection points plotted on the graph.
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/rtl-handbook.md b/packages/documentation-site/patternfly-docs/content/developer-guides/rtl-handbook.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/developer-resources/rtl-handbook.md
rename to packages/documentation-site/patternfly-docs/content/developer-guides/rtl-handbook.md
index d7bf1ff4c2..98b25e2c24 100644
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/rtl-handbook.md
+++ b/packages/documentation-site/patternfly-docs/content/developer-guides/rtl-handbook.md
@@ -1,7 +1,7 @@
 ---
 id: Right-to-left handbook
 title: PatternFly right-to-left handbook
-section: developer-resources
+section: developer-guides
 
 ---
 
diff --git a/packages/documentation-site/patternfly-docs/content/developer-resources/patternfly-accessibility.md b/packages/documentation-site/patternfly-docs/content/developer-resources/patternfly-accessibility.md
deleted file mode 100644
index 1568017f9d..0000000000
--- a/packages/documentation-site/patternfly-docs/content/developer-resources/patternfly-accessibility.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-id: PatternFly's accessibility
-section: accessibility
----
-
-## Component accessibility 
-
-We do our best to build accessibility into PatternFly's components to take some of the accessibility work off your hands.
-
-As PatternFly is updated and enhanced, we check the accessibility of updates through a combination of automated and manual testing. We use [aXe: The Accessibility Engine](https://www.deque.com/axe/) to ensure that all components pass an accessibility audit before they’re added to PatternFly. 
-
-We also regularly audit keyboard accessibility with both manual testing and integration tests. We aim to provide full support for VoiceOver as our main screen reader, but we still test our components through NVDA and JAWS. As part of our manual audit, every component is run through VoiceOver to make sure they’ll be as accessible as possible in your products.
-
-## Accessibility standards
-
-We strive for compliance in accordance to [level AA in the Web Content Accessibility Guidelines 2.2](https://www.w3.org/WAI/WCAG22/quickref/?versions=2.2&currentsidebar=%23col_customize&levels=aaa) across the core PatternFly HTML and React libraries, as well as our extensions and component groups. If you use or contribute to PatternFly, the following accessibility guidelines are some that you can expect PatternFly to adhere to (keep in mind this is not an exhaustive list):
-
-| Guideline  | Link  | Applies to  | Tested |
-| --- | --- | --- | --- |
-| Semantic HTML structures are used to accurately communicate the purpose and relationship of UI elements. | [WCAG 1.3.1](//www.w3.org/WAI/WCAG22/quickref#info-and-relationships) | `design` `html` `css` | Automated testing with aXe and manual testing |
-|Color is not the only method of communication. Providing meaning with color is supplementary to providing meaning with text. | [WCAG 1.4.1](//www.w3.org/WAI/WCAG22/quickref#use-of-color) | `design` `html` `css` | Manual testing and aXe used |
-| Colors used provide sufficient contrast | [WCAG 1.4.3](//www.w3.org/WAI/WCAG22/quickref#contrast-minimum) and [1.4.11](//www.w3.org/WAI/WCAG22/quickref#non-text-contrast) | `css` | Automated testing with aXe |
-| Font sizes can scale up to 200% without loss of content or functionality, and up to 400% without needing to scroll in more than one direction.  | [WCAG&nbsp;1.4.4](//www.w3.org/WAI/WCAG22/quickref#resize-text) and [1.4.10](//www.w3.org/WAI/WCAG22/quickref#reflow) | `css` | Manual testing |
-| Styles that affect text spacing (line height, space between paragraphs, letter spacing, and word spacing) can be increased without loss of content or functionality. | [WCAG 1.4.12](//www.w3.org/WAI/WCAG22/quickref#text-spacing) | `css` | Manual testing and aXe used |
-| Contents that appear on hover and focus are dismissible, hoverable, and persistent. | [WCAG 1.4.13](//www.w3.org/WAI/WCAG22/quickref#content-on-hover-or-focus) | `html` `css` `js` | Manual testing | 
-| All functionality is keyboard accessible. | [WCAG 2.1.1](//www.w3.org/WAI/WCAG22/quickref#keyboard) and [2.1.2](//www.w3.org/WAI/WCAG22/quickref#no-keyboard-trap) | `html` | Manual testing |
-| Elements in the HTML and in the layout follow a logical order. | [WCAG 1.3.2](//www.w3.org/WAI/WCAG22/quickref#meaningful-sequence) and [2.4.3](//www.w3.org/WAI/WCAG22/quickref#focus-order) | `design` `html` `css` | Manual testing |
-| Flashing content does not flash more than three times in any one-second period, or the flash is below the general flash and red flash thresholds. | [WCAG 2.3.1](//www.w3.org/WAI/WCAG22/quickref/?showtechniques=231#three-flashes-or-below-threshold) | `css` | Manual testing|
-| Elements with focus are clearly visible. | [WCAG 2.4.7](//www.w3.org/WAI/WCAG22/quickref#focus-visible) | `css` | Manual testing |
-| Elements that are focusable are not entirely obscured. | [WCAG 2.4.11](//www.w3.org/WAI/WCAG22/quickref#focus-not-obscured-minimum) | `design` | Manual testing |
-| Functionality that uses complex gestures can also be operated with a single pointer without a path-based gesture. | [WCAG 2.5.1](//www.w3.org/WAI/WCAG22/quickref#pointer-gestures) | `design` | Manual testing |
-| Pointer events can be canceled.  | [WCAG 2.5.2](//www.w3.org/WAI/WCAG22/quickref#pointer-cancellation) | `js` | Manual testing |
-| Visible labels of UI components are either the same as the accessible name or used in the beginning of the accessible name. | [WCAG 2.5.3](//www.w3.org/WAI/WCAG22/quickref#label-in-name) | `html` | Automated testing with aXe and manual testing |
-| Any action that involves dragging has a pointer alternative. | [WCAG 2.5.7](//www.w3.org/WAI/WCAG22/quickref#dragging-movements) | `js` | Manual testing |
-| The target area for clickable elements is at least 24 by 24 [CSS pixels](//www.w3.org/TR/WCAG22#dfn-css-pixels), with specific exceptions. | [WCAG 2.5.8](//www.w3.org/WAI/WCAG22/quickref/#target-size-minimum) | `css` | Manual testing |
-| An accessible name, role, and value are provided for all user interface elements. | [WCAG 4.1.2](//www.w3.org/WAI/WCAG22/quickref#name-role-value) | `design` `html` | Automated testing with aXe and manual testing with VoiceOver
-| Status messages can be programmatically determined through role or properties. | [WCAG 4.1.3](//www.w3.org/WAI/WCAG22/quickref#status-messages) | `html` | Manual testing |
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/extensions/extensions-data.json b/packages/documentation-site/patternfly-docs/content/extensions/landing-page/extensions-data.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/extensions/extensions-data.json
rename to packages/documentation-site/patternfly-docs/content/extensions/landing-page/extensions-data.json
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/extensions/extensions.md b/packages/documentation-site/patternfly-docs/content/extensions/landing-page/extensions.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/extensions/extensions.md
rename to packages/documentation-site/patternfly-docs/content/extensions/landing-page/extensions.md
index 45c010a2e2..b84972db39 100644
--- a/packages/documentation-site/patternfly-docs/pages/landing-pages/extensions/extensions.md
+++ b/packages/documentation-site/patternfly-docs/content/extensions/landing-page/extensions.md
@@ -1,6 +1,6 @@
 ---
-id: About extensions
-title: Extensions
+id: Overview
+title: Extensions overview
 section: extensions
 sortValue: 1
 ---
@@ -8,7 +8,7 @@ sortValue: 1
 import { SectionGallery } from '@patternfly/documentation-framework/components/sectionGallery/sectionGallery';
 import extensionsData from './extensions-data.json';
 
-# About 
+# Overview 
 
 Extensions are holistic solutions that utilize multiple PatternFly components, typically addressing cross-project use cases. They provide reusable code that can drive consistency throughout a user’s journey across products and platforms. We welcome ideas and contributions for new extensions from the PatternFly community and will prioritize those that can be widely used by multiple projects.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewer.png b/packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewer.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewer.png
rename to packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewer.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewerclear.png b/packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewerclear.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewerclear.png
rename to packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewerclear.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewercog.png b/packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewercog.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewercog.png
rename to packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewercog.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewerdark.png b/packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewerdark.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewerdark.png
rename to packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewerdark.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewersearch.png b/packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewersearch.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/img/logviewersearch.png
rename to packages/documentation-site/patternfly-docs/content/extensions/log-viewer/img/logviewersearch.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/log-viewer.md b/packages/documentation-site/patternfly-docs/content/extensions/log-viewer/log-viewer.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/extensions/log-viewer/log-viewer.md
rename to packages/documentation-site/patternfly-docs/content/extensions/log-viewer/log-viewer.md
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/about-tokens.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/about-tokens.md
similarity index 85%
rename from packages/documentation-site/patternfly-docs/content/tokens/about-tokens.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/about-tokens.md
index f3589ecb65..3a0ec27be8 100644
--- a/packages/documentation-site/patternfly-docs/content/tokens/about-tokens.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/about-tokens.md
@@ -1,13 +1,16 @@
 ---
-id: About tokens
-section: tokens
+id: Overview
+title: Design tokens overview
+section: foundations-and-styles
+subsection: design-tokens
+sortvalue: 1
 --- 
 
 **Design tokens** are variables that store visual design attributes like color, typography, and spacing. Tokens have a name and value that conveys their associated design style, making their purpose clear and recognizable.
 
-PatternFly's tokens are set up as variables and styles within Figma, and are available as CSS variables for development. Tokens are only available as part of the PatternFly 6 release, so make sure you [upgrade to PatternFly 6](/get-started/upgrade) and/or [install our Figma library](/get-started/design#figma-library) in order to take advantage of tokens. PatternFly 6 components, charts, and extensions are all built with tokens.
+PatternFly's tokens are set up as variables and styles within Figma, and are available as CSS variables for development. Tokens are only available as part of the PatternFly 6 release, so make sure you [upgrade to PatternFly 6](/releases/upgrade-guide) and/or [install our Figma library](/get-started/design#figma-library) in order to take advantage of tokens. PatternFly 6 components, charts, and extensions are all built with tokens.
 
-[View all PatternFly design tokens.](/tokens/all-patternfly-tokens)
+[View all design tokens.](/foundations-and-styles/design-tokens/all-patternfly-tokens)
 
 ## Why use tokens? 
 
@@ -22,7 +25,7 @@ Tokens also enable easier design system maintenance. Whenever a color is changed
 ## Token layers
 The PatternFly token system has 3 layers: palette tokens, base tokens, and semantic tokens. 
 
-* **Palette tokens** use [PatternFly color palettes](/design-foundations/colors#patternfly-palettes) to create a color foundation for other token layers to reference. 
+* **Palette tokens** use [PatternFly color palettes](/foundations-and-styles/colors#patternfly-palettes) to create a color foundation for other token layers to reference. 
 
 * **Base tokens** expand on the palette layer to apply PatternFly colors to concepts. They also introduce additional concepts, like spacing and borders. Base tokens are grouped conceptually and named numerically, with no duplicate values in a concept group.
 
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/design-with-tokens.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/design.md
similarity index 92%
rename from packages/documentation-site/patternfly-docs/content/tokens/design-with-tokens.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/design.md
index 4b59374083..649400b48c 100644
--- a/packages/documentation-site/patternfly-docs/content/tokens/design-with-tokens.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/design.md
@@ -1,15 +1,16 @@
 ---
 id: Design with tokens
-section: tokens
+section: foundations-and-styles
+subsection: design-tokens
 ---
 
-Tokens are only available as part of PatternFly 6. In order to make use of our token system, you will need to install the PatternFly 6 design kit [using our onboarding guide](/get-started/design) and make sure that your product is [upgraded to PatternFly 6](/get-started/upgrade). 
+Tokens are only available as part of PatternFly 6. In order to make use of our token system, you will need to install the PatternFly 6 design kit [using our onboarding guide](/get-started/design) and make sure that your product is [upgraded to PatternFly 6](/releases/upgrade-guide). 
 
 ## Using tokens in Figma
 
 Our tokens are set up as [variables](https://help.figma.com/hc/en-us/articles/15339657135383-Guide-to-variables-in-Figma) and [styles](https://help.figma.com/hc/en-us/articles/360039238753-Styles-in-Figma) in Figma, within our [Design Tokens and Styles Library](https://www.figma.com/@PatternFly). They define all of the design elements used in PatternFly, including color, font size, spacing, dimensions, and more.
 
-Figma tokens align with the segments in [our token variable structure](/tokens/about-tokens#token-names), but they use a forward slash (/) in place of a double hyphen (--).
+Figma tokens align with the segments in [our token variable structure](/foundations-and-styles/design-tokens/about-tokens#token-names), but they use a forward slash (/) in place of a double hyphen (--).
 
 ![Table of brand color tokens.](./img/token-example-brand.png)  
 
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/develop-with-tokens.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/develop.md
similarity index 90%
rename from packages/documentation-site/patternfly-docs/content/tokens/develop-with-tokens.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/develop.md
index 0c537dc286..7ce75ae5b0 100644
--- a/packages/documentation-site/patternfly-docs/content/tokens/develop-with-tokens.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/develop.md
@@ -1,6 +1,7 @@
 ---
 id: Develop with tokens
-section: tokens
+section: foundations-and-styles
+subsection: design-tokens
 ---
 
 ## Using tokens in code
@@ -11,19 +12,19 @@ Our tokens are named semantically, so that they're meaningful and better communi
 
 In the event that there isn't a semantic token that fits your use case, then you can use a base token instead, but do so sparingly. Do not use palette tokens. They are the foundation of our token system and there will always be a better base or semantic token to use.
 
-[View all PatternFly design tokens.](/tokens/all-patternfly-tokens)
+[View all design tokens.](/foundations-and-styles/design-tokens/all-patternfly-tokens)
 
 ### Dark theme support
 
 Our token system supports both light and dark themes by default. To enable dark theme, you just need to add the class `pf-[version]-theme-dark` (for example, `pf-v6-theme-dark`) to your application's `<html>` tag. Then, when dark theme is enabled, your product will automatically pull in dark theme tokens, in order to adapt visual styles appropriately.
 
-For more information, refer to our [dark theme handbook.](/design-foundations/theming/dark-theme-handbook) 
+For more information, refer to our [dark theme handbook.](/foundations-and-styles/theming/dark-theme-handbook) 
 
 ## Migrate to tokens
 
-To support tokens, PatternFly's global CSS variable system has been updated. Variable names have been updated across all PatternFly components and extensions. To migrate to our token system, you must [upgrade to PatternFly 6.](/get-started/upgrade)
+To support tokens, PatternFly's global CSS variable system has been updated. Variable names have been updated across all PatternFly components and extensions. To migrate to our token system, you must [upgrade to PatternFly 6.](/releases/upgrade-guide)
 
-If you make customizations to PatternFly components in your product, or use CSS overrides, you will need to manually update your CSS variable names to match an appropriate [semantic token](/tokens/all-patternfly-tokens). There is no one-to-one recommendation for any particular CSS variable, so you will need to choose the most appropriate token for your use case. 
+If you make customizations to PatternFly components in your product, or use CSS overrides, you will need to manually update your CSS variable names to match an appropriate [semantic token](/foundations-and-styles/design-tokens/all-patternfly-tokens). There is no one-to-one recommendation for any particular CSS variable, so you will need to choose the most appropriate token for your use case. 
 
 As you migrate and [select tokens](#selecting-tokens), refer to these recommendations and reminders:
 
@@ -31,7 +32,7 @@ As you migrate and [select tokens](#selecting-tokens), refer to these recommenda
 
 1. **Don’t start with the old value and work backwards.** For example, there are many things that are “blue” but it’s important to choose the right token for your purpose. In addition, PatternFly 6 has a completely new look&mdash;so what used to be “blue” might not be anymore!
 
-1. **Understand the naming layers for semantic tokens.** Remember [the structure of our token names:](/tokens/about-tokens#token-names) 
+1. **Understand the naming layers for semantic tokens.** Remember [the structure of our token names:](/foundations-and-styles/design-tokens/about-tokens#token-names) 
 `--pf-t--[scope]--[component]--[property]--[concept]--[variant]--[state]`
 
     For each segment, consider the following:
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/img/component-instance.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/component-instance.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/tokens/img/component-instance.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/component-instance.png
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/img/component-tokens.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/component-tokens.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/tokens/img/component-tokens.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/component-tokens.png
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/img/token-example-brand.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/token-example-brand.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/tokens/img/token-example-brand.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/token-example-brand.png
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/img/token-layers-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/token-layers-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/tokens/img/token-layers-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/token-layers-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/tokens/img/token-name.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/token-name.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/tokens/img/token-name.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/design-tokens/img/token-name.png
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/design-foundations/design-foundations-data.json b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/landing-page/design-foundations-data.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/design-foundations/design-foundations-data.json
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/landing-page/design-foundations-data.json
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/design-foundations/design-foundations.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/landing-page/design-foundations.md
similarity index 83%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/design-foundations/design-foundations.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/landing-page/design-foundations.md
index 1474536d34..296095097d 100644
--- a/packages/documentation-site/patternfly-docs/pages/landing-pages/design-foundations/design-foundations.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/landing-page/design-foundations.md
@@ -1,19 +1,19 @@
 ---
-id: About design foundations
-title: Design Foundations
-section: design-foundations
+id: Overview
+title: Foundations and styles overview
+section: foundations-and-styles
 sortValue: 1
 ---
 
 import { SectionGallery } from '@patternfly/documentation-framework/components/sectionGallery/sectionGallery';
 import designFoundationsData from './design-foundations-data.json';
 
-# About
+# Overview
 
 Our design foundations provide standards and guidance to help designers and developers work together more efficiently. They describe the visual language upon which all of our components are built and lay the groundwork for clear and consistent product experiences.
 
 <SectionGallery
-  section="design-foundations"
+  section="foundations-and-styles"
   galleryItemsData={designFoundationsData}
   placeholderText="Search design foundations by name"
   includeSubsections={true}
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/bullseye.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/bullseye.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/bullseye.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/bullseye.md
index bda2bc1316..a021efb514 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/bullseye.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/bullseye.md
@@ -1,6 +1,7 @@
 ---
 id: Bullseye
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 The **bullseye** layout centers content, both vertically and horizontally within a container.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/flex.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/flex.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/flex.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/flex.md
index 0b27b4622b..85d9e61c74 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/flex.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/flex.md
@@ -1,6 +1,7 @@
 ---
 id: Flex
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 
 The **flex** layout supports a completely custom layout by utilizing the PatternFly spacer and breakpoint systems. Flex layouts are infinitely nestable and allow you to adjust spacing, direction, alignment, justification, wrapping, and width to fit your needs.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/gallery.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/gallery.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/gallery.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/gallery.md
index 2d7f7bc798..a7fd701124 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/gallery.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/gallery.md
@@ -1,6 +1,7 @@
 ---
 id: Gallery
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 The **gallery** layout is used to arrange content in a responsive grid. Content will wrap responsively to create uniform rows and columns.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/grid.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/grid.md
similarity index 93%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/grid.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/grid.md
index 3f4d2a0983..857c603172 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/grid.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/grid.md
@@ -1,6 +1,7 @@
 ---
 id: Grid
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 The **grid** layout places content on a fixed 12 column grid.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/adjusted-grid-span.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/adjusted-grid-span.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/adjusted-grid-span.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/adjusted-grid-span.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/bullseye-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/bullseye-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/bullseye-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/bullseye-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/flex-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/flex-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/flex-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/flex-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/gallery-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/gallery-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/gallery-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/gallery-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/grid-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/grid-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/grid-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/grid-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/grid-gutters.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/grid-gutters.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/grid-gutters.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/grid-gutters.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/split-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/split-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/split-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/split-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/split-gutter.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/split-gutter.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/split-gutter.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/split-gutter.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/stack-example.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/stack-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/img/stack-example.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/img/stack-example.png
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/layouts/layouts-data.json b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/landing-page/layouts-data.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/layouts/layouts-data.json
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/landing-page/layouts-data.json
diff --git a/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/landing-page/layouts.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/landing-page/layouts.md
new file mode 100644
index 0000000000..2df2dc85de
--- /dev/null
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/landing-page/layouts.md
@@ -0,0 +1,26 @@
+---
+id: Overview
+title: Layouts overview
+section: foundations-and-styles
+subsection: layouts
+sortValue: 1
+---
+
+import { SectionGallery } from '@patternfly/documentation-framework/components/sectionGallery/sectionGallery';
+import layoutsData from './layouts-data.json';
+
+# Overview
+
+PatternFly’s layouts are used to place components on a page. They create a fully responsive structure to keep components organized and aligned across screen sizes. 
+
+Think of layouts as the scaffolding within which your components will live. When laying out your page, consider the layout pattern that suits your content. Multiple layouts can be used within the same page to create versatile and effective UIs. 
+
+<SectionGallery
+  section="foundations-and-styles"
+  subsection="layouts"
+  galleryItemsData={layoutsData}
+  placeholderText="Search layouts by name"
+  includeSubsections={true}
+  hasGridText={true}
+  isFullWidth={false}
+/>
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/level.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/level.md
similarity index 93%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/level.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/level.md
index 844e83a4c4..434fde541b 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/level.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/level.md
@@ -1,6 +1,7 @@
 ---
 id: Level
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 The **level** layout is designed to distribute space evenly between sections of content and center them horizontally. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/split.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/split.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/split.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/split.md
index 7da3b8efc6..83b8f64de5 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/split.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/split.md
@@ -1,6 +1,7 @@
 ---
 id: Split
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 
 The **split** layout positions items horizontally in a container, with one item filling the remaining horizontal space as the viewport is resized.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/stack.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/stack.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/stack.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/stack.md
index def417cc31..e7c564fa8d 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/layouts/stack.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/layouts/stack.md
@@ -1,6 +1,7 @@
 ---
 id: Stack
-section: layouts
+section: foundations-and-styles
+subsection: layouts
 ---
 The **stack** layout positions items vertically, with one or more items filling the available vertical space.
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/.gitignore b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/.gitignore
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/.gitignore
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/.gitignore
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/ColorFamily.js b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/ColorFamily.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/ColorFamily.js
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/ColorFamily.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/ColorSwatch.css b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/ColorSwatch.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/ColorSwatch.css
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/ColorSwatch.css
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/ColorSwatch.js b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/ColorSwatch.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/ColorSwatch.js
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/ColorSwatch.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/colors.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/colors.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/colors.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/colors.md
index 6bd861d40f..96a0b717c2 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/colors.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/colors.md
@@ -1,6 +1,6 @@
 ---
 id: Colors
-section: design-foundations
+section: foundations-and-styles
 ---
 import { Alert, Grid, GridItem, Banner, Button, Stack } from '@patternfly/react-core';
 import { Table, Caption, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
@@ -10,10 +10,10 @@ import { ColorFamily } from './ColorFamily';
 
 # PatternFly's palette
 
-Our color palettes align with <a href="https://www.redhat.com/en/about/brand/standards/color" target="_blank" alt="Red Hat brand colors"> Red Hat's brand colors </a> and are designed to reinforce content and support effective communication across different UI needs. Colors are applied to PatternFly elements using [semantic design tokens.](/tokens/about-tokens) This guide offers guidance for color use in some of the most common scenarios, but it does not cover all tokens. Additional color usage information is included in our tokens documentation.
+Our color palettes align with <a href="https://www.redhat.com/en/about/brand/standards/color" target="_blank" alt="Red Hat brand colors"> Red Hat's brand colors </a> and are designed to reinforce content and support effective communication across different UI needs. Colors are applied to PatternFly elements using [semantic design tokens.](/foundations-and-styles/design-tokens/about-tokens) This guide offers guidance for color use in some of the most common scenarios, but it does not cover all tokens. Additional color usage information is included in our tokens documentation.
 
 <div>
-<Button component="a" href="/tokens/all-patternfly-tokens" variant="link" isInline> View all PatternFly tokens <ArrowRightIcon />
+<Button component="a" href="/foundations-and-styles/design-tokens/all-patternfly-tokens" variant="link" isInline> View all design tokens <ArrowRightIcon />
 </Button>
 </div>
 
@@ -71,7 +71,7 @@ Background colors are used throughout components and, occasionally, for certain
 
 ## Text and icon colors
 
-Text and icon colors overlap, because they can be used inline with each other. Note that there are different tokens for standalone icons, inline icons, and standalone text. For more details view our [icons](/design-foundations/icons) and [typography](/design-foundations/typography) guidelines.
+Text and icon colors overlap, because they can be used inline with each other. Note that there are different tokens for standalone icons, inline icons, and standalone text. For more details view our [icons](/foundations-and-styles/iconography) and [typography](/foundations-and-styles/typography) guidelines.
 
 Text and icons can also display status information, which is covered in the [status and state colors section.](#status-and-state-colors)
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/helpers.js b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/helpers.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/helpers.js
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/helpers.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/background-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/background-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/background-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/background-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/brand-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/brand-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/brand-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/brand-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/danger-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/danger-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/danger-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/danger-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/disabled-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/disabled-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/disabled-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/disabled-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/nonstatus-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/nonstatus-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/nonstatus-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/nonstatus-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/primary-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/primary-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/primary-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/primary-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/success-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/success-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/success-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/success-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/text-icon-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/text-icon-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/text-icon-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/text-icon-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/warning-colors.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/warning-colors.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/colors/img/warning-colors.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/colors/img/warning-colors.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconsTable.js b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/IconsTable.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconsTable.js
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/IconsTable.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icon-alignment.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/icon-alignment.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icon-alignment.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/icon-alignment.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/iconography.md
similarity index 95%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/iconography.md
index 75d9a037dc..3b8ef89590 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/iconography.md
@@ -1,6 +1,6 @@
 ---
-id: Icons
-section: design-foundations
+id: Iconography
+section: foundations-and-styles
 ---
 import { Icon, Content, ContentVariants } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
@@ -65,7 +65,7 @@ Occasionally, you may need to use a standalone icon that isn't aligned with any
 Medium icons are typically the most versatile size to use in a UI. Most icons in PatternFly components are medium; other sizes are used sparingly.
 
 ## Icon colors
-All icon colors that you use should align with the proper [semantic design token.](/tokens/all-patternfly-tokens) For example, a warning icon should use our approved warning color, a danger icon should use our approved danger color, and so on. 
+All icon colors that you use should align with the proper [semantic design token.](/foundations-and-styles/design-tokens/all-patternfly-tokens) For example, a warning icon should use our approved warning color, a danger icon should use our approved danger color, and so on. 
 
 | **Icon state** | **Color token** | **Example** |
 | --- | --- | :---: |
@@ -75,7 +75,7 @@ All icon colors that you use should align with the proper [semantic design token
 | Info | `--pf-t--global--icon--color--status--info--default` | <Icon status="info" size="xl"><InfoCircleIcon /></Icon> |
 | Custom | `--pf-t--global--icon--color--status--custom--default` | <Icon status="custom" size="xl"><BellIcon /></Icon> |
 
-To learn more about icon colors and color tokens, visit our [colors page.](/design-foundations/colors) 
+To learn more about icon colors and color tokens, visit our [colors page.](/foundations-and-styles/colors) 
 
 ## PatternFly icons
 PatternFly uses custom icons and selections from <a href="https://fontawesome.com/icons?d=gallery&m=free">Font Awesome Free</a>, as shown in [this table](#all-icons). If PatternFly doesn't offer an icon for your use case, you can download SVGs of additional 'fa' icons from Font Awesome's free set. Be sure to properly attribute these additional icons as outlined on the Font Awesome site.
@@ -107,7 +107,7 @@ The Font Awesome icons included with PatternFly are Font Awesome solid (FAS) web
 
 The following table provides details and usage information for all icons that PatternFly supports.
 
-For guidance related to icon tooltips, [refer to our tooltips writing guide.](/ux-writing/tooltips#icon-tooltips)
+For guidance related to icon tooltips, [refer to our tooltips writing guide.](/content-design/tooltips#icon-tooltips)
 
 Select any single icon in the table to download it as an SVG. You can also download all icon SVGs <a href="https://github.com/patternfly/patternfly-design/raw/master/resources/patternfly-icon-svgs" target="_blank">on GitHub (via patternfly-icons.zip.)</a>
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.css b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/icons.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.css
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/icons.css
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.js b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/icons.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/icons.js
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/iconography/icons.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Animations.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Animations.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Animations.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Animations.md
index 389512da89..a6e293384a 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Animations.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Animations.md
@@ -1,6 +1,6 @@
 ---
 id: Motion
-section: design-foundations
+section: foundations-and-styles
 source: demo
 ---
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsCreateDatabaseForm.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsCreateDatabaseForm.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsCreateDatabaseForm.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsCreateDatabaseForm.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsEndTourModal.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsEndTourModal.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsEndTourModal.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsEndTourModal.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsHeaderToolbar.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsHeaderToolbar.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsHeaderToolbar.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsHeaderToolbar.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsNotificationsDrawer.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsNotificationsDrawer.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsNotificationsDrawer.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsNotificationsDrawer.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverview.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverview.tsx
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverview.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverview.tsx
index 2ee0655da4..cf7831f051 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverview.tsx
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverview.tsx
@@ -55,7 +55,7 @@ export const AnimationsOverview: FunctionComponent<AnimationsOverviewProps> = ({
       </CardBody>
       <CardFooter>
         <Button variant="link" icon={<ArrowRightIcon />} iconPosition="end" isInline>
-          <a href="https://www.patternfly.org/design-foundations/motion">They're everywhere</a>
+          <a href="https://www.patternfly.org/foundations-and-styles/styles/motion">They're everywhere</a>
         </Button>
       </CardFooter>
     </Card>,
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewCardStatus.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewCardStatus.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewCardStatus.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewCardStatus.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewClusterInventory.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewClusterInventory.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewClusterInventory.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewClusterInventory.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewEventsCard.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewEventsCard.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewEventsCard.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewEventsCard.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewMemoryUtilization.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewMemoryUtilization.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewMemoryUtilization.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewMemoryUtilization.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewNetworkActivity.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewNetworkActivity.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewNetworkActivity.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewNetworkActivity.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewStorage.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewStorage.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsOverviewStorage.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsOverviewStorage.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsStartTourModal.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsStartTourModal.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/AnimationsStartTourModal.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/AnimationsStartTourModal.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/GuidedTourContext.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/GuidedTourContext.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/GuidedTourContext.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/GuidedTourContext.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Spotlight.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Spotlight.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Spotlight.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Spotlight.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Summit-collage-deploying-openshift-product-icon-RH.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Summit-collage-deploying-openshift-product-icon-RH.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Summit-collage-deploying-openshift-product-icon-RH.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Summit-collage-deploying-openshift-product-icon-RH.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Summit-collage-hybrid-cloud-dark-RH.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Summit-collage-hybrid-cloud-dark-RH.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/Summit-collage-hybrid-cloud-dark-RH.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/Summit-collage-hybrid-cloud-dark-RH.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/examples/Animations.tsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/examples/Animations.tsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/examples/Animations.tsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/examples/Animations.tsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/examples/ResourceTableData.jsx b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/examples/ResourceTableData.jsx
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/examples/ResourceTableData.jsx
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/examples/ResourceTableData.jsx
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/types.ts b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/types.ts
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/Animations/types.ts
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/Animations/types.ts
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/declarations.d.ts b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/declarations.d.ts
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/declarations.d.ts
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/declarations.d.ts
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/declarations.js b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/declarations.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/declarations.js
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/declarations.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/declarations.ts b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/declarations.ts
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/declarations.ts
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/declarations.ts
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/motion-development.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/motion-development.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/motion-development.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/motion-development.md
index 48e4569efa..2dfe76418c 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/motion-development.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/motion-development.md
@@ -1,6 +1,6 @@
 ---
 id: Motion
-section: design-foundations
+section: foundations-and-styles
 source: development-guide
 ---
 
@@ -107,7 +107,7 @@ For some scenarios, like creating a new [PatternFly extension](/extensions/about
 
 PatternFly component animations are created using design tokens that specify duration, delay, and timing. We implement motion by using semantic tokens, which are built off of base tokens. Semantic motion tokens begin with `--pf-t--global--motion--`
 
-When implementing custom motion, you should [familiarize yourself with our token system](/tokens/about-tokens) and [use the motion tokens outlined in our documentation.](/tokens/all-patternfly-tokens)
+When implementing custom motion, you should [familiarize yourself with our token system](/foundations-and-styles/design-tokens/about-tokens) and [use the motion tokens outlined in our documentation.](/foundations-and-styles/design-tokens/all-patternfly-tokens)
 
 ### Duration 
 Duration tokens specify the length of time that different animation should take to complete. We offer predefined duration tokens based on each type of animation.
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/motion.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/motion.md
similarity index 93%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/motion.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/motion.md
index 25c459aa96..06640cb009 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/motion.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/motion.md
@@ -1,6 +1,6 @@
 ---
 id: Motion
-section: design-foundations
+section: foundations-and-styles
 source: about 
 ---
 
@@ -11,10 +11,10 @@ Like color or typography, **motion** can create a strong foundation that helps c
 
 This resource outlines our motion design principles and the different types of motion in PatternFly.
 
-For detailed guidance on implementing and customizing animations, refer to our [motion development guidelines](/design-foundations/motion/development-guide).
+For detailed guidance on implementing and customizing animations, refer to our [motion development guidelines](/foundations-and-styles/motion/development-guide).
 
 ## Principles 
-These principles guide the use of motion in PatternFly and align with our [brand voice and tone](/ux-writing/brand-voice-and-tone).
+These principles guide the use of motion in PatternFly and align with our [brand voice and tone](/content-design/brand-voice-and-tone).
 
 <Grid hasGutter>
 <GridItem span={6}>
@@ -59,7 +59,7 @@ These principles guide the use of motion in PatternFly and align with our [brand
 
 PatternFly components support motion in the form of **micro animations**, which are small, unobtrusive, and often understated. These animations serve specific purposes within a UI, and are designed to be subtle and complementary. To ensure an accessible experience, every animation adapts to and respects a user's system-level settings for reduced motion.
 
-While many components feature animations by default, there are [opt-in animations](/design-foundations/motion/development-guide#opt-in-animations) that require manual configuration. If you're interested in implementing motion outside of what we support by default, you can use [our motion tokens](/design-foundations/motion/development-guide#motion-tokens) to create a custom animation for your specific scenario. Take care to stay aligned with our motion principles. 
+While many components feature animations by default, there are [opt-in animations](/foundations-and-styles/motion/development-guide#opt-in-animations) that require manual configuration. If you're interested in implementing motion outside of what we support by default, you can use [our motion tokens](/foundations-and-styles/motion/development-guide#motion-tokens) to create a custom animation for your specific scenario. Take care to stay aligned with our motion principles. 
 
 ### Anatomy of an animation 
 An animation is composed of 4 elements: 
@@ -109,7 +109,7 @@ By managing how container components appear and disappear, container placement a
 This can be observed in the following components:
 
 - [Drawer:](/components/drawer) Slide in from edge of screen
-- [Menus:](/components/dropdown) Fade into position beside menu toggle
+- [Menus:](/components/menus/menu) Fade into position beside menu toggle
 
 #### Expansion 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/tsconfig.json b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/tsconfig.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/motion/tsconfig.json
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/motion/tsconfig.json
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/auto-layout-spacers.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/auto-layout-spacers.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/auto-layout-spacers.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/auto-layout-spacers.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/complex-text-spacing.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/complex-text-spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/complex-text-spacing.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/complex-text-spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/heading-body-spacing.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/heading-body-spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/heading-body-spacing.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/heading-body-spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/icon-spacing.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/icon-spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/icon-spacing.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/icon-spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/spacers.css b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/spacers.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/spacers.css
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/spacers.css
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/spacers.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/spacers.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/spacers.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/spacers.md
index 7dc58e65ef..fddd0f11aa 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/spacers/spacers.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/spacers/spacers.md
@@ -1,6 +1,6 @@
 ---
 id: Spacers
-section: design-foundations
+section: foundations-and-styles
 ---
 import './spacers.css';
 
@@ -41,7 +41,7 @@ Our spacer tokens are based on the values in the previous table, but there are c
   - **Inset spacer:** Used to define inner padding for structural elements in order to ensure proper alignment, like in the masthead, navigation menu, or the main page content area. 
     - Inset spacer tokens begin with `--pf-t--global--spacer--inset`
  
-You can search for spacer tokens in [our list of all tokens.](/tokens/all-patternfly-tokens)
+You can search for spacer tokens in [our list of all tokens.](/foundations-and-styles/design-tokens/all-patternfly-tokens)
 
 ## Considering line height and padding
 
@@ -57,7 +57,7 @@ For example, padding around this vertical ellipsis (or "kebab") icon increases t
 When laying out your design, make sure to account for this extra padding.
 
 ### Using spacers with text 
-When spacing out text-based content, use the standard [global spacer tokens.](/design-foundations/spacers#patternfly-spacers)
+When spacing out text-based content, use the standard [global spacer tokens.](/foundations-and-styles/spacers#patternfly-spacers)
 
 You should consider line height to ensure that you’re leaving the right amount of vertical space between each line of text:
 
@@ -67,4 +67,4 @@ You also need to use different spacer sizes depending on the type of text you’
 
 ![Different-sized spacers placed between heading, body, and list text](./complex-text-spacing.png)
 
-For more information about line height and text spacing, read our [typography guidelines.](/design-foundations/typography)
\ No newline at end of file
+For more information about line height and text spacing, read our [typography guidelines.](/foundations-and-styles/typography)
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/dark-theme-handbook.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/dark-theme-handbook.md
similarity index 88%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/dark-theme-handbook.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/dark-theme-handbook.md
index 84f272dfff..576fee549e 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/dark-theme-handbook.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/dark-theme-handbook.md
@@ -1,6 +1,6 @@
 ---
 id: Theming
-section: design-foundations
+section: foundations-and-styles
 source: dark-theme-handbook
 ---
 
@@ -24,7 +24,7 @@ To use charts with dark themes, refer to our guidance for [developing with chart
 
 To create images that adapt to light and dark themes, there are a few approaches you can take: 
 
-- Use inline SVG's with fill colors set to [PatternFly color tokens](/tokens/all-patternfly-tokens), which inherently adapt to light and dark themes.
+- Use inline SVG's with fill colors set to [PatternFly color tokens](/foundations-and-styles/design-tokens/all-patternfly-tokens), which inherently adapt to light and dark themes.
 - Create images with colors that work well with both light and dark themes. These colors should meet [WCAG AA contrast requirements](https://webaim.org/resources/contrastchecker/).
 - Utilize background color, border color, border-radius, and padding/spacing to create a container that can hold dynamic/user-supplied images.
 - Write CSS and dynamically swap between 2 image variations:
@@ -47,7 +47,7 @@ To create images that adapt to light and dark themes, there are a few approaches
 
 ## Best practices
 
-The most important step to ensure your application supports dark theme is to follow our [general theming best practices](/design-foundations/theming#best-practices). Adhering to these guidelines, especially by using design tokens instead of hard-coded values, will resolve most adoption challenges.
+The most important step to ensure your application supports dark theme is to follow our [general theming best practices](/foundations-and-styles/theming#best-practices). Adhering to these guidelines, especially by using design tokens instead of hard-coded values, will resolve most adoption challenges.
 
 Additionally, keep these key points in mind:
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/high-contrast-handbook.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/high-contrast-handbook.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/high-contrast-handbook.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/high-contrast-handbook.md
index 8a102a9e94..bd7c4f7589 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/high-contrast-handbook.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/high-contrast-handbook.md
@@ -1,6 +1,6 @@
 ---
 id: Theming
-section: design-foundations
+section: foundations-and-styles
 source: high-contrast-handbook
 ---
 
@@ -53,7 +53,7 @@ We also added the following tokens for plain actions (actions with a transparent
 
 ## Best practices
 
-In addition to the [general theming best practices](/design-foundations/theming#best-practices), ensure that you adhere to the following guidelines when working in high contrast mode.
+In addition to the [general theming best practices](/foundations-and-styles/theming#best-practices), ensure that you adhere to the following guidelines when working in high contrast mode.
 
 ### Color and contrast
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/img/components-dark.svg b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/img/components-dark.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/img/components-dark.svg
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/img/components-dark.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/img/components-light.svg b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/img/components-light.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/img/components-light.svg
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/img/components-light.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/theming.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/theming.md
similarity index 88%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/theming.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/theming.md
index 7d29c785a1..ba0d75a344 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/theming/theming.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/theming/theming.md
@@ -1,16 +1,16 @@
 ---
 id: Theming
-section: design-foundations
+section: foundations-and-styles
 source: about
 ---
 
-import '../../components/components.css'
+import '../../../components/components.css'
 import { Alert, AlertActionLink} from '@patternfly/react-core';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 
 A **theme** applies a specific visual style to all UI components in order to create a unique, cohesive, and purposeful look. The use of theming can provide more flexibility for user preferences, as well as different options for accessibility needs. 
 
-Theming is supported in PatternFly through [our design token system](/tokens/about-tokens), which was intentionally structured so that sets of tokens can be adjusted together to create alternate UI styles. By reassigning token values, the fonts, spacing, shadows, and borders in a UI can be changed together to create a theme. This system has enabled us to create multiple PatternFly themes, while also supporting the ability for you to create custom themes. 
+Theming is supported in PatternFly through [our design token system](/foundations-and-styles/design-tokens/about-tokens), which was intentionally structured so that sets of tokens can be adjusted together to create alternate UI styles. By reassigning token values, the fonts, spacing, shadows, and borders in a UI can be changed together to create a theme. This system has enabled us to create multiple PatternFly themes, while also supporting the ability for you to create custom themes. 
 
 ## PatternFly themes
 
@@ -28,7 +28,7 @@ Generally, light mode is the default appearance of PatternFly. In this mode, dar
 
 In dark mode, light text is presented on dark backgrounds backgrounds, and our color palette adapts to maintain a [text contrast ratio of at least 4.5:1](https://www.w3.org/WAI/WCAG22/quickref/?versions=2.1#contrast-minimum) and [non-text contrast ratio of at least 3:1](https://www.w3.org/WAI/WCAG22/quickref/?versions=2.1#non-text-contrast). Some users might prefer dark mode for aesthetics, while others find it to be easier on the eyes and less straining for those with light sensitivities. 
 
-For development guidance, refer to the [dark theme handbook](/design-foundations/theming/dark-theme-handbook).
+For development guidance, refer to the [dark theme handbook](/foundations-and-styles/theming/dark-theme-handbook).
 
 <div class="ws-docs-content-img" style="width:90%">
 ![A collage of multiple dark-themed PatternFly components, like a calendar, alert, and menu. The components have dark gray backgrounds and white text.](./img/components-dark.svg)
@@ -39,11 +39,6 @@ For development guidance, refer to the [dark theme handbook](/design-foundations
 <Alert 
 variant="info" 
 title="Beta feature"
-actionLinks={
-<AlertActionLink component="a" href="MEDIUM ARTICLE">
-Learn more
-</AlertActionLink>
-}
 >
 <p> High contrast mode is still under development and will continue to evolve and be enabled for charts and extensions. This beta allows you to preview our progress. </p>
 </Alert>
@@ -52,11 +47,11 @@ High contrast mode adjusts our default colors to meet an [enhanced contrast rati
 
 In high contrast mode, distinct borders are also added to components to ensure that their boundaries are clearly defined without requiring users to rely on subtle background colors as a visual cue. 
 
-For development guidance, refer to the [high contrast handbook](/design-foundations/theming/high-contrast-handbook).
+For development guidance, refer to the [high contrast handbook](/foundations-and-styles/theming/high-contrast-handbook).
 
 ## Custom themes 
 
-To branch off of our themes and create your own, you can identify the design tokens you'd like to adjust on our [all tokens page](/tokens/all-patternfly-tokens) and provide new values to use within your application. 
+To branch off of our themes and create your own, you can identify the design tokens you'd like to adjust on our [all tokens page](/foundations-and-styles/design-tokens/all-patternfly-tokens) and provide new values to use within your application. 
 
 ### When to customize a theme
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/line-height.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/line-height.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/line-height.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/line-height.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography.md
similarity index 98%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography.md
index ab134e9b84..8708a74938 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography.md
@@ -1,6 +1,6 @@
 ---
 id: Typography
-section: design-foundations
+section: foundations-and-styles
 ---
 
 import { Content, ContentVariants, Title } from '@patternfly/react-core';
@@ -90,7 +90,7 @@ Sometimes, numerals benefit from the use of a tabular font instead. **Tabular fo
 Tabular font styling is used in a couple of PatternFly components, including slider and progress, but we also offer a modifier that allows you to apply tabular styling on your own: `.pf-v6-m-tabular-nums`, which sets `font-variant-numeric: tabular-nums;`
 
 ## Line height and spacing
-The line height of your text impacts how you should use [spacers](/design-foundations/spacers) in your design. 
+The line height of your text impacts how you should use [spacers](/foundations-and-styles/spacers) in your design. 
 
 Your overall line height can be calculated by multiplying the font's built-in line height by the text size. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography_correct_spacing.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography_correct_spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography_correct_spacing.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography_correct_spacing.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography_incorrect_spacing.png b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography_incorrect_spacing.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/styles/typography/typography_incorrect_spacing.png
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/styles/typography/typography_incorrect_spacing.png
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/utility-classes/utility-classes-data.json b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/utility-classes/landing-page/utility-classes-data.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/utility-classes/utility-classes-data.json
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/utility-classes/landing-page/utility-classes-data.json
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/utility-classes/utility-classes.md b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/utility-classes/landing-page/utility-classes.md
similarity index 78%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/utility-classes/utility-classes.md
rename to packages/documentation-site/patternfly-docs/content/foundations-and-styles/utility-classes/landing-page/utility-classes.md
index d9330c87ce..b1f147e687 100644
--- a/packages/documentation-site/patternfly-docs/pages/landing-pages/utility-classes/utility-classes.md
+++ b/packages/documentation-site/patternfly-docs/content/foundations-and-styles/utility-classes/landing-page/utility-classes.md
@@ -1,21 +1,23 @@
 ---
-id: About utility classes
-title: Utility classes
-section: utility-classes
+id: Overview
+title: Utility classes overview
+section: foundations-and-styles
+subsection: utility-classes
 sortValue: 1
 ---
 
 import { SectionGallery } from '@patternfly/documentation-framework/components/sectionGallery/sectionGallery';
 import utilityClassesData from './utility-classes-data.json';
 
-# About
+# Overview
 
 PatternFly’s utility classes enable you to further customize and modify elements in your project without having to write any custom CSS.
 
 For example, you might use a utility class to add additional spacing between elements, align content in a layout, or add a box shadow to an element.
 
 <SectionGallery
-  section="utility-classes"
+  section="foundations-and-styles"
+  subsection="utility-classes"
   galleryItemsData={utilityClassesData}
   placeholderText="Search utility classes by name"
   includeSubsections={true}
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/contribute.md b/packages/documentation-site/patternfly-docs/content/get-started/contribute.md
deleted file mode 100644
index 32d1a14550..0000000000
--- a/packages/documentation-site/patternfly-docs/content/get-started/contribute.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-id: Contribute
-title: Contribute to PatternFly
-section: get-started
----
-
-## Community contributions 
-
-Thank you for your interest in contributing to PatternFly! We depend on community contributions to help our design system grow and evolve. We encourage everyone, regardless of background, to get involved. Common contributions include (but aren't limited to): 
-- New feature ideas. 
-- Bug reports.
-- Documentation updates.
-
-This guide outlines the ways that you can contribute to PatternFly's design, code, and documentation to help us stay on top of the latest and greatest solutions.
-
-If you have any ideas that don't fit into the projects outlined in this guide, please [reach out to us on Slack](https://patternfly.slack.com/archives/C293LQ36J).
-
-## Design
-
-If you have skills in visual and interaction design, you can contribute to PatternFly's design by taking an existing issue or proposing a new feature, enhancement, or icon. If you are interested in any of these projects, [reach out on the patternfly-design Slack channel.](http://join.slack.com/t/patternfly/shared_invite/zt-1npmqswgk-bF2R1E2rglV8jz5DNTezMQ)
-
-### Existing design issues 
-
-The PatternFly design team is composed of visual and interaction designers who define the look and feel of the PatternFly library. The team follows an agile framework, planning their work in sprints, with a backlog that is tracked and managed via [this GitHub project board.](https://github.com/orgs/patternfly/projects/7/views/30) This board contains a list issues that are currently unassigned and waiting in the queue. If you see something here that you'd like to work on, leave a comment on the issue and a member of our team will reach out with next steps.
-
-### New feature or enhancement
-If you have an idea for a new design pattern, a new component type, or an existing feature improvement, we'd love to hear it. [Start by opening an issue in the patternfly-design repository.](https://github.com/patternfly/patternfly-design/issues) From there, a member of our team will reach out and work with you to plan and design a solution.
-
-### New icons
-We encourage designers to work with [the existing PatternFly icon set](/design-foundations/icons), which covers most common use cases. If your use case isn't covered, you can propose a new icon.
-
-To contribute a new icon, [start by opening an issue in the patternfly-design repository](https://github.com/patternfly/patternfly-design/issues) that describes your idea and why it's needed. A member of our team will reach out to you to discuss next steps.
-
-## Code
-
-The primary PatternFly libraries include HTML/CSS (commonly called "core") and React. If you're looking to contribute to PatternFly's codebase, these libraries are a good place to start. You can help out by taking existing issues, or creating issues for bugs and other changes. 
-
-If you have any questions about these projects, you can reach out to us on our [patternfly-core](https://patternfly.slack.com/archives/C9Q224EFL) and [patternfly-react](https://patternfly.slack.com/archives/C4FM977N0) Slack channels.
-
-### Existing development issues 
-
-To find work that has been approved, but not started, you can view open issues in our [patternfly](https://github.com/patternfly/patternfly/issues) (HTML/CSS) and [patternfly-react](https://github.com/patternfly/patternfly-react/issues) (React) repositories. If you find an issue that you'd like to work on, leave a comment and someone from our team will reach out to you with next steps. 
-
-Be sure to view our detailed contribution instructions for both of these repositories:
-- [Core contribution guidelines](https://github.com/patternfly/patternfly#guidelines-for-css-development)
-- [React contribution guidelines](https://github.com/patternfly/patternfly-react/blob/main/CONTRIBUTING.md#contribution-process)
-
-### Bug reports
-
-If you believe that you've come across a PatternFly bug, alert our team, so that we can resolve the issue. To report a bug, follow these steps:
-
-1. View the documentation for the feature, to confirm that the behavior is not functioning as intended. 
-1. Search open issues in the [patternfly](https://github.com/patternfly/patternfly/issues) and [patternfly-react](https://github.com/patternfly/patternfly-react/issues) repositories to see if a related issue already exists.
-    - If the bug is present in only the React implementation of PatternFly, [create a bug issue in patternfly-react.](https://github.com/patternfly/patternfly-react/issues)
-    - If the bug can be seen on both the React and HTML/CSS side, [create a bug issue in patternfly](https://github.com/patternfly/patternfly/issues).
-1. Be sure to mention which project the bug was noticed in and if there is a deadline that the fix is needed for.
-
-### AI-assisted development guidelines
-
-AI-generated code can be accepted as a contribution to this project as long as the contributor adheres to the following guidance.
-
-When using AI coding assistants (such as GitHub Copilot, ChatGPT, Claude, or other similar tools) to help with development work on PatternFly React, please follow these guidelines to ensure code quality, security, and transparency:
-
-1. **Verify and validate AI-generated code.**
-
-    - **Treat AI-generated code as suggestions, not final code.** Review all generated code and modify as appropriate. Thoroughly review and test all code that you intend to integrate into your work.
-
-    - **Do not automatically trust the code assistant output.** Always apply your own judgment and expertise. AI coding assistants can introduce security vulnerabilities if not used carefully, and AI models can sometimes hallucinate and provide incorrect or non-functional code.
-
-    - **Make sure you thoroughly understand any AI-generated code.** If the generated code you intend to incorporate in your work is outside your expertise, consult with someone knowledgeable in the area prior to making it available to others.
-
-1. **Mark any substantial AI-generated code portions.**
-
-        - Nontrivial and substantial AI-generated or AI-assisted content should be "marked", using one of the following approaches:
-
-          - **In a commit message, or in a pull request/merge request description field:** Identify the code assistant that you used, perhaps elaborating on how it was used. You might also use a trailer like "Assisted-by:" or "Generated-by:". For example:
-
-            ```
-            Assisted-by: GitHub Copilot
-            Generated-by: ChatGPT for initial component structure
-            ```
-
-          - **In a source file comment:** Indicate the use of the code assistant. For example:
-
-            ```javascript
-            // Generated by GitHub Copilot
-            // AI-assisted implementation with human review and modifications
-            ```
-
-1. **Review security:** Pay special attention to security implications of AI-generated code, especially when dealing with user input, authentication, or data handling.
-1. **Test your code:** Ensure that AI-generated code is thoroughly tested and meets all existing project standards for testing coverage.
-1. **Review code style:** Verify that AI-generated code follows PatternFly React's coding standards and style guidelines as outlined in this document.
-1. **Review documentation:** If AI assists in generating documentation or comments, review them for accuracy and completeness.
-## Documentation 
-
-Across our website, you can find PatternFly documentation that explains concepts, provides guidance, and outlines important resources for PatternFly users. Our documentation can always be improved, and we love to hear input from the people who use it.
-
-If you'd like to contribute to documentation, you can refer to our [detailed contribution instructions](https://github.com/patternfly/patternfly-org/wiki/Contributing-to-patternfly-org-for-designers) for additional guidance.
-
-### Existing documentation issues
-
-Our website documentation is contained in the [patternfly-org repository](https://github.com/patternfly/patternfly-org). If you find an issue that you'd like to work on, leave a comment and someone from our team will reach out to you with next steps. 
-
-### Design guidelines
-Our design guidelines are found across our component, layout, chart, and pattern web pages. These guides clarify usage details to help designers follow best practices to create strong UI solutions.
-
-If you'd like to contribute to our design guidelines, you can open an issue in [patternfly-org](https://github.com/patternfly/patternfly-org) to propose a new page or updates to an existing page. From there, our team will work with you to author and publish your new content. 
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/design-with-figma.md b/packages/documentation-site/patternfly-docs/content/get-started/design-with-figma.md
index c9a6dbb254..59e7f3482c 100755
--- a/packages/documentation-site/patternfly-docs/content/get-started/design-with-figma.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/design-with-figma.md
@@ -18,7 +18,7 @@ To start designing with PatternFly, you will need to install our PatternFly 6 de
   <Button component="a" href='https://www.figma.com/@patternfly' target="_blank" variant='primary' size='lg' > Install the PatternFly 6 design kit <ArrowRightIcon /> </Button>
 </div>
 
-In order to use PatternFly 6, your product *must* be using the PatternFly 6 design kit. If you haven't yet, you can [follow our upgrade guide](/get-started/upgrade) to complete your upgrade. Doing so also ensures that you'll have access to the most current PatternFly features, resources, and guidance going forward! 
+In order to use PatternFly 6, your product *must* be using the PatternFly 6 design kit. If you haven't yet, you can [follow our upgrade guide](/releases/upgrade-guide) to complete your upgrade. Doing so also ensures that you'll have access to the most current PatternFly features, resources, and guidance going forward! 
 
 If you have questions about the kit, or have trouble with installation, [refer to our help section](#get-help) or [reach out to us on Slack](http://join.slack.com/t/patternfly/shared_invite/zt-1npmqswgk-bF2R1E2rglV8jz5DNTezMQ).
 
@@ -28,7 +28,7 @@ To install the fonts that PatternFly uses, [download this GitHub repository](htt
 
 ### Design tokens
 
-PatternFly 6 is built off of our new design token system. For more background and instructions regarding our token system, [check out our tokens documentation.](/tokens/about-tokens)
+PatternFly 6 is built off of our new design token system. For more background and instructions regarding our token system, [check out our tokens documentation.](/foundations-and-styles/design-tokens/about-tokens)
 
 ## What's in the design kit? 
 
@@ -43,7 +43,7 @@ After you install the PatternFly 6 Figma workspace, you will find a welcome page
 
 Once you're familiar with the kit you're ready to start designing! 
 
-If you're completely new to PatternFly, you should also first [read this overview of our design system](/get-started/about-patternfly), to learn about everything that PatternFly has to offer and get to know who we are.
+If you're completely new to PatternFly, you should also first [read this overview of our design system](/about-us), to learn about everything that PatternFly has to offer and get to know who we are.
 
 ## How do I stay up to date?
 
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/develop.md b/packages/documentation-site/patternfly-docs/content/get-started/develop.md
index 3bced63390..a1b4fd0e7d 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/develop.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/develop.md
@@ -10,9 +10,9 @@ import {Alert} from '@patternfly/react-core';
 
 In order to develop with PatternFly, you will need to:
 
-1. [Learn about the PatternFly design system](/get-started/about-patternfly) to get acquainted with all of its elements.
+1. [Learn about the PatternFly design system](/about-us) to get acquainted with all of its elements.
 
-1. [Learn about our design token system](/tokens/about-tokens), which enables you to build interfaces with consistent PatternFly styling, including colors, shadows, spacing, and more.
+1. [Learn about our design token system](/foundations-and-styles/design-tokens/about-tokens), which enables you to build interfaces with consistent PatternFly styling, including colors, shadows, spacing, and more.
 
 1. Install a package manager to help you install, update, and configure all necessary PatternFly packages. We recommend [npm](https://nodejs.org/en/download) or [Yarn](https://yarnpkg.com/getting-started).
 
@@ -34,7 +34,7 @@ PatternFly supports the 2 most recent versions of React at a time. PatternFly 6
 * [@patternfly/react-table](https://www.npmjs.com/package/@patternfly/react-table): PatternFly table components.
 * [@patternfly/react-tokens](https://www.npmjs.com/package/@patternfly/react-tokens): PatternFly's CSS variables, transformed into JavaScript objects for use with React.
 
-These packages are maintained together. To determine which versions of each package are compatible with the rest, view our [release highlights](https://www.patternfly.org/get-started/release-highlights).
+These packages are maintained together. To determine which versions of each package are compatible with the rest, view our [release highlights](https://www.patternfly.org/releases/release-highlights).
 
 We support the following configurations:
 * [TypeScript](https://github.com/patternfly/patternfly-react-seed/blob/master/tsconfig.json)
@@ -132,7 +132,7 @@ PatternFly uses [Font Awesome 5](https://fontawesome.com/), which can be utilize
 
 ## Testing
 
-Many PatternFly components comply with the Open UI Automation (OUIA) guidelines, which are designed to ease the burden of creating and maintaining automated testing environments.  Additional details about OUIA and the full list of compliant components [can be found in our developer resources.](/developer-resources/open-ui-automation)
+Many PatternFly components comply with the Open UI Automation (OUIA) guidelines, which are designed to ease the burden of creating and maintaining automated testing environments.  Additional details about OUIA and the full list of compliant components [can be found in our developer resources.](/developer-guides/open-ui-automation)
 
 ## Supported browsers and operating systems
 
diff --git a/packages/documentation-site/patternfly-docs/content/training/copyCodeBlock/copyCodeBlock.js b/packages/documentation-site/patternfly-docs/content/get-started/training/copyCodeBlock/copyCodeBlock.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/copyCodeBlock/copyCodeBlock.js
rename to packages/documentation-site/patternfly-docs/content/get-started/training/copyCodeBlock/copyCodeBlock.js
diff --git a/packages/documentation-site/patternfly-docs/content/training/html-css/css-variables-and-overrides.md b/packages/documentation-site/patternfly-docs/content/get-started/training/html-css/css-variables-and-overrides.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/training/html-css/css-variables-and-overrides.md
rename to packages/documentation-site/patternfly-docs/content/get-started/training/html-css/css-variables-and-overrides.md
index bb5ecb057f..d7e1e582e3 100644
--- a/packages/documentation-site/patternfly-docs/content/training/html-css/css-variables-and-overrides.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/training/html-css/css-variables-and-overrides.md
@@ -1,6 +1,6 @@
 ---
 id: HTML CSS variables and overrides training
-section: training
+section: get-started
 hideNavItem: true
 ---
 import { Button, ClipboardCopy, Divider, PageSection } from '@patternfly/react-core';
@@ -57,7 +57,7 @@ Add the property that is being modified. In this case, modify the color property
 The custom property name should now be: `--pf-v6-c-alert--m-success__title--Color`
 
 #### Step 2.5 
-Define the value of the component-level CSS variable. PatternFly's global danger color is: `--pf-v6-global--danger-color--100`. You can reference PatternFly’s <a href="/design-foundations/colors" target="_blank">global colors documentation</a> for more information.
+Define the value of the component-level CSS variable. PatternFly's global danger color is: `--pf-v6-global--danger-color--100`. You can reference PatternFly’s <a href="/foundations-and-styles/colors" target="_blank">global colors documentation</a> for more information.
 
 Assign the custom property name `(--pf-v6-c-alert--m-success__title--Color)` that is already inside the `.pf-v6-c-alert{}` block to the global danger color.
 
@@ -151,7 +151,7 @@ Add the property being applied to the badge after the element.
 It should look like this: `--pf-v6-c-label__badge--MarginRight`
 
 #### Step 2.4 
-Define the value of the new custom CSS variable. PatternFly's global variable for 8px of space is `--pf-v6-global--spacer--sm`. You can reference <a href="/design-foundations/spacers" target="_blank">PatternFly’s documentation about spacers</a> for more information.
+Define the value of the new custom CSS variable. PatternFly's global variable for 8px of space is `--pf-v6-global--spacer--sm`. You can reference <a href="/foundations-and-styles/spacers" target="_blank">PatternFly’s documentation about spacers</a> for more information.
 
 Assign the custom property name `--pf-v6-c-label__badge--MarginRight` that is already inside of the `.pf-v6-c-label{}` block to the global variable for 8px of space.
 
@@ -169,7 +169,7 @@ It should look like this: `margin-right: var(--pf-v6-c-label__badge--MarginRight
 ## Part 4: Create and use global CSS variables to override PatternFly styles
 To explore this concept, create a new global custom property for a 5xl font size. Use this new global property to make a new variation of the title component using the provided CodeSandbox for part 4.
 
-Referencing <a href="/design-foundations/typography" target="_blank">PatternFly's typography design guidelines</a>, the largest font size PatternFly offers is a "super hero heading" size. It is 36px represented by the global variable `pf-v6-global--FontSize--4xl`. Assume that there is a need for a larger font size for the title component that is used across the entire application.
+Referencing <a href="/foundations-and-styles/typography" target="_blank">PatternFly's typography design guidelines</a>, the largest font size PatternFly offers is a "super hero heading" size. It is 36px represented by the global variable `pf-v6-global--FontSize--4xl`. Assume that there is a need for a larger font size for the title component that is used across the entire application.
 
 <Button variant="primary" component="a" href="https://codesandbox.io/s/creating-new-global-css-vars-start-cqb8nw" target="_blank">Codesandbox - Part 4</Button>
 
diff --git a/packages/documentation-site/patternfly-docs/content/training/html-css/fundamentals.md b/packages/documentation-site/patternfly-docs/content/get-started/training/html-css/fundamentals.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/training/html-css/fundamentals.md
rename to packages/documentation-site/patternfly-docs/content/get-started/training/html-css/fundamentals.md
index 658885f1e9..3e66ef6ad7 100644
--- a/packages/documentation-site/patternfly-docs/content/training/html-css/fundamentals.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/training/html-css/fundamentals.md
@@ -1,6 +1,6 @@
 ---
 id: HTML fundamentals training
-section: training
+section: get-started
 hideNavItem: true
 ---
 import { Button, ClipboardCopy, Divider, PageSection } from '@patternfly/react-core';
diff --git a/packages/documentation-site/patternfly-docs/content/training/html.md b/packages/documentation-site/patternfly-docs/content/get-started/training/html.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/content/training/html.md
rename to packages/documentation-site/patternfly-docs/content/get-started/training/html.md
index edb138088f..787e860f97 100644
--- a/packages/documentation-site/patternfly-docs/content/training/html.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/training/html.md
@@ -1,6 +1,7 @@
 ---
 id: HTML
-section: training
+section: get-started
+subsection: training
 ---
 
 import { Gallery, GalleryItem } from '@patternfly/react-core';
diff --git a/packages/documentation-site/patternfly-docs/content/training/img/alert-red-title.png b/packages/documentation-site/patternfly-docs/content/get-started/training/img/alert-red-title.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/img/alert-red-title.png
rename to packages/documentation-site/patternfly-docs/content/get-started/training/img/alert-red-title.png
diff --git a/packages/documentation-site/patternfly-docs/content/training/img/basic-card.png b/packages/documentation-site/patternfly-docs/content/get-started/training/img/basic-card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/img/basic-card.png
rename to packages/documentation-site/patternfly-docs/content/get-started/training/img/basic-card.png
diff --git a/packages/documentation-site/patternfly-docs/content/training/img/card-layout.png b/packages/documentation-site/patternfly-docs/content/get-started/training/img/card-layout.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/img/card-layout.png
rename to packages/documentation-site/patternfly-docs/content/get-started/training/img/card-layout.png
diff --git a/packages/documentation-site/patternfly-docs/content/training/img/chip.png b/packages/documentation-site/patternfly-docs/content/get-started/training/img/chip.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/img/chip.png
rename to packages/documentation-site/patternfly-docs/content/get-started/training/img/chip.png
diff --git a/packages/documentation-site/patternfly-docs/content/training/img/global-link-color-red.png b/packages/documentation-site/patternfly-docs/content/get-started/training/img/global-link-color-red.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/img/global-link-color-red.png
rename to packages/documentation-site/patternfly-docs/content/get-started/training/img/global-link-color-red.png
diff --git a/packages/documentation-site/patternfly-docs/content/training/react.md b/packages/documentation-site/patternfly-docs/content/get-started/training/react.md
similarity index 87%
rename from packages/documentation-site/patternfly-docs/content/training/react.md
rename to packages/documentation-site/patternfly-docs/content/get-started/training/react.md
index 497ad17e84..69ff0ebf33 100644
--- a/packages/documentation-site/patternfly-docs/content/training/react.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/training/react.md
@@ -1,6 +1,7 @@
 ---
 id: React
-section: training
+section: get-started
+subsection: training
 ---
 
 import { TrainingCard } from './trainingCard/trainingCard';
diff --git a/packages/documentation-site/patternfly-docs/content/training/react/fundamentals.md b/packages/documentation-site/patternfly-docs/content/get-started/training/react/fundamentals.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/training/react/fundamentals.md
rename to packages/documentation-site/patternfly-docs/content/get-started/training/react/fundamentals.md
index 650e176d4f..358666bb27 100644
--- a/packages/documentation-site/patternfly-docs/content/training/react/fundamentals.md
+++ b/packages/documentation-site/patternfly-docs/content/get-started/training/react/fundamentals.md
@@ -1,6 +1,6 @@
 ---
 id: React fundamentals training
-section: training
+section: get-started
 hideNavItem: true
 ---
 
diff --git a/packages/documentation-site/patternfly-docs/content/training/trainingCard/trainingCard.js b/packages/documentation-site/patternfly-docs/content/get-started/training/trainingCard/trainingCard.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/training/trainingCard/trainingCard.js
rename to packages/documentation-site/patternfly-docs/content/get-started/training/trainingCard/trainingCard.js
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/actions.md b/packages/documentation-site/patternfly-docs/content/patterns/actions/actions.md
similarity index 96%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/actions.md
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/actions.md
index b588e17ded..085635d1b6 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/actions.md
+++ b/packages/documentation-site/patternfly-docs/content/patterns/actions/actions.md
@@ -20,7 +20,7 @@ The following image of a card view demonstrates some of the more common uses of
 
 Use actions to make it clear and convenient for users to complete tasks in a UI. When applied intentionally, actions can make the UI more efficient and effective. 
 
-When labeling or referring to actions in your UI, make sure that you adhere to our [terminology guidelines](/ux-writing/terminology) and align any icons you use with the usage behavior outlined in our [icon design foundations.](/design-foundations/icons#all-icons) 
+When labeling or referring to actions in your UI, make sure that you adhere to our [terminology guidelines](/content-design/terminology) and align any icons you use with the usage behavior outlined in our [icon design foundations.](/foundations-and-styles/iconography#all-icons) 
 
 ### Deletion vs removal 
 Make sure that users understand the purpose and consequences of deleting or removing data objects, items, or similar resources via the UI. Deleting is different from removing. 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/actions-pattern.png b/packages/documentation-site/patternfly-docs/content/patterns/actions/img/actions-pattern.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/actions-pattern.png
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/img/actions-pattern.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/component-actions-dropdown.png b/packages/documentation-site/patternfly-docs/content/patterns/actions/img/component-actions-dropdown.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/component-actions-dropdown.png
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/img/component-actions-dropdown.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/critical-deletion-modal.png b/packages/documentation-site/patternfly-docs/content/patterns/actions/img/critical-deletion-modal.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/critical-deletion-modal.png
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/img/critical-deletion-modal.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/critical-deletion-success.png b/packages/documentation-site/patternfly-docs/content/patterns/actions/img/critical-deletion-success.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/critical-deletion-success.png
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/img/critical-deletion-success.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/page-actions-primary.png b/packages/documentation-site/patternfly-docs/content/patterns/actions/img/page-actions-primary.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/page-actions-primary.png
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/img/page-actions-primary.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/page-actions-secondary.png b/packages/documentation-site/patternfly-docs/content/patterns/actions/img/page-actions-secondary.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/actions/img/page-actions-secondary.png
rename to packages/documentation-site/patternfly-docs/content/patterns/actions/img/page-actions-secondary.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/bulk-selection.md b/packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/bulk-selection.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/bulk-selection.md
rename to packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/bulk-selection.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-select-checkbox.png b/packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-select-checkbox.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-select-checkbox.png
rename to packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-select-checkbox.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-selection-example.png b/packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-selection-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-selection-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-selection-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-selection-no-toolbar.png b/packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-selection-no-toolbar.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-selection-no-toolbar.png
rename to packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-selection-no-toolbar.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-selector.png b/packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-selector.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/bulk-selection/img/bulk-selector.png
rename to packages/documentation-site/patternfly-docs/content/patterns/bulk-selection/img/bulk-selector.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/card-view.md b/packages/documentation-site/patternfly-docs/content/patterns/card-view/card-view.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/card-view.md
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/card-view.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/add-card-empty-state.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/add-card-empty-state.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/add-card-empty-state.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/add-card-empty-state.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card-images.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card-images.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card-images.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card-images.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card-view-sticky-toolbar.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card-view-sticky-toolbar.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card-view-sticky-toolbar.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card-view-sticky-toolbar.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card-view.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card-view.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/card.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/card.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-add-emptystate.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-add-emptystate.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-add-emptystate.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-add-emptystate.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-globalactions.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-globalactions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-globalactions.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-globalactions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-graybackground.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-graybackground.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-graybackground.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-graybackground.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-inlineactions.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-inlineactions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-inlineactions.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-inlineactions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-mobile.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-mobile.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-mobile.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-mobile.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-multipleinline.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-multipleinline.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-multipleinline.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-multipleinline.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-stickytoolbar.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-stickytoolbar.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-stickytoolbar.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-stickytoolbar.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-whitebackground.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-whitebackground.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/cardview-whitebackground.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/cardview-whitebackground.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/collapse_all.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/collapse_all.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/collapse_all.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/collapse_all.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/expand_all.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/expand_all.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/expand_all.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/expand_all.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/few-multiple-actions.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/few-multiple-actions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/few-multiple-actions.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/few-multiple-actions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/global-actions.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/global-actions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/global-actions.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/global-actions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/gray-background.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/gray-background.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/gray-background.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/gray-background.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/inline-actions.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/inline-actions.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/inline-actions.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/inline-actions.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/mobile-cards.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/mobile-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/mobile-cards.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/mobile-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/multiple-inline.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/multiple-inline.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/multiple-inline.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/multiple-inline.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/white-background.png b/packages/documentation-site/patternfly-docs/content/patterns/card-view/img/white-background.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/card-view/img/white-background.png
rename to packages/documentation-site/patternfly-docs/content/patterns/card-view/img/white-background.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/dashboard.md b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/dashboard.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/dashboard.md
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/dashboard.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/aggregate-status-cards.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/aggregate-status-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/aggregate-status-cards.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/aggregate-status-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/capacity-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/capacity-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/capacity-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/capacity-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/consumers-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/consumers-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/consumers-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/consumers-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashbar.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashbar.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashbar.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashbar.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-4-column.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-4-column.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-4-column.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-4-column.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-example-final.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-example-final.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-example-final.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-example-final.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-first-cut.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-first-cut.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-first-cut.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-first-cut.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-iterations.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-iterations.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-iterations.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-iterations.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-view-desktop.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-view-desktop.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-view-desktop.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-view-desktop.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-what-to-avoid.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-what-to-avoid.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/dashboard-what-to-avoid.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/dashboard-what-to-avoid.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/details-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/details-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/details-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/details-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/details-card.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/details-card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/details-card.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/details-card.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/events-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/events-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/events-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/events-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/events-card.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/events-card.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/events-card.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/events-card.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/health-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/health-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/health-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/health-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/inventory-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/inventory-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/inventory-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/inventory-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/performance-card-example.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/performance-card-example.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/performance-card-example.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/performance-card-example.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/trend-card-multiple.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/trend-card-multiple.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/trend-card-multiple.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/trend-card-multiple.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/trend-cards.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/trend-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/trend-cards.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/trend-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/utilization-cards.png b/packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/utilization-cards.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/dashboard/img/utilization-cards.png
rename to packages/documentation-site/patternfly-docs/content/patterns/dashboard/img/utilization-cards.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/empty-state/img/access-denied.jpg b/packages/documentation-site/patternfly-docs/content/patterns/empty-state/img/access-denied.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/empty-state/img/access-denied.jpg
rename to packages/documentation-site/patternfly-docs/content/patterns/empty-state/img/access-denied.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/empty-state/img/add.png b/packages/documentation-site/patternfly-docs/content/patterns/empty-state/img/add.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/empty-state/img/add.png
rename to packages/documentation-site/patternfly-docs/content/patterns/empty-state/img/add.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/empty-state/img/level-of-detail.jpg b/packages/documentation-site/patternfly-docs/content/patterns/empty-state/img/level-of-detail.jpg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/empty-state/img/level-of-detail.jpg
rename to packages/documentation-site/patternfly-docs/content/patterns/empty-state/img/level-of-detail.jpg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/filters.md b/packages/documentation-site/patternfly-docs/content/patterns/filters/filters.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/filters.md
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/filters.md
index a6adf7be58..6b99e63925 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/filters.md
+++ b/packages/documentation-site/patternfly-docs/content/patterns/filters/filters.md
@@ -143,7 +143,7 @@ Since you can only search by 1 value at a time, the value will already be shown
 </div>
 
 ### Single select
-A single select provides the user with a fixed set of values from which they can only select 1 value. This filter type uses the [single select component](/components/select/react#single). 
+A single select provides the user with a fixed set of values from which they can only select 1 value. This filter type uses the [single select component](/components/menus/select/react#single). 
 
 If the single select filter is the only filter in the toolbar, it should have an “All options” menu item that's selected by default, acting as an equivalent of no filter selected. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-a.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-a.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-a.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-a.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-b.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-b.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-b.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-b.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-c.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-c.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-c.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-c.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-d.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-d.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-d.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-d.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-filter-table.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-filter-table.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/attribute-filter-table.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/attribute-filter-table.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/badge-count.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/badge-count.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/badge-count.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/badge-count.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/checkbox-select-menus.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/checkbox-select-menus.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/checkbox-select-menus.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/checkbox-select-menus.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/checkbox-select.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/checkbox-select.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/checkbox-select.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/checkbox-select.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/faceted-filter-collapsed.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/faceted-filter-collapsed.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/faceted-filter-collapsed.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/faceted-filter-collapsed.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/faceted-filter.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/faceted-filter.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/faceted-filter.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/faceted-filter.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-error.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-error.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-error.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-error.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-group-data-list.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-group-data-list.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-group-data-list.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-group-data-list.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-group-multiple.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-group-multiple.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-group-multiple.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-group-multiple.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-group-single.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-group-single.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-group-single.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-group-single.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-label.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-label.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/filter-label.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/filter-label.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/mobile-after.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/mobile-after.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/mobile-after.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/mobile-after.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/mobile-before.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/mobile-before.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/mobile-before.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/mobile-before.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/search-value.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/search-value.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/search-value.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/search-value.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/single-select-default.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/single-select-default.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/single-select-default.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/single-select-default.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/single-select-selection-mode.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/single-select-selection-mode.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/single-select-selection-mode.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/single-select-selection-mode.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/text-entry-filters.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/text-entry-filters.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/text-entry-filters.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/text-entry-filters.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/toggle-filter.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/toggle-filter.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/toggle-filter.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/toggle-filter.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/typeahead-input.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/typeahead-input.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/typeahead-input.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/typeahead-input.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/typeahead-search.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/typeahead-search.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/typeahead-search.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/typeahead-search.svg
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/typeahead.svg b/packages/documentation-site/patternfly-docs/content/patterns/filters/img/typeahead.svg
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/filters/img/typeahead.svg
rename to packages/documentation-site/patternfly-docs/content/patterns/filters/img/typeahead.svg
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/patterns/patterns-data.json b/packages/documentation-site/patternfly-docs/content/patterns/landing-page/patterns-data.json
similarity index 100%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/patterns/patterns-data.json
rename to packages/documentation-site/patternfly-docs/content/patterns/landing-page/patterns-data.json
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/patterns/patterns.md b/packages/documentation-site/patternfly-docs/content/patterns/landing-page/patterns.md
similarity index 94%
rename from packages/documentation-site/patternfly-docs/pages/landing-pages/patterns/patterns.md
rename to packages/documentation-site/patternfly-docs/content/patterns/landing-page/patterns.md
index 1ccc21473d..27fb2c7d8a 100644
--- a/packages/documentation-site/patternfly-docs/pages/landing-pages/patterns/patterns.md
+++ b/packages/documentation-site/patternfly-docs/content/patterns/landing-page/patterns.md
@@ -1,6 +1,6 @@
 ---
-id: About patterns
-title: Patterns
+id: Overview
+title: Patterns overview
 section: patterns
 sortValue: 1
 ---
@@ -8,7 +8,7 @@ sortValue: 1
 import { SectionGallery } from '@patternfly/documentation-framework/components/sectionGallery/sectionGallery';
 import patternsData from './patterns-data.json';
 
-# About
+# Overview
 
 Patterns are reusable, best practices solutions that solve common user problems. They are complex and contain multiple components. To outline each pattern’s conventions, we provide design guidelines that describe a pattern’s usage, appearance, features, variations, and more. 
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/mobile-primary-detail-in-card-view.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/mobile-primary-detail-in-card-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/mobile-primary-detail-in-card-view.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/mobile-primary-detail-in-card-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/mobile-primary-detail-in-list-view.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/mobile-primary-detail-in-list-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/mobile-primary-detail-in-list-view.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/mobile-primary-detail-in-list-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-in-card-demo-list.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-in-card-demo-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-in-card-demo-list.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-in-card-demo-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-in-card-view.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-in-card-view.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-in-card-view.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-in-card-view.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-in-data-list.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-in-data-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-in-data-list.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-in-data-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-multi-select.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-multi-select.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-multi-select.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-multi-select.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-splitter.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-splitter.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primary-detail-splitter.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primary-detail-splitter.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-card-demolist.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-card-demolist.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-card-demolist.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-card-demolist.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-cardview.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-cardview.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-cardview.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-cardview.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-datalist.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-datalist.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-datalist.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-datalist.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-mobile-list.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-mobile-list.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-mobile-list.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-mobile-list.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-mobile.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-mobile.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-mobile.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-mobile.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-splitter.png b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-splitter.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/img/primarydetail-splitter.png
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/img/primarydetail-splitter.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/primary-detail.md b/packages/documentation-site/patternfly-docs/content/patterns/primary-detail/primary-detail.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/primary-detail/primary-detail.md
rename to packages/documentation-site/patternfly-docs/content/patterns/primary-detail/primary-detail.md
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/img/severity-scale.png b/packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/img/severity-scale.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/img/severity-scale.png
rename to packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/img/severity-scale.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/img/severity-table-multiple.png b/packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/img/severity-table-multiple.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/img/severity-table-multiple.png
rename to packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/img/severity-table-multiple.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/img/severity-table-single.png b/packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/img/severity-table-single.png
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/img/severity-table-single.png
rename to packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/img/severity-table-single.png
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/status-and-severity.css b/packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/status-and-severity.css
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/status-and-severity.css
rename to packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/status-and-severity.css
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/status-and-severity.md b/packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/status-and-severity.md
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/status-and-severity.md
rename to packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/status-and-severity.md
index d55fc9449b..cb9c185cd4 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/patterns/status-and-severity/status-and-severity.md
+++ b/packages/documentation-site/patternfly-docs/content/patterns/status-and-severity/status-and-severity.md
@@ -32,7 +32,7 @@ Though both can be used to warn users of issues, severity icons and status icons
 
 ## Content considerations 
 
-Icons are often most meaningful when paired with text. If you're not certain that all users will recognize an icon on its own, add a descriptive text label or a tooltip. For guidance related to icon tooltips, refer to our [tooltips writing guide.](/ux-writing/tooltips)
+Icons are often most meaningful when paired with text. If you're not certain that all users will recognize an icon on its own, add a descriptive text label or a tooltip. For guidance related to icon tooltips, refer to our [tooltips writing guide.](/content-design/tooltips)
 
 ## Status icons
 
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/usage-and-behavior.md b/packages/documentation-site/patternfly-docs/content/patterns/usage-and-behavior.md
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/design-guidelines/usage-and-behavior/usage-and-behavior.md
rename to packages/documentation-site/patternfly-docs/content/patterns/usage-and-behavior.md
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/release-highlights.md b/packages/documentation-site/patternfly-docs/content/releases/release-highlights.md
similarity index 87%
rename from packages/documentation-site/patternfly-docs/content/get-started/release-highlights.md
rename to packages/documentation-site/patternfly-docs/content/releases/release-highlights.md
index 3238e29e5b..2bb187e41b 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/release-highlights.md
+++ b/packages/documentation-site/patternfly-docs/content/releases/release-highlights.md
@@ -1,9 +1,9 @@
 ---
 id: Release highlights
 title: Release highlights
-section: get-started
+section: releases
 ---
-import './get-started.css';
+import '../get-started/get-started.css';
 import { Divider, Timestamp } from '@patternfly/react-core'; 
 
 <Timestamp date={new Date(2025, 9)}>October 2025</Timestamp>
@@ -37,7 +37,7 @@ For the Q3 2025 PatternFly release, we're excited to introduce a beta version of
 
 ### Simplified animation control
 
-We've introduced a new application-level context provider for enabling animations. You can now set the animation context at the root of your application to enable all opt-in animations by default. This ensures motion behaves predictably across your entire UI while still allowing for individual overrides. [Find more details in our motion development guide.](/design-foundations/motion/development-guide/#global-animation-control)
+We've introduced a new application-level context provider for enabling animations. You can now set the animation context at the root of your application to enable all opt-in animations by default. This ensures motion behaves predictably across your entire UI while still allowing for individual overrides. [Find more details in our motion development guide.](/foundations-and-styles/motion/development-guide/#global-animation-control)
 
 ### High contrast mode (Beta)
 
@@ -45,7 +45,7 @@ To better support users with vision sensitivities and accessibility needs, we've
 
 You can preview high contrast mode via the theme switcher on our website. This initial beta includes support for most of our core components, with the full release&mdash;including support for charts and extensions&mdash;planned for Q4.
 
-To provide more guidance around theming, we've also published [new theming documentation](/design-foundations/theming) and a [high contrast handbook](/design-foundations/theming/high-contrast-handbook). 
+To provide more guidance around theming, we've also published [new theming documentation](/foundations-and-styles/theming) and a [high contrast handbook](/foundations-and-styles/theming/high-contrast-handbook). 
 
 ### System-wide accessibility enhancements
 
@@ -71,10 +71,10 @@ We’ve updated our documentation and examples with the following recommendation
 
 ### Community-driven ChatBot enhancements
 Based on feedback from usability workshops and our community, we've made significant enhancements to the ChatBot extension to improve usability and address user needs:
-- **Clearer navigation:** To provide users with more context, the [chat history drawer](/patternfly-ai/chatbot/ui#drawer-with-search-and-new-chat-button) now includes a clearer title, an icon, and a prominent "new chat" button.
-- **Flexible layouts:** To support different presentation preferences, we've introduced [compact component styles](/patternfly-ai/chatbot/overview/demo#compact-chatbot) and a new [demo for swapping between display modes](/patternfly-ai/chatbot/overview/demo#display-mode-switcher).
-- **Modern features:** To give users more control and flexibility, we added support for [message dividers](/patternfly-ai/chatbot/messages#message-dividers), [editing messages](/patternfly-ai/chatbot/messages#user-messages), [pinning chat history items](/patternfly-ai/chatbot/ui#pinning-conversations), [previewing images](/patternfly-ai/chatbot/messages#image-preview) and [downloading chat transcripts](/patternfly-ai/chatbot/overview/design-guidelines#downloading-chat-transcripts).
-- **Advanced interactions:** To support more complex agentic interactions, we've added new components to [display an AI's reasoning process (deep thinking)](/patternfly-ai/chatbot/messages#messages-with-deep-thinking), as well as [managing tool calls](/patternfly-ai/chatbot/messages#messages-with-tool-calls) and sharing [tool responses](/patternfly-ai/chatbot/messages#messages-with-tool-responses).
+- **Clearer navigation:** To provide users with more context, the [chat history drawer](/AI/chatbot/ui#drawer-with-search-and-new-chat-button) now includes a clearer title, an icon, and a prominent "new chat" button.
+- **Flexible layouts:** To support different presentation preferences, we've introduced [compact component styles](/AI/chatbot/overview/demo#compact-chatbot) and a new [demo for swapping between display modes](/AI/chatbot/overview/demo#display-mode-switcher).
+- **Modern features:** To give users more control and flexibility, we added support for [message dividers](/AI/chatbot/messages#message-dividers), [editing messages](/AI/chatbot/messages#user-messages), [pinning chat history items](/AI/chatbot/ui#pinning-conversations), [previewing images](/AI/chatbot/messages#image-preview) and [downloading chat transcripts](/AI/chatbot/overview/design-guidelines#downloading-chat-transcripts).
+- **Advanced interactions:** To support more complex agentic interactions, we've added new components to [display an AI's reasoning process (deep thinking)](/AI/chatbot/messages#messages-with-deep-thinking), as well as [managing tool calls](/AI/chatbot/messages#messages-with-tool-calls) and sharing [tool responses](/AI/chatbot/messages#messages-with-tool-responses).
 
 ### Resizable table columns
 Based on user feedback, we've added resizable table columns within the [@patternfly/react-data-view extension](https://www.npmjs.com/package/@patternfly/react-data-view). This update allows users to click and drag column dividers to adjust widths, making it easier to view and work with data in dense tables.
@@ -84,8 +84,8 @@ To see this feature in action, [refer to our resizable columns table demo](/exte
 ### New guidelines for streamlined AI workflows
 
 To help you safely and effectively integrate AI into your development process, we’ve released two new sets of guidelines:
-- **AI-generated code contribution:** To ensure legal compliance and quality, we've established new guidelines for contributing AI-generated code. You can find them in [our contribution documentation on our website](https://www.patternfly.org/get-started/contribute#ai-assisted-development-guidelines) and [within GitHub](https://github.com/patternfly/.github/blob/main/CONTRIBUTING.md). 
-- **AI-assisted code migrations:** We've also published [new documentation on using AI to streamline code migrations](/patternfly-ai/ai-assisted-code-migration/). This guide offers strategies for using AI to make it easier and faster to migrate your project to PatternFly React from other frameworks.
+- **AI-generated code contribution:** To ensure legal compliance and quality, we've established new guidelines for contributing AI-generated code. You can find them [within GitHub](https://github.com/patternfly/.github/blob/main/CONTRIBUTING.md). 
+- **AI-assisted code migrations:** We've also published [new documentation on using AI to streamline code migrations](/AI/ai-assisted-code-migration/). This guide offers strategies for using AI to make it easier and faster to migrate your project to PatternFly React from other frameworks.
 
 ### What's next?
 For the Q4 2025 release, we’ll be focused on:
@@ -168,7 +168,7 @@ This update is non-breaking, and PatternFly 6 will continue to support React 17
 
 ### Component animations
 
-As we progress in our effort to integrate motion design across PatternFly components, we added the following new animations in this release. To provide a holistic view of our animated components, we also put together [an interactive animations demo](/design-foundations/motion/demo), which we will continue to update as we add additional animation support.   
+As we progress in our effort to integrate motion design across PatternFly components, we added the following new animations in this release. To provide a holistic view of our animated components, we also put together [an interactive animations demo](/foundations-and-styles/motion/demo), which we will continue to update as we add additional animation support.   
 
 **Note:** Browsers may slow down or deactivate animations on resource-intensive pages. This can occur when continuous animations (like multiple spinners) are active at the same time as other demanding tasks (like frequent data polling), which can overload the browser's processing capacity.
 
@@ -297,23 +297,23 @@ The following animations are unique to each icon and don't support any custom ic
 
 ### PatternFly AI
 
-We updated our high-level [AI principles and guidelines](/patternfly-ai/principles-and-guidelines) to expand guidance and improve the usability of this resource. We integrated community feedback and research to include new patterns and recommendations that have emerged from the increased use of AI features in products. As the design and implementation of AI features continue to evolve, so will this guiding resource.
+We updated our high-level [AI principles and guidelines](/AI/principles-and-guidelines) to expand guidance and improve the usability of this resource. We integrated community feedback and research to include new patterns and recommendations that have emerged from the increased use of AI features in products. As the design and implementation of AI features continue to evolve, so will this guiding resource.
 
 #### ChatBot
 
-We expanded our ChatBot extension with improvements identified in a recent usability study, including [editable messages](/patternfly-ai/chatbot/messages#user-messages) and [compact styles](/patternfly-ai/chatbot/overview/demo#compact-chatbot). We also added other requested features, such as [auto-scrolling for messages](/patternfly-ai/chatbot/messages/demo#message-auto-scrolling) (a community contribution!), [empty and error states for the chat history drawer](/patternfly-ai/chatbot/ui#drawer-with-search-and-new-chat-button), and [expandable code blocks](/patternfly-ai/chatbot/messages#user-messages)&mdash;to name a few.
+We expanded our ChatBot extension with improvements identified in a recent usability study, including [editable messages](/AI/chatbot/messages#user-messages) and [compact styles](/AI/chatbot/overview/demo#compact-chatbot). We also added other requested features, such as [auto-scrolling for messages](/AI/chatbot/messages/demo#message-auto-scrolling) (a community contribution!), [empty and error states for the chat history drawer](/AI/chatbot/ui#drawer-with-search-and-new-chat-button), and [expandable code blocks](/AI/chatbot/messages#user-messages)&mdash;to name a few.
 
-On the documentation side, there's a new ["Customizing messages" guide](/patternfly-ai/chatbot/customizing-messages) that provides guidance for using rehype plugins for advanced HTML customization. 
+On the documentation side, there's a new ["Customizing messages" guide](/AI/chatbot/customizing-messages) that provides guidance for using rehype plugins for advanced HTML customization. 
 
 We also fixed reported bugs, which require no updates on your end.
 
 ### CLI experience guidelines
 
-With the help of a community contribution, we now have [a CLI handbook](/developer-resources/cli-handbook) that offers guidance for designing command-line interface experiences. This resource outlines unique accessibility considerations for CLIs, as well as writing guidelines for crafting well-designed messages, documentation, and interactive CLI experiences.
+With the help of a community contribution, we now have [a CLI handbook](/developer-guides/cli-handbook) that offers guidance for designing command-line interface experiences. This resource outlines unique accessibility considerations for CLIs, as well as writing guidelines for crafting well-designed messages, documentation, and interactive CLI experiences.
 
 ### Motion guidelines
 
-We updated our [motion guidelines](/design-foundations/motion) to bring our docs up to date with our new component animations, document [motion patterns](/design-foundations/motion#motion-patterns) we're using, and expand the [motion development guide](/design-foundations/motion/development-guide) with additional details and instruction.
+We updated our [motion guidelines](/foundations-and-styles/motion) to bring our docs up to date with our new component animations, document [motion patterns](/foundations-and-styles/motion#motion-patterns) we're using, and expand the [motion development guide](/foundations-and-styles/motion/development-guide) with additional details and instruction.
 
 ### What's next?
 
@@ -353,7 +353,7 @@ The following packages were promoted with this release. Outside of our primary i
 
 ### PatternFly 6 enablement
 
-As products have continued their PatternFly 6 migration journeys, we've received helpful feedback on the upgrade process, including common roadblocks and situations that could use more guidance. So, we expanded and reorganized the [PatternFly 6 upgrade guide](/get-started/upgrade) to more clearly and comprehensively support the upgrade process. 
+As products have continued their PatternFly 6 migration journeys, we've received helpful feedback on the upgrade process, including common roadblocks and situations that could use more guidance. So, we expanded and reorganized the [PatternFly 6 upgrade guide](/releases/upgrade-guide) to more clearly and comprehensively support the upgrade process. 
 
 ### Component animations
 
@@ -385,16 +385,16 @@ We’ve made significant progress towards React 19 support in PatternFly, which
 
 ### PatternFly AI 
 
-In the world of PatternFly AI, we've continued our focus on expanding our ChatBot extension. As more Flyers have used ChatBot, we've gained insight into the types of new features that would have the most impact. To make progress on growing ChatBot needs, this release adds *many* new features, including [an inline drawer display mode](https://patternfly-org-pr-4493-site.surge.sh/patternfly-ai/chatbot/overview/demo/#inline-drawer-chatbot), the ability for users to give [message feedback](https://patternfly-org-pr-4493-site.surge.sh/patternfly-ai/chatbot/messages#message-feedback), [support for quick starts](https://patternfly-org-pr-4493-site.surge.sh/patternfly-ai/chatbot/messages#messages-with-quick-start-tiles), additional content types for [messages](/patternfly-ai/chatbot/messages#bot-messages), and much more. 
+In the world of PatternFly AI, we've continued our focus on expanding our ChatBot extension. As more Flyers have used ChatBot, we've gained insight into the types of new features that would have the most impact. To make progress on growing ChatBot needs, this release adds *many* new features, including [an inline drawer display mode](https://patternfly-org-pr-4493-site.surge.sh/AI/chatbot/overview/demo/#inline-drawer-chatbot), the ability for users to give [message feedback](https://patternfly-org-pr-4493-site.surge.sh/AI/chatbot/messages#message-feedback), [support for quick starts](https://patternfly-org-pr-4493-site.surge.sh/AI/chatbot/messages#messages-with-quick-start-tiles), additional content types for [messages](/AI/chatbot/messages#bot-messages), and much more. 
 
 To see a complete list of new ChatBot features, [view the changelog](https://github.com/patternfly/chatbot/releases/tag/v2.2.0). 
 
 Along with these new features, we've updated our documentation:
-- [The ChatBot design guidelines](/patternfly-ai/chatbot/overview/design-guidelines) have been updated to reflect new features, expand on previous guidance, and add higher-level patterns for ChatBots usage in products. 
-- New [ChatBot analytics documentation](/patternfly-ai/chatbot/analytics) is also now available, which provides general guidance on the implementation of analytics tracking.
+- [The ChatBot design guidelines](/AI/chatbot/overview/design-guidelines) have been updated to reflect new features, expand on previous guidance, and add higher-level patterns for ChatBots usage in products. 
+- New [ChatBot analytics documentation](/AI/chatbot/analytics) is also now available, which provides general guidance on the implementation of analytics tracking.
 
 ### Expanded chart library
-PatternFly has historically provided a charting solution using the [Victory](https://formidable.com/open-source/victory/docs/victory-chart/) chart library. With this release, PatternFly is also now delivering 2 charts based on the [Apache ECharts](https://echarts.apache.org/) library, including [a line chart](/charts/line-chart/EChart) and [a Sankey chart](/charts/sankey-chart).
+PatternFly has historically provided a charting solution using the [Victory](https://formidable.com/open-source/victory/docs/victory-chart/) chart library. With this release, PatternFly is also now delivering 2 charts based on the [Apache ECharts](https://echarts.apache.org/) library, including [a line chart](/charts/line-chart) and [a Sankey chart](/charts/sankey-chart).
 
 Additionally, EChart is now listed as a peer dependency for PatternFly. To use these new chart solutions, add 'echart' to your project dependencies and follow PatternFly's documentation to build out your charts.
 
@@ -499,9 +499,9 @@ The following fix could require manual updates depending on how you handle break
 - We updated and added "draggable" examples to [dual list selector](/components/dual-list-selector#draggable) and [data list](/components/data-list#draggable).
 - We updated our ChatBot documentation: 
     - We renamed the extension to "ChatBot", to better brand our offering and help distinguish it from other general "chatbot" features.
-    - We combined and organized our documentation into a few cohesive pages: ["Overview"](/patternfly-ai/chatbot/overview), ["UI"](/patternfly-ai/chatbot/ui), and ["Messages"](/patternfly-ai/chatbot/message). Note that our documentation structure could continue to change as our extension grows. We will continue to share updates when changes occur. 
-    - We moved our [basic and embedded ChatBot demos](/patternfly-ai/chatbot/overview/demo) to the "Overview" page for better visibility. 
-    - We added initial [ChatBot design guidelines](/patternfly-ai/chatbot/overview/design-guidelines), which can also be found on the "Overview" page.
+    - We combined and organized our documentation into a few cohesive pages: ["Overview"](/AI/chatbot/overview), ["UI"](/AI/chatbot/ui), and ["Messages"](/AI/chatbot/messages). Note that our documentation structure could continue to change as our extension grows. We will continue to share updates when changes occur. 
+    - We moved our [basic and embedded ChatBot demos](/AI/chatbot/overview/demo) to the "Overview" page for better visibility. 
+    - We added initial [ChatBot design guidelines](/AI/chatbot/overview/design-guidelines), which can also be found on the "Overview" page.
     - We added documentation for new features, as described in the following section. 
 
 ### Extension updates 
@@ -513,14 +513,14 @@ We've continued to evolve our new ChatBot:
 - We removed the third-party `AutoTextArea` in the message bar and replaced it with our own custom solution.
 - We renamed the `toolTipLabel` prop to `tooltipLabel`.
 - We added support for new features, including: 
-    - A ["skip to chatbot" button](patternfly-ai/chatbot/ui/#skip-to-content).
-    - New features in [ChatBot messages](/patternfly-ai/chatbot/messages#messages) and the message bar: 
+    - A ["skip to chatbot" button](/AI/chatbot/ui#skip-to-content).
+    - New features in [ChatBot messages](/AI/chatbot/messages#messages) and the message bar: 
         - Truncation of long bot and user names. 
         - More complex list formats.
-        - [Quick response buttons](/patternfly-ai/chatbot/messages#messages-with-quick-responses). 
-        - [Multiple file attachments](/patternfly-ai/chatbot/messages#messages-with-attachments). 
-         - A [stop streaming button](/patternfly-ai/chatbot/ui#message-bar-with-stop-button) that will pause the streaming of a ChatBot message.
-        - Additional customization options for [welcome messages](/patternfly-ai/chatbot/ui#welcome-message), [message avatars](/patternfly-ai/chatbot/messages#messages), [message actions](/patternfly-ai/chatbot/messages#custom-messages-actions), [modal](/patternfly-ai/chatbot/ui#modal), [toggle shape](/patternfly-ai/chatbot/ui#custom-toggle-shape).
+        - [Quick response buttons](/AI/chatbot/messages#messages-with-quick-responses). 
+        - [Multiple file attachments](/AI/chatbot/messages#messages-with-attachments). 
+         - A [stop streaming button](/AI/chatbot/ui#message-bar-with-stop-button) that will pause the streaming of a ChatBot message.
+        - Additional customization options for [welcome messages](/AI/chatbot/ui#welcome-message), [message avatars](/AI/chatbot/messages#messages), [message actions](/AI/chatbot/messages#custom-messages-actions), [modal](/AI/chatbot/ui#modal), [toggle shape](/AI/chatbot/ui#custom-toggle-shape).
         - A variety of styling updates to shadows, sizing, and positioning. 
     
 #### Component groups
@@ -562,10 +562,10 @@ The official release of PatternFly 6 is here! It contains all of the previous fe
 
 We're excited to introduce PatternFly AI: our new effort to support and integrate AI into our design system. We've added guidance and resources, contained within a new section of our website:
 
-- [About PatternFly AI](/patternfly-ai/about-ai)
-- [AI guidelines](/patternfly-ai/ai-guidelines)
-- [Chatbot](/patternfly-ai/chatbot/about-chatbot)
-- [Conversation design](/patternfly-ai/conversation-design)
+- [About PatternFly AI](/AI/about-ai)
+- [AI guidelines](/AI/ai-guidelines)
+- [Chatbot](/AI/chatbot/about-chatbot)
+- [Conversation design](/AI/conversation-design)
 
 As with all things AI currently, this area will continue to grow and mature with time.
 
@@ -606,7 +606,7 @@ Here are the most significant updates we made to our React components:
 
 #### Design tokens 
 
-We updated existing design tokens and added new tokens to support directional box-shadows. To see these tokens, search "box-shadow" in our [tokens documentation](/tokens/all-patternfly-tokens).
+We updated existing design tokens and added new tokens to support directional box-shadows. To see these tokens, search "box-shadow" in our [tokens documentation](/foundations-and-styles/design-tokens/all-patternfly-tokens).
 
 We also added a few new tokens to support the needs of our new chatbot, including:
 - A tertiary background token that accommodates containers placed on a secondary background.
@@ -630,13 +630,13 @@ In addition to the previously mentioned documentation updates, we've made change
 #### Design guidelines 
 - Added a new [status and severity pattern](/patterns/status-and-severity), which provides guidance for using our new severity icons.
 - Updated our [quick starts extension](/extensions/quick-starts) with more content guidance.
-- Documented our tabular number modifier `.pf-v6-m-tabular-nums` in [typography](/design-foundations/typography), [numerics](/ux-writing/numerics), and [table](/components/table/design-guidelines).
+- Documented our tabular number modifier `.pf-v6-m-tabular-nums` in [typography](/foundations-and-styles/typography), [numerics](/content-design/numerics), and [table](/components/table/design-guidelines).
 - Added guidance for editorial styling to our [content component](/components/content) (formerly called text content).
 - We've started updating images across our design guidelines to represent PatternFly 6 styling.
 
 #### Miscellaneous cleanup and enhancements
 - Shortened component descriptions shown in component page headers and on the [all components page](/components/all-components).
-- Added more details about [React tokens](/tokens/develop-with-tokens#react-tokens) and [how to migrate them](/get-started/upgrade#utilize-our-tokens-update-codemod).
+- Added more details about [React tokens](/foundations-and-styles/design-tokens/develop#react-tokens) and [how to migrate them](/releases/upgrade-guide#utilize-our-tokens-update-codemod).
 - Added React example documentation for [text input group](/components/text-input-group).
 
 <Divider />
@@ -662,16 +662,16 @@ We created a framework for micro animation CSS tokens, which will be used to ena
 
 We made more improvements to our website docs, to ensure that they're accurate and inline with our new token system. A variety of pages and sections were updated, including: 
 - All tokens pages: 
-    - [About tokens](/tokens/about-tokens)
-    - [All PatternFly tokens](/tokens/all-patternfly-tokens)
-    - [Develop with tokens](/tokens/develop-with-tokens)
-    - [Design with tokens](/tokens/design-with-tokens)
-    - **Note:*- Any @patternfly/react-tokens referencing global variables will need to be updated, since global variables have been replaced with tokens. Following our [token migration instructions](/tokens/develop-with-tokens#migrate-to-tokens) will help you determine the correct token to use. 
+    - [About tokens](/foundations-and-styles/design-tokens/about-tokens)
+    - [All design tokens](/foundations-and-styles/design-tokens/all-patternfly-tokens)
+    - [Develop with tokens](/foundations-and-styles/design-tokens/develop)
+    - [Design with tokens](/foundations-and-styles/design-tokens/design)
+    - **Note:*- Any @patternfly/react-tokens referencing global variables will need to be updated, since global variables have been replaced with tokens. Following our [token migration instructions](/foundations-and-styles/design-tokens/develop#migrate-to-tokens) will help you determine the correct token to use. 
 - Our design foundations 
-    - [Colors](/design-foundations/colors) 
-    - [Icons](/design-foundations/icons) 
-    - [Spacers](/design-foundations/spacers)  
-    - [Typography](/design-foundations/typography)  
+    - [Colors](/foundations-and-styles/colors) 
+    - [Icons](/foundations-and-styles/iconography) 
+    - [Spacers](/foundations-and-styles/spacers)  
+    - [Typography](/foundations-and-styles/typography)  
 
 ### Component updates
 
@@ -749,8 +749,8 @@ All of our components have a new look to match. As you use the alpha website, ta
 
 ### Design tokens 
 
-In order to support PatternFly 6, and any future visual theming capabilities, we have implemented a design token system for PatternFly. For more details and instructions on how to use tokens, you can refer to our new [design token documentation](/tokens/about-tokens).
+In order to support PatternFly 6, and any future visual theming capabilities, we have implemented a design token system for PatternFly. For more details and instructions on how to use tokens, you can refer to our new [design token documentation](/foundations-and-styles/design-tokens/about-tokens).
 
-Our tokens cover both dark and light themes, and make it easier to support both in your product. We also updated our [dark theme handbook](/design-foundations/theming/dark-theme-handbook) to align with our tokens.
+Our tokens cover both dark and light themes, and make it easier to support both in your product. We also updated our [dark theme handbook](/foundations-and-styles/theming/dark-theme-handbook) to align with our tokens.
 
-**Note:*- The PatternFly 5 design library is not built with tokens. To take advantage of our token system, you must [upgrade your product to PatternFly 6](/get-started/upgrade).
\ No newline at end of file
+**Note:*- The PatternFly 5 design library is not built with tokens. To take advantage of our token system, you must [upgrade your product to PatternFly 6](/releases/upgrade-guide).
\ No newline at end of file
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/release-notes-data.js b/packages/documentation-site/patternfly-docs/content/releases/release-notes-data.js
similarity index 99%
rename from packages/documentation-site/patternfly-docs/content/get-started/release-notes-data.js
rename to packages/documentation-site/patternfly-docs/content/releases/release-notes-data.js
index 4a1e673eb1..891d77cef3 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/release-notes-data.js
+++ b/packages/documentation-site/patternfly-docs/content/releases/release-notes-data.js
@@ -2849,7 +2849,7 @@ t_color_green_10;`}
   {
     component: "Tokens",
     description:
-      "We have updated our CSS tokens. About half of our tokens have been replaced with newer ones. \n\n- this rule provides an autofix for global non color tokens\n- global color tokens will be replaced with a temporary hot pink color token **that must be manually replaced** (`t_temp_dev_tbd` react token or `--pf-t--temp--dev--tbd` CSS variable)\n- other non-global (component or chart) tokens need to be replaced manually\n\nTo find a suitable replacement token, check our [v6 token documentation](/tokens/all-patternfly-tokens).",
+      "We have updated our CSS tokens. About half of our tokens have been replaced with newer ones. \n\n- this rule provides an autofix for global non color tokens\n- global color tokens will be replaced with a temporary hot pink color token **that must be manually replaced** (`t_temp_dev_tbd` react token or `--pf-t--temp--dev--tbd` CSS variable)\n- other non-global (component or chart) tokens need to be replaced manually\n\nTo find a suitable replacement token, check our [v6 token documentation](/foundations-and-styles/design-tokens/all-patternfly-tokens).",
     repo: "React",
     fixedWithCodeMod: true,
     title: "tokens-update",
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/release-notes-table.js b/packages/documentation-site/patternfly-docs/content/releases/release-notes-table.js
similarity index 100%
rename from packages/documentation-site/patternfly-docs/content/get-started/release-notes-table.js
rename to packages/documentation-site/patternfly-docs/content/releases/release-notes-table.js
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/release-notes.md b/packages/documentation-site/patternfly-docs/content/releases/release-notes.md
similarity index 86%
rename from packages/documentation-site/patternfly-docs/content/get-started/release-notes.md
rename to packages/documentation-site/patternfly-docs/content/releases/release-notes.md
index 6f4d50892d..6fea89009c 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/release-notes.md
+++ b/packages/documentation-site/patternfly-docs/content/releases/release-notes.md
@@ -1,8 +1,8 @@
 ---
-id: Upgrade
+id: Upgrade guide
 source: release-notes
-title: PatternFly 6 upgrade
-section: get-started
+title: PatternFly 6 release notes
+section: releases
 ---
 
 ## PatternFly 6 React breaking changes
@@ -14,6 +14,6 @@ Note that this table does not contain a completely comprehensive list of changes
 
 Comprehensive PatternFly 6 release notes can be found on GitHub, in [@patternfly/patternfly](https://github.com/patternfly/patternfly/releases) and [@patternfly/react-core](https://github.com/patternfly/patternfly-react/releases).
 
-A summary of the changes from PatternFly 6 can be found in our [release highlights](/get-started/release-highlights/).
+A summary of the changes from PatternFly 6 can be found in our [release highlights](/releases/release-highlights/).
 
 <ReleaseNotesTable/>
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/upgrade.md b/packages/documentation-site/patternfly-docs/content/releases/upgrade-guide.md
similarity index 87%
rename from packages/documentation-site/patternfly-docs/content/get-started/upgrade.md
rename to packages/documentation-site/patternfly-docs/content/releases/upgrade-guide.md
index 657bec53dd..118fbfc34f 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/upgrade.md
+++ b/packages/documentation-site/patternfly-docs/content/releases/upgrade-guide.md
@@ -1,16 +1,16 @@
 ---
-id: Upgrade
+id: Upgrade guide
 source: upgrade-guide
 title: Upgrade to PatternFly 6
-section: get-started
+section: releases
 ---
 import { Alert, Button, Divider } from '@patternfly/react-core';
 import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
 
-<Alert variant="info" isInline title="Are you ready for PatternFly 6?"> To ensure  your product is ready for PatternFly 6, [complete the PatternFly 5 upgrade process](https://v5-archive.patternfly.org/get-started/upgrade) first to address any necessary changes from our previous release.
+<Alert variant="info" isInline title="Are you ready for PatternFly 6?"> To ensure  your product is ready for PatternFly 6, [complete the PatternFly 5 upgrade process](https://v5-archive.patternfly.org/releases/upgrade-guide) first to address any necessary changes from our previous release.
 </Alert>
 
-PatternFly 6 introduces the exciting new features and functionality outlined [our release highlights](/get-started/release-highlights). For a detailed breakdown on the work that went into this release, you can view [the PatternFly 6 major release notes](/get-started/upgrade/release-notes). 
+PatternFly 6 introduces the exciting new features and functionality outlined [our release highlights](/releases/release-highlights). For a detailed breakdown on the work that went into this release, you can view [the PatternFly 6 major release notes](/releases/upgrade-guide/release-notes). 
 
 In the following sections, this upgrade guide outlines steps required to migrate your codebase to PatternFly 6 and additional resources to support your journey:
 
@@ -31,7 +31,7 @@ Before you upgrade, familiarize yourself with these significant changes. While s
 1. [Text](https://v5-archive.patternfly.org/components/text): Renamed to ["content"](/components/content).  
 1. [Expandable section](/components/expandable-section): Removed `isActive`.
 1. [Empty state](/components/empty-state): Refactored. 
-    - This refactoring is not *entirely* handled by codemods. Depending on your implementation, your empty states could also require manual updates. For more details, search "empty state" in the [release notes table](/get-started/upgrade/release-notes). 
+    - This refactoring is not *entirely* handled by codemods. Depending on your implementation, your empty states could also require manual updates. For more details, search "empty state" in the [release notes table](/releases/upgrade-guide/release-notes). 
 
 ### Charts
 
@@ -74,7 +74,7 @@ To run [our codemods](https://github.com/patternfly/pf-codemods/), follow these
 
     * You should see an output similar to running `lint`, including a list of warnings and errors and a total count of each:
     
-    ![Example codemod output.](./img/codemod-output.png)
+    ![Example codemod output.](../get-started/img/codemod-output.png)
 
     * If your results don’t look like this, [reach out to the PatternFly team](#get-help) before continuing. 
 
@@ -90,7 +90,7 @@ To run [our codemods](https://github.com/patternfly/pf-codemods/), follow these
 
 7.  To ensure that all issues are flagged and addressed, complete steps 1-6 multiple times. Once everything looks correct, continue to [step 2](#2-remove-all-css-overrides).
 
-8. You will likely need to make updates to [React tokens](https://www.patternfly.org/tokens/develop-with-tokens/#react-tokens) in your product, discussed in step 3.
+8. You will likely need to make updates to [React tokens](/foundations-and-styles/design-tokens/develop#react-tokens) in your product, discussed in step 3.
 
 ### 2. Remove all CSS overrides
 
@@ -108,7 +108,7 @@ A number of variables have been removed or added&mdash;primarily due to logical
 - [Removed variables](https://docs.google.com/spreadsheets/d/e/2PACX-1vQqeH7ThYi0jkhYEB8B2SXa7x8AaY5T9ajG6o-Ogz3p7YVp0OuTulb_L3DYLDrHlY4zUE3IBiup6tkN/pubhtml?gid=1160160856&single=true) 
 - [Added variables](https://docs.google.com/spreadsheets/d/e/2PACX-1vQqeH7ThYi0jkhYEB8B2SXa7x8AaY5T9ajG6o-Ogz3p7YVp0OuTulb_L3DYLDrHlY4zUE3IBiup6tkN/pubhtml?gid=268831450&single=true).
 
-Wherever you have custom CSS overrides that reference PatternFly class names or CSS variables, carefully review them and make updates to ensure that they align with [our new design tokens](/tokens/all-patternfly-tokens). 
+Wherever you have custom CSS overrides that reference PatternFly class names or CSS variables, carefully review them and make updates to ensure that they align with [our new design tokens](/foundations-and-styles/design-tokens/all-patternfly-tokens). 
 
 To assist with naming updates, we offer 3 codemods: 
 1. [class-name-updater](https://github.com/patternfly/pf-codemods/tree/main/packages/class-name-updater): Automatically identifies and renames classes to align with changes in PatternFly 6.
@@ -129,7 +129,7 @@ When using this codemod, make sure to add:
 #### Run tokens-update
 For more details, refer to [the tokens-update example in the pf-codemods README](https://github.com/patternfly/pf-codemods?tab=readme-ov-file#tokens-update).
 
-This codemod updates global color variables in .js and .tsx files to a temporary hot pink color to visibly mark the places where you need to manually replace tokens (`--pf-t--temp--dev--tbd`, or `t_temp_dev_tbd` when using [React tokens](/tokens/develop-with-tokens#react-tokens)). For other global variables (like spacers, font size, or box shadows), it will attempt to provide an auto-fix to match the same or closest value.
+This codemod updates global color variables in .js and .tsx files to a temporary hot pink color to visibly mark the places where you need to manually replace tokens (`--pf-t--temp--dev--tbd`, or `t_temp_dev_tbd` when using [React tokens](/foundations-and-styles/design-tokens/develop#react-tokens)). For other global variables (like spacers, font size, or box shadows), it will attempt to provide an auto-fix to match the same or closest value.
 
 This codemod works both for CSS variables and React tokens. For example:
 - A CSS variable: `--pf-v5-global--FontSize--lg` becomes `--pf-t--global--font--size--lg`
@@ -138,7 +138,7 @@ This codemod works both for CSS variables and React tokens. For example:
 ##### Manual React token updates
 Codemods will sometimes be unable to fix *all* tokens imported by `@patternfly/react-tokens` because there is often no 1:1 match for a PatternFly 5 and PatternFly 6 React token. 
 
-If you continually receive errors that tokens in your code don’t exist, despite re-running codemods, it doesn't necessarily mean that codemods didn't work. It could mean your React tokens point to old global variables. If so, you must locate outdated tokens and replace them with the [PatternFly 6 React token](/tokens/develop-with-tokens#react-tokens) that best fits your use case.
+If you continually receive errors that tokens in your code don't exist, despite re-running codemods, it doesn't necessarily mean that codemods didn't work. It could mean your React tokens point to old global variables. If so, you must locate outdated tokens and replace them with the [PatternFly 6 React token](/foundations-and-styles/design-tokens/develop#react-tokens) that best fits your use case.
 
 Example:
 - PatternFly 5 token: `global_link_Color_hover`
@@ -150,11 +150,11 @@ While these tokens have different uses, this example is meant to show how the ge
 
 For more details, refer to[ the css-vars-updater README](https://github.com/patternfly/pf-codemods/tree/main/packages/css-vars-updater). 
 
-This codemod automatically identifies PatternFly 5 CSS variables that need to be updated after the introduction of [design tokens in PatternFly 6](https://www.patternfly.org/tokens/about-tokens/). It will help you update these CSS variables in non-React files, including .css, .scss, .md, or another file type that you choose.
+This codemod automatically identifies PatternFly 5 CSS variables that need to be updated after the introduction of [design tokens in PatternFly 6](https://www.patternfly.org/foundations-and-styles/design-tokens/about-tokens/). It will help you update these CSS variables in non-React files, including .css, .scss, .md, or another file type that you choose.
 
 ### 4. Update any pixel-based logic for breakpoints
 
-PatternFly 6 uses rem units for global breakpoint [design tokens](/tokens/all-tokens), rather than pixels. 
+PatternFly 6 uses rem units for global breakpoint [design tokens](/foundations-and-styles/design-tokens/all-tokens), rather than pixels. 
 
 If you have previously implemented any breakpoint logic based on a pixel value, you will need to account for the fact that PatternFly 6 breakpoint tokens use rems. To find the rem equivalent, divide your pixel value by 16 or refer to this table:
 
diff --git a/packages/documentation-site/patternfly-docs/generated/components/about-modal/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/about-modal/html-demos/basic.png
index e1d7ea350c..7c28048dad 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/about-modal/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/about-modal/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-horizontal-form.png b/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-horizontal-form.png
index 6f794b960a..e8950f3787 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-horizontal-form.png and b/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-horizontal-form.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-stacked-form.png b/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-stacked-form.png
index 7864437b0a..819d797c88 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-stacked-form.png and b/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/inline-alert-in-stacked-form.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/toast.png b/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/toast.png
index 8df9b4f013..53c834db26 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/toast.png and b/packages/documentation-site/patternfly-docs/generated/components/alert/html-demos/toast.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/alert/html/toast-alert-group.png b/packages/documentation-site/patternfly-docs/generated/components/alert/html/toast-alert-group.png
index 88e8cd13c4..4e4f21bb85 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/alert/html/toast-alert-group.png and b/packages/documentation-site/patternfly-docs/generated/components/alert/html/toast-alert-group.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/alert/react-demos/alert-group-toast-with-notification-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/alert/react-demos/alert-group-toast-with-notification-drawer.png
index 12e27f392a..31d90f476a 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/alert/react-demos/alert-group-toast-with-notification-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/alert/react-demos/alert-group-toast-with-notification-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/back-to-top/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/back-to-top/html-demos/basic.png
index faae9e3f36..c6b92c794d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/back-to-top/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/back-to-top/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/back-to-top/react-demos/using-name-selector.png b/packages/documentation-site/patternfly-docs/generated/components/back-to-top/react-demos/using-name-selector.png
index 763b1f70d7..6753ab7751 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/back-to-top/react-demos/using-name-selector.png and b/packages/documentation-site/patternfly-docs/generated/components/back-to-top/react-demos/using-name-selector.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/basic.png
index 124b1fb194..5e9d2b1533 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/topbottom.png b/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/topbottom.png
index 9adfa6f0ff..8ef03ff0cf 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/topbottom.png and b/packages/documentation-site/patternfly-docs/generated/components/banner/html-demos/topbottom.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/basic-sticky-banner.png b/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/basic-sticky-banner.png
index ce31278c40..f78d81f7f2 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/basic-sticky-banner.png and b/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/basic-sticky-banner.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/top-and-bottom-banner.png b/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/top-and-bottom-banner.png
index 69cf77018b..f1ea71277a 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/top-and-bottom-banner.png and b/packages/documentation-site/patternfly-docs/generated/components/banner/react-demos/top-and-bottom-banner.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/actionable.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/actionable.png
index 8b6c918536..0088e2e6b3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/actionable.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/actionable.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/basic.png
index 52745b44b8..30f86d144b 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/expandable-demo.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/expandable-demo.png
index 0b7775a4aa..accf5049d1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/expandable-demo.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/expandable-demo.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/static-bottom-pagination.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/static-bottom-pagination.png
index 93517685e5..8b342ab7d6 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/static-bottom-pagination.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/html-demos/static-bottom-pagination.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/actionable.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/actionable.png
index 0bb931a143..b1e3df0215 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/actionable.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/actionable.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/basic.png
index 665d6df34e..15a4174fbf 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/expandable-control-in-toolbar.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/expandable-control-in-toolbar.png
index 99299e44a7..c3300c5acd 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/expandable-control-in-toolbar.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/expandable-control-in-toolbar.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/static-bottom-pagination.png b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/static-bottom-pagination.png
index 1b9d3af7eb..8bc20d61b9 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/static-bottom-pagination.png and b/packages/documentation-site/patternfly-docs/generated/components/data-list/react-demos/static-bottom-pagination.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/basic.png
index 76177023e6..0884d9a977 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/complex-content.png b/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/complex-content.png
index 7869d94e9a..8e2ba765c4 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/complex-content.png and b/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/complex-content.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/in-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/in-drawer.png
index e783d1c2f9..3ac9e7b64c 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/in-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/description-list/html-demos/in-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/basic.png
index 0ec0310213..d6862870b9 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/in-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/in-drawer.png
index 7147202218..508909bf76 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/in-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/description-list/react-demos/in-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/collapsed.png b/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/collapsed.png
index a58c84cd4a..9223e7912d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/collapsed.png and b/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/collapsed.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded-bottom.png b/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded-bottom.png
index dc96f3913a..76682323bc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded-bottom.png and b/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded-bottom.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded.png b/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded.png
index 320390afb0..b08ecedcd7 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded.png and b/packages/documentation-site/patternfly-docs/generated/components/drawer/html-demos/expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/horizontal-jump-links.png b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/horizontal-jump-links.png
index f8d43eed92..8dc3fef661 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/horizontal-jump-links.png and b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/horizontal-jump-links.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-collapsed-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-collapsed-on-mobile.png
index 0af0e4fe03..4d7e4b4591 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-collapsed-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-collapsed-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-expanded-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-expanded-on-mobile.png
index 0af0e4fe03..4d7e4b4591 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-expanded-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-expanded-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-toggle-text-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-toggle-text-on-mobile.png
index 0af0e4fe03..4d7e4b4591 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-toggle-text-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/jump-links/html-demos/vertical-jump-links-toggle-text-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/scrollspy-with-subsections.png b/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/scrollspy-with-subsections.png
index 09a513bb8a..3b57c3c5f3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/scrollspy-with-subsections.png and b/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/scrollspy-with-subsections.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/with-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/with-drawer.png
index 2e217b6a00..de622a1905 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/with-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/jump-links/react-demos/with-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/basic.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/basic.png
index d85116a737..47fadbb2bc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/hide-password.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/hide-password.png
index 78ddf10d4f..67ad8b1d09 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/hide-password.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/hide-password.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/invalid.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/invalid.png
index 286a49bda2..ca7a765df9 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/invalid.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/invalid.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/show-password.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/show-password.png
index bee5b7a92b..8b3ee0cafc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/show-password.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/show-password.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/with-language-selector.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/with-language-selector.png
index f9548618e5..54f1dc6acd 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/html/with-language-selector.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/html/with-language-selector.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/react/basic.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/react/basic.png
index 0f6adeeecd..15cbfcf913 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/react/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/react/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/react/showhide-password.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/react/showhide-password.png
index a466a1d0e5..3f2bda3fc9 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/react/showhide-password.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/react/showhide-password.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/login-page/react/with-header-utilities.png b/packages/documentation-site/patternfly-docs/generated/components/login-page/react/with-header-utilities.png
index 4b9c65c2c9..017194664e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/login-page/react/with-header-utilities.png and b/packages/documentation-site/patternfly-docs/generated/components/login-page/react/with-header-utilities.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/advanced-integration-with-menu-options.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/advanced-integration-with-menu-options.png
index a58c84cd4a..9223e7912d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/advanced-integration-with-menu-options.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/advanced-integration-with-menu-options.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/basic.png
index bd281a8805..b0630f418e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/horizontal-nav.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/horizontal-nav.png
index 4687e3378a..6cb07ab409 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/horizontal-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/horizontal-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-context-selector-and-dropdown.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-context-selector-and-dropdown.png
index b74104e52f..8dee1bbfd1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-context-selector-and-dropdown.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-context-selector-and-dropdown.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-collapsed.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-collapsed.png
index 170e3c0649..0a1812c706 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-collapsed.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-collapsed.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-expanded.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-expanded.png
index ba2ca18976..ed01cf0888 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-expanded.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-expandable-search-expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-and-filters.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-and-filters.png
index 7fd34193dd..9980d00eb3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-and-filters.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-and-filters.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-filters-expandable-content-expanded-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-filters-expandable-content-expanded-mobile.png
index 25afae718d..fcf8469da8 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-filters-expandable-content-expanded-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toggle-group-filters-expandable-content-expanded-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toolbar-filters.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toolbar-filters.png
index 7fd34193dd..9980d00eb3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toolbar-filters.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/html-demos/with-toolbar-filters.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/horizontal-nav.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/horizontal-nav.png
index 60b28a42d9..f9cd244e74 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/horizontal-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/horizontal-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/utilities-and-user-dropdown-menu.png b/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/utilities-and-user-dropdown-menu.png
index 2f18884755..bbc1ba27bc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/utilities-and-user-dropdown-menu.png and b/packages/documentation-site/patternfly-docs/generated/components/masthead/react-demos/utilities-and-user-dropdown-menu.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/basic.png
index 3f9df8cbe4..7df1d118ac 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/large.png b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/large.png
index 3906367b19..c020e75085 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/large.png and b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/large.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/medium.png b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/medium.png
index 78902d1040..72c6bf25dc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/medium.png and b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/medium.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/modal-with-form.png b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/modal-with-form.png
index e64e4c8d2d..097da15147 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/modal-with-form.png and b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/modal-with-form.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/scrollable-content.png b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/scrollable-content.png
index 3ce43551dc..3bfb9bab46 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/scrollable-content.png and b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/scrollable-content.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/top-aligned.png b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/top-aligned.png
index 91516d80db..d483fd5702 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/top-aligned.png and b/packages/documentation-site/patternfly-docs/generated/components/modal/html-demos/top-aligned.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/default-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/default-nav.png
index a58c84cd4a..9223e7912d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/default-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/default-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/expandable-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/expandable-nav.png
index 3bd52d8420..f21578fd75 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/expandable-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/expandable-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/grouped-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/grouped-nav.png
index d84447fcea..d3a268a30c 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/grouped-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/grouped-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav-with-horizontal-subnav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav-with-horizontal-subnav.png
index 21c2d880c7..9e83fd5963 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav-with-horizontal-subnav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav-with-horizontal-subnav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav.png
index 4687e3378a..6cb07ab409 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-subnav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-subnav.png
index 46e8f3a8bd..d0879816e0 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-subnav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/html-demos/horizontal-subnav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/default-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/default-nav.png
index 148cf84ce5..01a603ae96 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/default-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/default-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/expandable-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/expandable-nav.png
index 63ffb11505..d0f28156a5 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/expandable-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/expandable-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav-with-horizontal-subnav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav-with-horizontal-subnav.png
index 49a667aa7e..f9dc3b5474 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav-with-horizontal-subnav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav-with-horizontal-subnav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav.png
index 43592c8665..4dd17e4b77 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-nav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-subnav.png b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-subnav.png
index f075854ef9..2bbcfb30de 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-subnav.png and b/packages/documentation-site/patternfly-docs/generated/components/navigation/react-demos/horizontal-subnav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/collapsed.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/collapsed.png
index 26429b5034..a3f30a6e1e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/collapsed.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/collapsed.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-attention.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-attention.png
index d0f8e77ddf..1e709c324e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-attention.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-attention.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-read.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-read.png
index f962fa4dc0..72cfa9f4d7 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-read.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-read.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-unread.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-unread.png
index 8e2ab2d8c8..e14ea9f759 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-unread.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-unread.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-with-groups.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-with-groups.png
index fb21dde667..db149918fa 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-with-groups.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/html-demos/expanded-with-groups.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/basic.png
index 5d60db065a..a01eb57103 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/grouped.png b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/grouped.png
index 5d60db065a..a01eb57103 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/grouped.png and b/packages/documentation-site/patternfly-docs/generated/components/notification-drawer/react-demos/grouped.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/basic.png
index a58c84cd4a..9223e7912d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-expanded-in-sidebar.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-expanded-in-sidebar.png
index 5737d1d743..4e7542dcaa 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-expanded-in-sidebar.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-expanded-in-sidebar.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-in-sidebar.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-in-sidebar.png
index bdfb959007..a8e2fdcde0 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-in-sidebar.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/context-selector-in-sidebar.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/multiple-sidebar-body-elements.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/multiple-sidebar-body-elements.png
index 226e007ed3..757a8573f5 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/multiple-sidebar-body-elements.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/multiple-sidebar-body-elements.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar-or-masthead.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar-or-masthead.png
index 5ec92d9457..7eefef4208 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar-or-masthead.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar-or-masthead.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar.png
index b16bf5507f..09ae60f6ca 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/no-sidebar.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/overflow-scroll.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/overflow-scroll.png
index 95b663d605..6b5aab9259 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/overflow-scroll.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/overflow-scroll.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-collapsed.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-collapsed.png
index b16bf5507f..09ae60f6ca 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-collapsed.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-collapsed.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-expanded.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-expanded.png
index a58c84cd4a..9223e7912d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-expanded.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sidebar-expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb-on-medium.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb-on-medium.png
index 5cfcdb6255..499d84dbab 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb-on-medium.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb-on-medium.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb.png
index 5cfcdb6255..499d84dbab 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-breadcrumb.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-horizontal-subnav.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-horizontal-subnav.png
index 5a49f665a2..b9c1e5b143 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-horizontal-subnav.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-horizontal-subnav.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-bottom.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-bottom.png
index 207a2647ed..a3a35ca1c2 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-bottom.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-bottom.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-group.png b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-group.png
index 76a28fd172..24832ac0ff 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-group.png and b/packages/documentation-site/patternfly-docs/generated/components/page/html-demos/sticky-section-group.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/context-selectorperspective-switcher-in-sidebar.png b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/context-selectorperspective-switcher-in-sidebar.png
index 07ba701355..c2b2ccbe26 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/context-selectorperspective-switcher-in-sidebar.png and b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/context-selectorperspective-switcher-in-sidebar.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-breadcrumb-with-breakpoints.png b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-breadcrumb-with-breakpoints.png
index 978e0d908e..66bfa68c21 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-breadcrumb-with-breakpoints.png and b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-breadcrumb-with-breakpoints.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group-alternate-syntax.png b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group-alternate-syntax.png
index 4d2e1ff83f..7315150ef1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group-alternate-syntax.png and b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group-alternate-syntax.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group.png b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group.png
index 4d2e1ff83f..7315150ef1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group.png and b/packages/documentation-site/patternfly-docs/generated/components/page/react-demos/sticky-section-group.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/skeleton/html-demos/skeleton-card.png b/packages/documentation-site/patternfly-docs/generated/components/skeleton/html-demos/skeleton-card.png
index ce4d615975..0f7792249a 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/skeleton/html-demos/skeleton-card.png and b/packages/documentation-site/patternfly-docs/generated/components/skeleton/html-demos/skeleton-card.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/skeleton/react-demos/skeleton-card.png b/packages/documentation-site/patternfly-docs/generated/components/skeleton/react-demos/skeleton-card.png
index 8181372ba0..83560be89d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/skeleton/react-demos/skeleton-card.png and b/packages/documentation-site/patternfly-docs/generated/components/skeleton/react-demos/skeleton-card.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/basic.png
index 9965314ddb..e56065b106 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/cell-with-image-alignment.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/cell-with-image-alignment.png
index 8c572c6757..bca8b6862b 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/cell-with-image-alignment.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/cell-with-image-alignment.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/column-management-modal.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/column-management-modal.png
index 2eff0e3b1e..3573f3c629 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/column-management-modal.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/column-management-modal.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compact.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compact.png
index 9512443c6c..92e1880528 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compact.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compact.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compound-expansion.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compound-expansion.png
index 85778d52e5..c8c2a8a04c 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compound-expansion.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/compound-expansion.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/empty-state.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/empty-state.png
index b180dd15df..1deef2e025 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/empty-state.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/empty-state.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/expandable.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/expandable.png
index b197352e71..03331dd1bf 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/expandable.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/expandable.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/loading-state-demo.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/loading-state-demo.png
index 8eda3af3ea..6b8f6cd813 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/loading-state-demo.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/loading-state-demo.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sortable.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sortable.png
index 406a8e8d74..e26b1b5ba8 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sortable.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sortable.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/static-bottom-pagination.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/static-bottom-pagination.png
index c528f1b9c6..a97c8caffc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/static-bottom-pagination.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/static-bottom-pagination.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-first-column.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-first-column.png
index 757a8c25a1..101f34b95e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-first-column.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-first-column.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-last-column.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-last-column.png
index ffaa3e6fb8..37a8db5dc6 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-last-column.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-last-column.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-multiple-columns.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-multiple-columns.png
index 0ed2fa2b32..6d6e92916e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-multiple-columns.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header-and-multiple-columns.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header.png
index 3f95e4dfb7..9452e24e80 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-header.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-multiple-columns.png b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-multiple-columns.png
index aa8d169ba0..3e58477645 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-multiple-columns.png and b/packages/documentation-site/patternfly-docs/generated/components/table/html-demos/sticky-multiple-columns.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/bulk-select.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/bulk-select.png
index 98a0cee3dc..b8ef2de403 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/bulk-select.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/bulk-select.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management-with-draggable.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management-with-draggable.png
index e9e8e24b5e..ce79226772 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management-with-draggable.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management-with-draggable.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management.png
index e9e8e24b5e..ce79226772 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/column-management.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compact.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compact.png
index bb364407ac..a7138c5a83 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compact.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compact.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compound-expansion.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compound-expansion.png
index 8c6a2ef9d5..561affac14 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compound-expansion.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/compound-expansion.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/empty.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/empty.png
index a5f6813770..2f3ae5ef89 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/empty.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/empty.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/error.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/error.png
index 485d1012a3..3d81d14224 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/error.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/error.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/expandcollapse-all.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/expandcollapse-all.png
index 293155dd38..9eb942c314 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/expandcollapse-all.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/expandcollapse-all.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/filterable.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/filterable.png
index 773e43be3c..b1e8a531ba 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/filterable.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/filterable.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/loading.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/loading.png
index 3cc7d4e809..00ae4468cd 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/loading.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/loading.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sortable---responsive.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sortable---responsive.png
index 8f32f36f21..1d667c0eaf 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sortable---responsive.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sortable---responsive.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/static-bottom-pagination-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/static-bottom-pagination-on-mobile.png
index 5abb93f3ff..f9c75cb2d7 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/static-bottom-pagination-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/static-bottom-pagination-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-first-column.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-first-column.png
index a56d3ac313..6f9d8837f8 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-first-column.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-first-column.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-header.png b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-header.png
index 2920812ff7..1801ca5336 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-header.png and b/packages/documentation-site/patternfly-docs/generated/components/table/react-demos/sticky-header.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/modal-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/modal-tabs.png
index e5302f6ef2..ab3e3c9c37 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/modal-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/modal-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-tabs.png
index 20f2895cb1..6d757b4629 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-unindented-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-unindented-tabs.png
index 724030f216..ce29eb7679 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-unindented-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/nested-unindented-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs-with-secondary-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs-with-secondary-tabs.png
index 96c146a587..5f85f710a1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs-with-secondary-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs-with-secondary-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs.png
index 390f4e38d5..bdb4effd6f 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/open-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/tables-and-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/tables-and-tabs.png
index f2e4fbe8e2..48d2d78105 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/tables-and-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/html-demos/tables-and-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/modal-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/modal-tabs.png
index 0b424136b5..a1662d5cd9 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/modal-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/modal-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-tabs.png
index 9cdeb611c2..b30f80a5c7 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-unindented-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-unindented-tabs.png
index d08b34d31c..98129fe252 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-unindented-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/nested-unindented-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs-with-secondary-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs-with-secondary-tabs.png
index 80d222e006..d7ff146471 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs-with-secondary-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs-with-secondary-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs.png
index 67246a33ab..8f16058bab 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/open-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/tables-and-tabs.png b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/tables-and-tabs.png
index 332695566f..f0feea0df6 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/tables-and-tabs.png and b/packages/documentation-site/patternfly-docs/generated/components/tabs/react-demos/tables-and-tabs.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-pagination-management-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-pagination-management-on-mobile.png
index 352b21db2b..15663689f4 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-pagination-management-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-pagination-management-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-with-validation-on-desktop.png b/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-with-validation-on-desktop.png
index 2cfbfb2a03..d9070951d3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-with-validation-on-desktop.png and b/packages/documentation-site/patternfly-docs/generated/components/toolbar/html-demos/toolbar-with-validation-on-desktop.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/toolbar/react-demos/console-log-viewer-toolbar-demo.png b/packages/documentation-site/patternfly-docs/generated/components/toolbar/react-demos/console-log-viewer-toolbar-demo.png
index 411d6ab690..beb94331c2 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/toolbar/react-demos/console-log-viewer-toolbar-demo.png and b/packages/documentation-site/patternfly-docs/generated/components/toolbar/react-demos/console-log-viewer-toolbar-demo.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/basic.png
index ad25554490..e935f95912 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page-nav-expanded-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page-nav-expanded-mobile.png
index 406bb3c5e7..272ef9f589 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page-nav-expanded-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page-nav-expanded-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page.png
index 406bb3c5e7..272ef9f589 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/in-page.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/nav-expanded-mobile.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/nav-expanded-mobile.png
index ad25554490..e935f95912 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/nav-expanded-mobile.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/nav-expanded-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-and-informational-step.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-and-informational-step.png
index f6df3981f0..de805b78ac 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-and-informational-step.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-and-informational-step.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-closed.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-closed.png
index ad25554490..e935f95912 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-closed.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-closed.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-expanded.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-expanded.png
index 4ffb0f1da1..2a65add94e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-expanded.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page-expanded.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page-expanded.png
index 6597aa1c15..b5925b907e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page-expanded.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page-expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page.png
index 406bb3c5e7..272ef9f589 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html-demos/with-drawer-in-page.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/html/with-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/html/with-drawer.png
index 29896d38ff..2470445741 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/html/with-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/html/with-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer-and-informational-step.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer-and-informational-step.png
index b604472431..778fdbda27 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer-and-informational-step.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer-and-informational-step.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer.png
index efa85709f5..79e260eaf8 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal-with-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal.png
index 9aecaf39a0..f26a93eb8a 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-modal.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer-and-informational-step.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer-and-informational-step.png
index 9bcb849347..120722776d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer-and-informational-step.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer-and-informational-step.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer.png
index bc1e75a4e9..850ac536bf 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page-with-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page.png b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page.png
index 8f46e4fc1e..ade906ae62 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page.png and b/packages/documentation-site/patternfly-docs/generated/components/wizard/react-demos/in-page.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/fullscreen-catalog-page.png b/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/fullscreen-catalog-page.png
index 8bd1f2a45f..76fcf22608 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/fullscreen-catalog-page.png and b/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/fullscreen-catalog-page.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/quick-starts-with-custom-drawer.png b/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/quick-starts-with-custom-drawer.png
index c8f85fe94a..8cd7f5fdf3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/quick-starts-with-custom-drawer.png and b/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/Basic-Quick-Starts/quick-starts-with-custom-drawer.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/In-App-Documentation/fullscreen-help-topic.png b/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/In-App-Documentation/fullscreen-help-topic.png
index 2122c18e38..200a7347fd 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/In-App-Documentation/fullscreen-help-topic.png and b/packages/documentation-site/patternfly-docs/generated/extensions/quick-starts/In-App-Documentation/fullscreen-help-topic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/card-view/html-demos/card-view.png b/packages/documentation-site/patternfly-docs/generated/patterns/card-view/html-demos/card-view.png
index e025d77134..e9ef8b0bd1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/card-view/html-demos/card-view.png and b/packages/documentation-site/patternfly-docs/generated/patterns/card-view/html-demos/card-view.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/card-view/react-demos/card-view.png b/packages/documentation-site/patternfly-docs/generated/patterns/card-view/react-demos/card-view.png
index c4992c2647..515616f32b 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/card-view/react-demos/card-view.png and b/packages/documentation-site/patternfly-docs/generated/patterns/card-view/react-demos/card-view.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/dashboard/html-demos/basic.png b/packages/documentation-site/patternfly-docs/generated/patterns/dashboard/html-demos/basic.png
index 28392e664f..38c4fc9c8d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/dashboard/html-demos/basic.png and b/packages/documentation-site/patternfly-docs/generated/patterns/dashboard/html-demos/basic.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/inline-modifier.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/inline-modifier.png
index 31bd14367b..a0b2425bc1 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/inline-modifier.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/inline-modifier.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-data-list-expanded-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-data-list-expanded-on-mobile.png
index 5a9fb0b09e..c699f9351b 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-data-list-expanded-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-data-list-expanded-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-simple-list-expanded-on-mobile.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-simple-list-expanded-on-mobile.png
index 3c907dc4b4..d8333142b3 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-simple-list-expanded-on-mobile.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-simple-list-expanded-on-mobile.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-view-expanded.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-view-expanded.png
index dbf3427b1c..d43ae2d396 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-view-expanded.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-card-view-expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-collapsed.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-collapsed.png
index 0407f7b31d..cc3faed2ad 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-collapsed.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-collapsed.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-content-body-padding.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-content-body-padding.png
index 8bd9f0be3f..2f11214798 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-content-body-padding.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-content-body-padding.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-expanded.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-expanded.png
index 41b2a50124..06077544b0 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-expanded.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/html-demos/primary-detail-expanded.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-card-view.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-card-view.png
index 278da4a396..a9f332d2b4 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-card-view.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-card-view.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-content-padding.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-content-padding.png
index 4d48ba8df3..07903fc1cc 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-content-padding.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-content-padding.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-data-list-in-card.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-data-list-in-card.png
index b876aa1967..806eb3b32d 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-data-list-in-card.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-data-list-in-card.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-full-page.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-full-page.png
index e976553bdd..ea2d560cc2 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-full-page.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-full-page.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-inline-modifier.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-inline-modifier.png
index e976553bdd..ea2d560cc2 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-inline-modifier.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-inline-modifier.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-simple-list-in-card.png b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-simple-list-in-card.png
index c5fc34c465..9cb15d8009 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-simple-list-in-card.png and b/packages/documentation-site/patternfly-docs/generated/patterns/primary-detail/react-demos/primary-detail-simple-list-in-card.png differ
diff --git a/packages/documentation-site/patternfly-docs/generated/patterns/right-to-left/react-demos/paginated-table.png b/packages/documentation-site/patternfly-docs/generated/patterns/right-to-left/react-demos/paginated-table.png
index 40287dcfd0..2c784de43e 100644
Binary files a/packages/documentation-site/patternfly-docs/generated/patterns/right-to-left/react-demos/paginated-table.png and b/packages/documentation-site/patternfly-docs/generated/patterns/right-to-left/react-demos/paginated-table.png differ
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/about-patternfly.md b/packages/documentation-site/patternfly-docs/pages/about-us.md
similarity index 97%
rename from packages/documentation-site/patternfly-docs/content/get-started/about-patternfly.md
rename to packages/documentation-site/patternfly-docs/pages/about-us.md
index c84b0ffc3e..547e500931 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/about-patternfly.md
+++ b/packages/documentation-site/patternfly-docs/pages/about-us.md
@@ -1,10 +1,9 @@
 ---
-id: About PatternFly
-title: About PatternFly
-section: get-started
+id: About us
+title: About us
 ---
 
-import './get-started.css';
+import '../content/get-started/get-started.css';
 import { Button, Card, CardHeader, CardTitle, CardBody, CardFooter, Divider, Icon, Grid, GridItem, PageSection, Split, SplitItem, Title, Tooltip, Content, ContentVariants } from '@patternfly/react-core';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import { Link } from '@patternfly/documentation-framework/components';
@@ -37,7 +36,6 @@ Now that you've been introduced to PatternFly, you're ready to start designing o
 <Grid sm={12} md={4} hasGutter>
 <Button size="lg" variant="secondary" component="a" href="/get-started/design"> Start designing </Button>
 <Button size="lg" variant="secondary" component="a" href="/get-started/develop"> Start developing </Button>
-<Button size="lg" variant="secondary" component="a" href="/get-started/contribute"> Contribute to PatternFly</Button>
 </Grid>
 
 ## Join the community
@@ -141,7 +139,7 @@ Minor feature releases will be available quarterly to introduce non-breaking cha
 Significant changes to our components and design tokens are first released in beta. You can identify these features by the blue "beta" label in our site's navigation or in an alert within related documentation. Beta features are subject to change based on user feedback and are only promoted to fully-supported status once they are stable and thoroughly tested.
 
 <div class="ws-docs-content-img">
-![Blue, pill-shaped label that says "Beta", with a black text bubble beside the label.](./img/beta-tooltip.svg)
+![Blue, pill-shaped label that says "Beta", with a black text bubble beside the label.](../content/get-started/img/beta-tooltip.svg)
 </div>
 
 The API, visuals, or underlying code for a beta feature can receive breaking changes as we gather feedback. This includes changes to a component's CSS class names or React properties, as well as changes to specific token values for a visual theme. Once a feature is promoted out of beta, we will not make further breaking changes outside of a planned major release.
@@ -157,7 +155,7 @@ Occasionally, a component page will contain a "React next" tab, which contains d
 Deprecated components will typically be available to use until the next major release, after which no documentation will be included on the current release website.
 
 <div class="ws-docs-content-img">
-![Onsite deprecated component messages](./img/deprecated-component.png)
+![Onsite deprecated component messages](../content/get-started/img/deprecated-component.png)
 </div>
 
 Deprecation includes: 
diff --git a/packages/documentation-site/patternfly-docs/pages/home.js b/packages/documentation-site/patternfly-docs/pages/home.js
index a433fb0677..e8c77bb338 100644
--- a/packages/documentation-site/patternfly-docs/pages/home.js
+++ b/packages/documentation-site/patternfly-docs/pages/home.js
@@ -30,13 +30,13 @@ const cardData = [
   {
     title: 'Upgrade to PatternFly 6',
     body: 'Reference our upgrade guide to learn how you can update to the latest version of PatternFly.',
-    link: '/get-started/upgrade',
+    link: '/releases/upgrade-guide',
     layout: 'withSubtitle',
   },
   {
     title: 'Read our latest release highlights',
     body: 'Stay informed about every PatternFly release by reading through our highlights, which lay out important code changes and design updates.',
-    link: '/get-started/release-highlights',
+    link: '/releases/release-highlights',
     layout: 'withSubtitle',
   },
   {
diff --git a/packages/documentation-site/patternfly-docs/pages/landing-pages/layouts/layouts.md b/packages/documentation-site/patternfly-docs/pages/landing-pages/layouts/layouts.md
index bfe93a5da0..39737f7b3a 100644
--- a/packages/documentation-site/patternfly-docs/pages/landing-pages/layouts/layouts.md
+++ b/packages/documentation-site/patternfly-docs/pages/landing-pages/layouts/layouts.md
@@ -1,6 +1,6 @@
 ---
-id: About layouts
-title: Layouts
+id: Overview
+title: Layouts overview
 section: layouts
 sortValue: 1
 ---
@@ -8,7 +8,7 @@ sortValue: 1
 import { SectionGallery } from '@patternfly/documentation-framework/components/sectionGallery/sectionGallery';
 import layoutsData from './layouts-data.json';
 
-# About
+# Overview
 
 PatternFly’s layouts are used to place components on a page. They create a fully responsive structure to keep components organized and aligned across screen sizes. 
 
diff --git a/packages/documentation-site/patternfly-docs/patternfly-docs.config.js b/packages/documentation-site/patternfly-docs/patternfly-docs.config.js
index b1f7f77705..5f78c9f398 100644
--- a/packages/documentation-site/patternfly-docs/patternfly-docs.config.js
+++ b/packages/documentation-site/patternfly-docs/patternfly-docs.config.js
@@ -1,4 +1,4 @@
-const componentsData = require('./pages/landing-pages/components/components-data.json');
+const componentsData = require('./content/components/landing-page/components-data.json');
 // This module is shared between NodeJS and babelled ES5, if this extension only build
 // exclude the other side nav items.
 if (process.env.EXTENSIONS_ONLY === 'true') {
@@ -34,22 +34,28 @@ if (process.env.EXTENSIONS_ONLY === 'true') {
     hasHighContrastSwitcher: true,
     componentsData,
     sideNavItems: [
-      { section: 'get-started' },
-      { section: 'design-foundations' },
-      { section: 'tokens' },
-      { section: 'PatternFly-AI' },
-      { section: 'accessibility' },
-      { section: 'UX writing' },
-      { section: 'components' },
-      { section: 'patterns' },
-      { section: 'extensions' },
-      { section: 'Component groups'},
-      { section: 'charts' },
-      { section: 'topology' },
-      { section: 'layouts' },
-      { section: 'utility-classes' },
-      { section: 'developer-resources' },
-      { section: 'training' },
+      {
+        title: 'Learn',
+        items: [
+          { text: 'About us', href: '/about-us' },
+          { section: 'get-started' },
+          { section: 'releases' }
+        ],
+        hasDivider: true
+      },
+      {
+        title: 'Design and develop',
+        items: [
+          { section: 'components' },
+          { section: 'patterns' },
+          { section: 'extensions' },
+          { section: 'foundations-and-styles' },
+          { section: 'accessibility' },
+          { section: 'AI' },
+          { section: 'content-design' },
+          { section: 'developer-guides' }
+        ]
+      }
     ],
     topNavItems: [],
     port: 8003,
diff --git a/packages/documentation-site/patternfly-docs/patternfly-docs.source.js b/packages/documentation-site/patternfly-docs/patternfly-docs.source.js
index 00854cf24a..1e825723f7 100644
--- a/packages/documentation-site/patternfly-docs/patternfly-docs.source.js
+++ b/packages/documentation-site/patternfly-docs/patternfly-docs.source.js
@@ -6,26 +6,30 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
 
   const contentBase = path.join(__dirname, '../patternfly-docs/content');
   const reactPropsIgnore = ['/**/examples/**', '/**/__mocks__/**', '/**/__tests__/**', '/**/*.test.tsx'];
-  sourceMD(path.join(contentBase, 'extensions/**/*.md'), 'extensions');
+  sourceMD(path.join(contentBase, 'extensions/**/*.md'), 'design-guidelines');
   if (!(process.env.EXTENSIONS_ONLY === 'true')) {
     sourceMD(path.join(contentBase, 'contribute/**/*.md'), 'pages-contribute');
     sourceMD(path.join(contentBase, 'get-started/**/*.md'), 'pages-get-started');
-    sourceMD(path.join(contentBase, 'developer-resources/**/*.md'), 'developer-resources');
+    sourceMD(path.join(contentBase, 'developer-guides/**/*.md'), 'developer-guides');
     sourceMD(path.join(contentBase, 'accessibility/**/*.md'), 'accessibility');
-    sourceMD(path.join(contentBase, 'design-guidelines/**/*.md'), 'design-guidelines');
-    sourceMD(path.join(contentBase, 'training/**/*.md'), 'training');
-
-    sourceMD(path.join(contentBase, 'tokens/**/*.md'), 'tokens');
-
-    sourceMD(path.join(contentBase, 'PatternFly-AI/**/*.md'), 'PatternFly-AI');
-
-    sourceMD(path.join(contentBase, 'design-guidelines/**/Animations/*.md'), 'demo');
-
-    sourceMD(path.join(contentBase, 'layouts/**/*.md'), 'layouts');
-
-    // Gallery pages
-    const galleryBase = path.join(__dirname, '../patternfly-docs/pages');
-    sourceMD(path.join(galleryBase, 'landing-pages/**/*.md'), 'landing-pages');
+    sourceMD(path.join(contentBase, 'components/accessibility/**/*.md'), 'accessibility');
+    sourceMD(path.join(contentBase, 'components/**/*.md'), 'design-guidelines');
+    sourceMD(path.join(contentBase, 'content-design/**/*.md'), 'content-design');
+    sourceMD(path.join(contentBase, 'foundations-and-styles/**/*.md'), 'design-guidelines');
+    sourceMD(path.join(contentBase, 'patterns/**/*.md'), 'design-guidelines');
+    sourceMD(path.join(contentBase, 'get-started/training/**/*.md'), 'get-started');
+    sourceMD(path.join(contentBase, 'releases/**/*.md'), 'releases');
+
+    sourceMD(path.join(contentBase, 'AI/**/*.md'), 'AI');
+
+    // Landing pages (now in their respective content folders)
+    sourceMD(path.join(contentBase, 'components/landing-page/**/*.md'), 'components');
+    sourceMD(path.join(contentBase, 'extensions/landing-page/**/*.md'), 'extensions');
+    sourceMD(path.join(contentBase, 'patterns/landing-page/**/*.md'), 'patterns');
+    
+    // Standalone pages
+    const pagesBase = path.join(__dirname, '../patternfly-docs/pages');
+    sourceMD(path.join(pagesBase, 'about-us.md'), 'pages-overview');
 
     // Org demos
     sourceMD(path.join(contentBase, 'demos/**/*.md'), 'org-demos');
@@ -40,14 +44,14 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
     const designTokensPath = require
       .resolve('@patternfly/design-tokens/package.json')
       .replace('package.json', 'patternfly-docs/content');
-    sourceMD(path.join(designTokensPath, '/*.md'), 'tokens');
+    sourceMD(path.join(designTokensPath, '/*.md'), 'foundations-and-styles');
 
     // Core MD
     const coreDocsPath = require.resolve('@patternfly/patternfly/package.json').replace('package.json', 'docs');
     const coreDocsIgnore = path.join(coreDocsPath, '/pages/**'); // Compatibility for old gatsby workspace
-    sourceMD(path.join(coreDocsPath, '!(demos)/**/examples/**/*.md'), 'html', coreDocsIgnore);
-    sourceMD(path.join(coreDocsPath, 'demos/**/*.md'), 'html-demos', coreDocsIgnore);
-    sourceMD(path.join(coreDocsPath, 'components/**/deprecated/**/*.md'), 'html-deprecated', coreDocsIgnore);
+    sourceMD(path.join(coreDocsPath, '!(demos)/**/examples/**/*.{md,mdx}'), 'html', coreDocsIgnore);
+    sourceMD(path.join(coreDocsPath, 'demos/**/*.{md,mdx}'), 'html-demos', coreDocsIgnore);
+    sourceMD(path.join(coreDocsPath, 'components/**/deprecated/**/*.{md,mdx}'), 'html-deprecated', coreDocsIgnore);
 
     // React props
     const reactCorePath = require.resolve('@patternfly/react-core/package.json').replace('package.json', 'src');
@@ -166,7 +170,10 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
 
   sourceProps(path.join(reactUserFeedbackPath, '/**/*.tsx'), reactPropsIgnore);
   sourceMD(path.join(reactUserFeedbackPath, '/**/examples/*.md'), 'react');
-  sourceMD(path.join(reactUserFeedbackPath, '/**/design-guidelines/*.md'), 'design-guidelines');
+  sourceMD(
+    path.join(reactUserFeedbackPath, "/**/components/*.md"),
+    "components"
+  );
 
   // component groups extension
   const reactComponentGroupsPath = require
@@ -180,7 +187,10 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
   sourceProps(path.join(reactComponentGroupsPath, '/**/*.tsx'), reactPropsIgnore);
   sourceMD(path.join(reactComponentGroupsBase, '/**/*.md'), 'react');
   sourceMD(path.join(reactComponentGroupsPath, '/**/examples/*.md'), 'react');
-  sourceMD(path.join(reactComponentGroupsPath, '/**/design-guidelines/*.md'), 'design-guidelines');
+  sourceMD(
+    path.join(reactComponentGroupsPath, "/**/components/*.md"),
+    "components"
+  );
 
   // Chatbot
   const virtualAssistantPath = require.resolve('@patternfly/chatbot/package.json').replace('package.json', 'src');
@@ -189,9 +199,12 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
     .resolve('@patternfly/chatbot/package.json')
     .replace('package.json', 'patternfly-docs/content/extensions/chatbot');
 
-  sourceProps(path.join(virtualAssistantPath, '/**/*.tsx'), reactPropsIgnore);
-  sourceMD(path.join(virtualAssistantBase, 'examples/**/*.md'), 'PatternFly-AI');
-  sourceMD(path.join(virtualAssistantBase, '*.md'), 'PatternFly-AI');
+  sourceProps(
+    path.join(virtualAssistantPath, "/**/*.tsx"),
+    reactPropsIgnore
+  );
+  sourceMD(path.join(virtualAssistantBase, 'examples/**/*.md'), 'extensions');
+  sourceMD(path.join(virtualAssistantBase, '*.md'), 'extensions');
 
   // Prerelease sections:
   if (process.env.PRERELEASE === 'true') {
diff --git a/yarn.lock b/yarn.lock
index ef02903bcf..41d325fc2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4159,15 +4159,10 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@patternfly/chatbot@npm:6.5.0-prerelease.10":
-  version: 6.5.0-prerelease.10
-  resolution: "@patternfly/chatbot@npm:6.5.0-prerelease.10"
+"@patternfly/chatbot@npm:6.5.0-prerelease.18":
+  version: 6.5.0-prerelease.18
+  resolution: "@patternfly/chatbot@npm:6.5.0-prerelease.18"
   dependencies:
-    "@patternfly/react-code-editor": "npm:^6.1.0"
-    "@patternfly/react-core": "npm:^6.1.0"
-    "@patternfly/react-icons": "npm:^6.1.0"
-    "@patternfly/react-styles": "npm:^6.1.0"
-    "@patternfly/react-table": "npm:^6.1.0"
     "@segment/analytics-next": "npm:^1.76.0"
     clsx: "npm:^2.1.0"
     monaco-editor: "npm:^0.54.0"
@@ -4183,20 +4178,20 @@ __metadata:
   peerDependencies:
     react: ^18 || ^19
     react-dom: ^18 || ^19
-  checksum: 10c0/e38c522b57542706bd302593f93f72f3e1aa7f09c4611451fd49632b419b175db1c39b854e4ca32ff770ce2530da6f4d61605444750f630e3c309579c93d12cb
+  checksum: 10c0/84e9e3642f277079a61e392c1f839fec1e32ea4a6937690f6094c8e87667041dc56f6e1081f717ef6aed58669fc70f773e0623e767bada80ef79c1ecfdf3dee0
   languageName: node
   linkType: hard
 
-"@patternfly/design-tokens@npm:1.14.4":
-  version: 1.14.4
-  resolution: "@patternfly/design-tokens@npm:1.14.4"
+"@patternfly/design-tokens@npm:1.14.5":
+  version: 1.14.5
+  resolution: "@patternfly/design-tokens@npm:1.14.5"
   dependencies:
     "@patternfly/react-core": "npm:^6.1"
     commander: "npm:^12.0.0"
   peerDependencies:
     react: ^17 || ^18
     react-dom: ^18.0.0
-  checksum: 10c0/4e97d94a5cfb6a426257cdc585bd7f2db1eaf723bdb171b0c10cb911b4b6efcc70c5ff5fc5be3dca585a050a4f21434a403370ec1fd7ba129c2dd77a3d75191f
+  checksum: 10c0/19b8d60e82e211cf068985312d886d8d8f43eb05a01ac30ff340357feac409da48e061dc632039d3454307a8b044f741ed38362a5e6d26447999d6ca3f4fa513
   languageName: node
   linkType: hard
 
@@ -4261,10 +4256,10 @@ __metadata:
     webpack-dev-server: "npm:5.2.2"
     webpack-merge: "npm:5.8.0"
   peerDependencies:
-    "@patternfly/patternfly": ^6.5.0-prerelease.23
-    "@patternfly/react-code-editor": ^6.5.0-prerelease.11
-    "@patternfly/react-core": ^6.5.0-prerelease.11
-    "@patternfly/react-table": ^6.5.0-prerelease.11
+    "@patternfly/patternfly": ^6.5.0-prerelease.27
+    "@patternfly/react-code-editor": ^6.5.0-prerelease.13
+    "@patternfly/react-core": ^6.5.0-prerelease.13
+    "@patternfly/react-table": ^6.5.0-prerelease.13
     react: ^17.0.0 || ^18.0.0
     react-dom: ^17.0.0 || ^18.0.0
   bin:
@@ -4341,10 +4336,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/patternfly@npm:6.5.0-prerelease.19":
-  version: 6.5.0-prerelease.19
-  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.19"
-  checksum: 10c0/581e18b078e146ad72553f8fb1177ffe84e7bfbeb5920f8e7ce7da22dd9c9334fee850cf7e8fe274a8dee72a9b1608aad5cbcc5679b52275970e2801669f56ab
+"@patternfly/patternfly@npm:6.5.0-prerelease.27, @patternfly/patternfly@npm:^6.5.0-prerelease.27":
+  version: 6.5.0-prerelease.27
+  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.27"
+  checksum: 10c0/2e36c0dbcb6824d30b6074a48e64dff1f823be6164e2ef0a92fab901876567c6660c6be4e99b0df170f80a271c3abcea4925f87fd36f66a2d46a06171f8a1fc3
   languageName: node
   linkType: hard
 
@@ -4355,13 +4350,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/patternfly@npm:^6.5.0-prerelease.23":
-  version: 6.5.0-prerelease.23
-  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.23"
-  checksum: 10c0/d3358b7293f5e8478c622cb6b3e1554fc62ee371b2df2af9536eff418f8c0454c4b517e5b4f6805eb1e7d47204aef9202c86c2efe209658953b256f59c154aed
-  languageName: node
-  linkType: hard
-
 "@patternfly/quickstarts@npm:6.4.0":
   version: 6.4.0
   resolution: "@patternfly/quickstarts@npm:6.4.0"
@@ -4390,12 +4378,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-charts@npm:8.5.0-prerelease.4, @patternfly/react-charts@npm:^8.5.0-prerelease.4":
-  version: 8.5.0-prerelease.4
-  resolution: "@patternfly/react-charts@npm:8.5.0-prerelease.4"
+"@patternfly/react-charts@npm:8.5.0-prerelease.6, @patternfly/react-charts@npm:^8.5.0-prerelease.6":
+  version: 8.5.0-prerelease.6
+  resolution: "@patternfly/react-charts@npm:8.5.0-prerelease.6"
   dependencies:
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.4"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.6"
     hoist-non-react-statics: "npm:^3.3.2"
     lodash: "npm:^4.17.21"
     tslib: "npm:^2.8.1"
@@ -4457,30 +4445,30 @@ __metadata:
       optional: true
     victory-zoom-container:
       optional: true
-  checksum: 10c0/4181392eed8f21761b6b02ecd4113a02081871317dfebef01eddf27cef4cb861115b1ec6c8aaa5759634023cda3dae0f55bc8ff56bbe40ae623a82e26035cf9d
+  checksum: 10c0/bb97ed32f0c03356cf15ad233dedbab5380ad5c5440adaa9a8cc3d0b46812b3e962996b5ca899d007b41d8e71c91465f66154fc58188f4776a6b962be69655e9
   languageName: node
   linkType: hard
 
-"@patternfly/react-code-editor@npm:^6.5.0-prerelease.11":
-  version: 6.5.0-prerelease.11
-  resolution: "@patternfly/react-code-editor@npm:6.5.0-prerelease.11"
+"@patternfly/react-code-editor@npm:^6.5.0-prerelease.13":
+  version: 6.5.0-prerelease.13
+  resolution: "@patternfly/react-code-editor@npm:6.5.0-prerelease.13"
   dependencies:
     "@monaco-editor/react": "npm:^4.7.0"
-    "@patternfly/react-core": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-icons": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
+    "@patternfly/react-core": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-icons": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
     react-dropzone: "npm:14.3.5"
     tslib: "npm:^2.8.1"
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/ed9faa0747ab04e0626465cc838a8ee1ece8ead77aa98faad3b5be614414fe3e944e95c3b8559ccf43da1f334c6bb9877dfc822ae4fd517bc0edac81669a49ab
+  checksum: 10c0/cc8454a00ee017979f1454db9fac681ee6aecf1505cf64d0c167b868dfd8f578d4c703013b5a695d2d19866b33daa74282e6972f0b79b8511eb85b517d59d7e1
   languageName: node
   linkType: hard
 
-"@patternfly/react-component-groups@npm:6.4.0":
-  version: 6.4.0
-  resolution: "@patternfly/react-component-groups@npm:6.4.0"
+"@patternfly/react-component-groups@npm:6.4.0-prerelease.6":
+  version: 6.4.0-prerelease.6
+  resolution: "@patternfly/react-component-groups@npm:6.4.0-prerelease.6"
   dependencies:
     "@patternfly/react-core": "npm:^6.0.0"
     "@patternfly/react-icons": "npm:^6.0.0"
@@ -4491,7 +4479,7 @@ __metadata:
     "@patternfly/react-drag-drop": ^6.0.0
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/97e6e910206b6c4c0e04a44b1b62fb7dbf24538aa367e01948abe0b27ae3f58a0b2316d150a22a885a566c10e065093388111710dd45a7a5d85817aabfb05b50
+  checksum: 10c0/8ad71a543489299cb7075d3829402d1c10bb62e3a817502f822f4ee3d4f73b8ac45e6ed99e3cfdd5ddbbfeb543dbb7af3c12a098212c77d02d491a07a802fdb4
   languageName: node
   linkType: hard
 
@@ -4530,20 +4518,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-core@npm:^6.5.0-prerelease.11":
-  version: 6.5.0-prerelease.11
-  resolution: "@patternfly/react-core@npm:6.5.0-prerelease.11"
+"@patternfly/react-core@npm:^6.5.0-prerelease.13":
+  version: 6.5.0-prerelease.13
+  resolution: "@patternfly/react-core@npm:6.5.0-prerelease.13"
   dependencies:
-    "@patternfly/react-icons": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.4"
+    "@patternfly/react-icons": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.6"
     focus-trap: "npm:7.6.4"
     react-dropzone: "npm:^14.3.5"
     tslib: "npm:^2.8.1"
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/9a9007c0bd3ee4df2b3af65da2cc2632c2571cb1a221d040bbc4d2d11a9f0ff05b3e76f35d0bb5ef380ffbc381953e3b9783b54114c89495f9a44a3aa94cb40d
+  checksum: 10c0/3779981205279b6248ea5d7a180e62d2e74837f2749b499dc7f8299a704c687344fa4dd9fa497ddd2174440e715d7a1c00852643c7ce1aff918b54d9267c157d
   languageName: node
   linkType: hard
 
@@ -4564,23 +4552,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-docs@npm:7.5.0-prerelease.12":
-  version: 7.5.0-prerelease.12
-  resolution: "@patternfly/react-docs@npm:7.5.0-prerelease.12"
+"@patternfly/react-docs@npm:7.5.0-prerelease.14":
+  version: 7.5.0-prerelease.14
+  resolution: "@patternfly/react-docs@npm:7.5.0-prerelease.14"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.19"
-    "@patternfly/react-charts": "npm:^8.5.0-prerelease.4"
-    "@patternfly/react-code-editor": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-core": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-drag-drop": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-icons": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-table": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-templates": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.4"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.27"
+    "@patternfly/react-charts": "npm:^8.5.0-prerelease.6"
+    "@patternfly/react-code-editor": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-core": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-drag-drop": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-icons": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-table": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-templates": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.6"
     echarts: "npm:^5.6.0 || ^6.0.0"
     victory: "npm:^37.3.6"
-  checksum: 10c0/3a10288bd792bf80dee4fe4bae0bf3c227f7f522b987b3738ee53f06e2d50e8c041cbd1494ffbf9bb08386dec6458c19cc5f56f0d2ae4c984f83cc4978caf1f9
+  checksum: 10c0/54108aa29c5e63e11d94fbbcc617e5051313f95942ebaf1ba82c680432ae2083cbeee9c525bb30a22c0f5bc4e6136507f649811ad426c8a54001b47e2507b3be
   languageName: node
   linkType: hard
 
@@ -4602,25 +4590,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-drag-drop@npm:^6.5.0-prerelease.11":
-  version: 6.5.0-prerelease.11
-  resolution: "@patternfly/react-drag-drop@npm:6.5.0-prerelease.11"
+"@patternfly/react-drag-drop@npm:^6.5.0-prerelease.13":
+  version: 6.5.0-prerelease.13
+  resolution: "@patternfly/react-drag-drop@npm:6.5.0-prerelease.13"
   dependencies:
     "@dnd-kit/core": "npm:^6.3.1"
     "@dnd-kit/modifiers": "npm:^9.0.0"
     "@dnd-kit/sortable": "npm:^10.0.0"
-    "@patternfly/react-core": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-icons": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
+    "@patternfly/react-core": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-icons": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
     resize-observer-polyfill: "npm:^1.5.1"
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/4d36a37abcca3b5e407f6890749b508e64696d6061e3b8b3905e5d628df958f2bf45954c59fa9158f20f3b92f03ce82251652186bbd3a1d393834275b4953407
+  checksum: 10c0/473e64177bfb38553937acdca0c1f3b171be47699b1ee5ee8ebe7f09dd9b8dfc7ae518568b7af74cbd31375a979d5a883977ce2fabc57117485eac67913d7a88
   languageName: node
   linkType: hard
 
-"@patternfly/react-icons@npm:^6.0.0, @patternfly/react-icons@npm:^6.0.0-prerelease.7, @patternfly/react-icons@npm:^6.1.0, @patternfly/react-icons@npm:^6.3.1":
+"@patternfly/react-icons@npm:^6.0.0, @patternfly/react-icons@npm:^6.0.0-prerelease.7, @patternfly/react-icons@npm:^6.3.1":
   version: 6.3.1
   resolution: "@patternfly/react-icons@npm:6.3.1"
   peerDependencies:
@@ -4640,13 +4628,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-icons@npm:^6.5.0-prerelease.4":
-  version: 6.5.0-prerelease.4
-  resolution: "@patternfly/react-icons@npm:6.5.0-prerelease.4"
+"@patternfly/react-icons@npm:^6.5.0-prerelease.6":
+  version: 6.5.0-prerelease.6
+  resolution: "@patternfly/react-icons@npm:6.5.0-prerelease.6"
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/3529cdefe768ae62b2a160db4a7bb8bc79a3619454056b940d364ff1df488dc16edd24682746e61158d758b41769c5bbb9997b10a7d99dce78d0fddb55292596
+  checksum: 10c0/4589c5dc654744f172e49afa2543c991b83f749e59139f34445fb71840a7564fd73286be350c8cebcce692dda2ff8994b3d68988fae690a3a733cdd5a3b47a36
   languageName: node
   linkType: hard
 
@@ -4693,43 +4681,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-styles@npm:^6.5.0-prerelease.4":
-  version: 6.5.0-prerelease.4
-  resolution: "@patternfly/react-styles@npm:6.5.0-prerelease.4"
-  checksum: 10c0/925a96249d25d68fc99d14f5a92e3bd5e4cdcd93bb71dcd87e19862de59fd1950030f8e812979c98ade1c0957d19036c961a3a9a7557635dfdbd8faef9e3dbdd
+"@patternfly/react-styles@npm:^6.4.0":
+  version: 6.4.0
+  resolution: "@patternfly/react-styles@npm:6.4.0"
+  checksum: 10c0/ed94ec58ddeb21eeecb24a6bbaf2e64d2fb4e641d1e8e49107fa162e7b115a23f9e59242d390937cc2d48a1ee5b2e1133c133e9dd47a5b9b08bf9a157bf8b437
+  languageName: node
+  linkType: hard
+
+"@patternfly/react-styles@npm:^6.5.0-prerelease.6":
+  version: 6.5.0-prerelease.6
+  resolution: "@patternfly/react-styles@npm:6.5.0-prerelease.6"
+  checksum: 10c0/add4a73081fbbfeb0e295896577bfb436fc0b8ca67a18f449b1cdd1c6d59e7ca0f42ee4ffb5c5edcad660e97b9580538e373f494ca834aed259aa0915f74eeec
   languageName: node
   linkType: hard
 
-"@patternfly/react-table@npm:^6.5.0-prerelease.11":
-  version: 6.5.0-prerelease.11
-  resolution: "@patternfly/react-table@npm:6.5.0-prerelease.11"
+"@patternfly/react-table@npm:^6.5.0-prerelease.13":
+  version: 6.5.0-prerelease.13
+  resolution: "@patternfly/react-table@npm:6.5.0-prerelease.13"
   dependencies:
-    "@patternfly/react-core": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-icons": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.4"
+    "@patternfly/react-core": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-icons": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.6"
     lodash: "npm:^4.17.21"
     tslib: "npm:^2.8.1"
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/b8bcf3338497a7fbba32876766ac59c1f7657ffb8269c39a152e52009e2cc6f721184ceb4504896d956e15c58a7ff650128fd200cae69373b3d952a55aa24d35
+  checksum: 10c0/a86e3722b0abbba2b8a13c25687c7199ce6b92888c813a39614569a271ac5476c8b27dfa45002b7562b0051f1b6b921d775d6536b7f51c0af087fc2e3dc9605f
   languageName: node
   linkType: hard
 
-"@patternfly/react-templates@npm:^6.5.0-prerelease.11":
-  version: 6.5.0-prerelease.11
-  resolution: "@patternfly/react-templates@npm:6.5.0-prerelease.11"
+"@patternfly/react-templates@npm:^6.5.0-prerelease.13":
+  version: 6.5.0-prerelease.13
+  resolution: "@patternfly/react-templates@npm:6.5.0-prerelease.13"
   dependencies:
-    "@patternfly/react-core": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-icons": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-styles": "npm:^6.5.0-prerelease.4"
-    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.4"
+    "@patternfly/react-core": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-icons": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-styles": "npm:^6.5.0-prerelease.6"
+    "@patternfly/react-tokens": "npm:^6.5.0-prerelease.6"
     tslib: "npm:^2.8.1"
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/692f1fe62eff0d4f4f8b93e58d432fbcdf6664d62869a88eb2231abd5a00187f2cecb13f511c92666f435688211aeeb85685bc7bb8ea1e97daf4d13323355f3a
+  checksum: 10c0/542f110597275b6c3053bcc9c8a4b7b00234a74024d466adfd961625fceeae5efd38376077db0c9e6b8d2917f7d8aaf722ff795e94fe2a1b2bf2c1e40c18cb30
   languageName: node
   linkType: hard
 
@@ -4740,21 +4735,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/react-tokens@npm:^6.5.0-prerelease.4":
-  version: 6.5.0-prerelease.4
-  resolution: "@patternfly/react-tokens@npm:6.5.0-prerelease.4"
-  checksum: 10c0/c782c4c0d7d307c733c1c9c0c5537dcf99393e5cd6c404978f429ee30c42fca9585dfbddefdfafffc2fa1067b8c4f5fb772e36e0f2fdae2ab9af986a74a2c66e
+"@patternfly/react-tokens@npm:^6.5.0-prerelease.6":
+  version: 6.5.0-prerelease.6
+  resolution: "@patternfly/react-tokens@npm:6.5.0-prerelease.6"
+  checksum: 10c0/cf14fdb0d856ed414ef76c8823fb5f02baf3dfccc10b2c661089ca0ae299b7cc29826c5983326f7f0f6ca69e91b3ae8f10f1986d029111a57a343eb7b48bf975
   languageName: node
   linkType: hard
 
-"@patternfly/react-topology@npm:6.4.0":
-  version: 6.4.0
-  resolution: "@patternfly/react-topology@npm:6.4.0"
+"@patternfly/react-topology@npm:6.5.0-prerelease.2":
+  version: 6.5.0-prerelease.2
+  resolution: "@patternfly/react-topology@npm:6.5.0-prerelease.2"
   dependencies:
     "@dagrejs/dagre": "npm:1.1.2"
-    "@patternfly/react-core": "npm:^6.0.0"
-    "@patternfly/react-icons": "npm:^6.0.0"
-    "@patternfly/react-styles": "npm:^6.0.0"
+    "@patternfly/react-core": "npm:^6.4.0"
+    "@patternfly/react-icons": "npm:^6.4.0"
+    "@patternfly/react-styles": "npm:^6.4.0"
     "@types/d3": "npm:^7.4.0"
     "@types/d3-force": "npm:^1.2.1"
     d3: "npm:^7.8.0"
@@ -4767,7 +4762,7 @@ __metadata:
   peerDependencies:
     react: ^17 || ^18 || ^19
     react-dom: ^17 || ^18 || ^19
-  checksum: 10c0/c4db811821d8b9be67b394a69401ecdd61fb576cda4d84e481ac56997535941e50d7a8f276f778e48a1861b55703deb031859e0c63777814833d08db6115e6e5
+  checksum: 10c0/8c2711005c8e2ad7a17106a98fd930f015989f6d4bf752eb23e404c50ebbd070aed5a1f90b66aaffda9efe1088cc5d156bb81367ec0fff9f7af94ea907107f01
   languageName: node
   linkType: hard
 
@@ -16090,7 +16085,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"monaco-editor@npm:^0.54.0":
+"monaco-editor@npm:0.54.0":
   version: 0.54.0
   resolution: "monaco-editor@npm:0.54.0"
   dependencies:
@@ -17733,10 +17728,10 @@ __metadata:
   resolution: "patternfly-org-workspace@workspace:."
   dependencies:
     "@octokit/rest": "npm:^19.0.7"
-    "@patternfly/patternfly": "npm:^6.5.0-prerelease.23"
-    "@patternfly/react-code-editor": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-core": "npm:^6.5.0-prerelease.11"
-    "@patternfly/react-table": "npm:^6.5.0-prerelease.11"
+    "@patternfly/patternfly": "npm:^6.5.0-prerelease.27"
+    "@patternfly/react-code-editor": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-core": "npm:^6.5.0-prerelease.13"
+    "@patternfly/react-table": "npm:^6.5.0-prerelease.13"
     "@rspack/cli": "npm:^1.5.6"
     "@rspack/core": "npm:^1.5.6"
     "@rspack/dev-server": "npm:^1.1.4"
@@ -17752,19 +17747,19 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "patternfly-org@workspace:packages/documentation-site"
   dependencies:
-    "@patternfly/chatbot": "npm:6.5.0-prerelease.10"
-    "@patternfly/design-tokens": "npm:1.14.4"
+    "@patternfly/chatbot": "npm:6.5.0-prerelease.18"
+    "@patternfly/design-tokens": "npm:1.14.5"
     "@patternfly/documentation-framework": "workspace:*"
     "@patternfly/patternfly-a11y": "npm:5.0.0"
     "@patternfly/quickstarts": "npm:6.4.0"
     "@patternfly/react-catalog-view-extension": "npm:6.3.0"
-    "@patternfly/react-charts": "npm:8.5.0-prerelease.4"
-    "@patternfly/react-component-groups": "npm:6.4.0"
+    "@patternfly/react-charts": "npm:8.5.0-prerelease.6"
+    "@patternfly/react-component-groups": "npm:6.4.0-prerelease.6"
     "@patternfly/react-console": "npm:6.1.0"
     "@patternfly/react-data-view": "npm:6.4.0"
-    "@patternfly/react-docs": "npm:7.5.0-prerelease.12"
+    "@patternfly/react-docs": "npm:7.5.0-prerelease.14"
     "@patternfly/react-log-viewer": "npm:6.3.0"
-    "@patternfly/react-topology": "npm:6.4.0"
+    "@patternfly/react-topology": "npm:6.5.0-prerelease.2"
     "@patternfly/react-user-feedback": "npm:6.2.0"
     "@patternfly/react-virtualized-extension": "npm:6.1.0"
     "@xyflow/react": "npm:^12.9.0"