diff --git a/packages/canon/.storybook/main.ts b/packages/canon/.storybook/main.ts
index 5b0d20b9b5..41df32404b 100644
--- a/packages/canon/.storybook/main.ts
+++ b/packages/canon/.storybook/main.ts
@@ -14,8 +14,8 @@ function getAbsolutePath(value: string): any {
 const config: StorybookConfig = {
   stories: [
     '../docs/**/*.mdx',
-    '../src/components-new/**/*.mdx',
-    '../src/components-new/**/*.stories.@(js|jsx|mjs|ts|tsx)',
+    '../src/components/**/*.mdx',
+    '../src/components/**/*.stories.@(js|jsx|mjs|ts|tsx)',
   ],
   staticDirs: ['../static'],
   addons: [
diff --git a/packages/canon/docs/Home.mdx b/packages/canon/docs/Home.mdx
index 126ed19f01..d2bda8cbf6 100644
--- a/packages/canon/docs/Home.mdx
+++ b/packages/canon/docs/Home.mdx
@@ -1,5 +1,5 @@
 import { Unstyled } from '@storybook/blocks';
-import { Columns, Text, ComponentStatus, Banner } from './components-new';
+import { Columns, Text, ComponentStatus, Banner } from './components';
 
 <Unstyled>
 
diff --git a/packages/canon/docs/Layout.mdx b/packages/canon/docs/Layout.mdx
index d19993e6d7..ed72087cca 100644
--- a/packages/canon/docs/Layout.mdx
+++ b/packages/canon/docs/Layout.mdx
@@ -1,6 +1,6 @@
 import { Unstyled, Source } from '@storybook/blocks';
-import { Title, Text, LayoutComponents } from './components-new';
-import * as Table from './components-new/Table';
+import { Title, Text, LayoutComponents } from './components';
+import * as Table from './components/Table';
 
 <Unstyled>
 
diff --git a/packages/canon/docs/Theme.mdx b/packages/canon/docs/Theme.mdx
index 646e4f8bbb..cab948c6ba 100644
--- a/packages/canon/docs/Theme.mdx
+++ b/packages/canon/docs/Theme.mdx
@@ -1,18 +1,15 @@
 import { Unstyled, Source } from '@storybook/blocks';
-import { Title, Text, Chip } from './components-new';
-import * as Table from './components-new/Table';
+import { Title, Text, Chip } from './components';
+import * as Table from './components/Table';
 
 <Unstyled>
 
 <Title type="h1">Theming</Title>
 <Text>
   Backstage ships with a default theme with a light and dark mode variant. The
-  themes are provided as a part of the{' '}
-  <a href="https://github.com/backstage/backstage/packages/canon">
-    @backstage/canon
-  </a>{' '}
-  package, which also includes utilities for customizing the default theme, or
-  creating completely new themes.
+  themes are provided as a part of the `@backstage/canon` package, which also
+  includes utilities for customizing the default theme, or creating completely
+  new themes.
 </Text>
 
 <Title type="h2">Light & Dark modes</Title>
diff --git a/packages/canon/docs/components-new/Banner/banner.css.ts b/packages/canon/docs/components/Banner/banner.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/Banner/banner.css.ts
rename to packages/canon/docs/components/Banner/banner.css.ts
diff --git a/packages/canon/docs/components-new/Banner/index.tsx b/packages/canon/docs/components/Banner/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/Banner/index.tsx
rename to packages/canon/docs/components/Banner/index.tsx
diff --git a/packages/canon/docs/components-new/Chip/chip.css.ts b/packages/canon/docs/components/Chip/chip.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/Chip/chip.css.ts
rename to packages/canon/docs/components/Chip/chip.css.ts
diff --git a/packages/canon/docs/components-new/Chip/index.tsx b/packages/canon/docs/components/Chip/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/Chip/index.tsx
rename to packages/canon/docs/components/Chip/index.tsx
diff --git a/packages/canon/docs/components-new/Columns/columns.css.ts b/packages/canon/docs/components/Columns/columns.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/Columns/columns.css.ts
rename to packages/canon/docs/components/Columns/columns.css.ts
diff --git a/packages/canon/docs/components-new/Columns/index.tsx b/packages/canon/docs/components/Columns/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/Columns/index.tsx
rename to packages/canon/docs/components/Columns/index.tsx
diff --git a/packages/canon/docs/components-new/ComponentStatus/component-status.css.ts b/packages/canon/docs/components/ComponentStatus/component-status.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/ComponentStatus/component-status.css.ts
rename to packages/canon/docs/components/ComponentStatus/component-status.css.ts
diff --git a/packages/canon/docs/components-new/ComponentStatus/index.tsx b/packages/canon/docs/components/ComponentStatus/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/ComponentStatus/index.tsx
rename to packages/canon/docs/components/ComponentStatus/index.tsx
diff --git a/packages/canon/docs/components-new/LayoutComponents/index.tsx b/packages/canon/docs/components/LayoutComponents/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/LayoutComponents/index.tsx
rename to packages/canon/docs/components/LayoutComponents/index.tsx
diff --git a/packages/canon/docs/components-new/LayoutComponents/layout-components.css.ts b/packages/canon/docs/components/LayoutComponents/layout-components.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/LayoutComponents/layout-components.css.ts
rename to packages/canon/docs/components/LayoutComponents/layout-components.css.ts
diff --git a/packages/canon/docs/components-new/Table/index.tsx b/packages/canon/docs/components/Table/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/Table/index.tsx
rename to packages/canon/docs/components/Table/index.tsx
diff --git a/packages/canon/docs/components-new/Table/table.css.ts b/packages/canon/docs/components/Table/table.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/Table/table.css.ts
rename to packages/canon/docs/components/Table/table.css.ts
diff --git a/packages/canon/docs/components-new/Text/index.tsx b/packages/canon/docs/components/Text/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/Text/index.tsx
rename to packages/canon/docs/components/Text/index.tsx
diff --git a/packages/canon/docs/components-new/Text/text.css.ts b/packages/canon/docs/components/Text/text.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/Text/text.css.ts
rename to packages/canon/docs/components/Text/text.css.ts
diff --git a/packages/canon/docs/components-new/Title/index.tsx b/packages/canon/docs/components/Title/index.tsx
similarity index 100%
rename from packages/canon/docs/components-new/Title/index.tsx
rename to packages/canon/docs/components/Title/index.tsx
diff --git a/packages/canon/docs/components-new/Title/title.css.ts b/packages/canon/docs/components/Title/title.css.ts
similarity index 100%
rename from packages/canon/docs/components-new/Title/title.css.ts
rename to packages/canon/docs/components/Title/title.css.ts
diff --git a/packages/canon/docs/components-new/index.ts b/packages/canon/docs/components/index.ts
similarity index 100%
rename from packages/canon/docs/components-new/index.ts
rename to packages/canon/docs/components/index.ts
diff --git a/packages/canon/src/components-new/Box/Box.stories.tsx b/packages/canon/src/components/Box/Box.stories.tsx
similarity index 100%
rename from packages/canon/src/components-new/Box/Box.stories.tsx
rename to packages/canon/src/components/Box/Box.stories.tsx
diff --git a/packages/canon/src/components-new/Box/Box.tsx b/packages/canon/src/components/Box/Box.tsx
similarity index 100%
rename from packages/canon/src/components-new/Box/Box.tsx
rename to packages/canon/src/components/Box/Box.tsx
diff --git a/packages/canon/src/components-new/Box/box.css.ts b/packages/canon/src/components/Box/box.css.ts
similarity index 100%
rename from packages/canon/src/components-new/Box/box.css.ts
rename to packages/canon/src/components/Box/box.css.ts
diff --git a/packages/canon/src/components-new/Box/box.mdx b/packages/canon/src/components/Box/box.mdx
similarity index 86%
rename from packages/canon/src/components-new/Box/box.mdx
rename to packages/canon/src/components/Box/box.mdx
index 5778f9a067..a3ce48b06d 100644
--- a/packages/canon/src/components-new/Box/box.mdx
+++ b/packages/canon/src/components/Box/box.mdx
@@ -1,10 +1,10 @@
 import { Canvas, Meta, Unstyled } from '@storybook/blocks';
 import * as BoxStories from './Box.stories';
-import { Chip } from '../../../docs/components-new/Chip';
-import * as Table from '../../../docs/components-new/Table';
+import { Chip } from '../../../docs/components/Chip';
+import * as Table from '../../../docs/components/Table';
 import { Box } from './Box';
 import { Stack } from '../Stack';
-import { Title, Text } from '../../../docs/components-new';
+import { Title, Text } from '../../../docs/components';
 import { Padding } from './docs/padding';
 import { listResponsiveValues, listColorValues } from '../../utils/list-values';
 import { responsiveProperties } from './sprinkles.css';
diff --git a/packages/canon/src/components-new/Box/docs/padding.tsx b/packages/canon/src/components/Box/docs/padding.tsx
similarity index 100%
rename from packages/canon/src/components-new/Box/docs/padding.tsx
rename to packages/canon/src/components/Box/docs/padding.tsx
diff --git a/packages/canon/src/components-new/Box/docs/props-table.tsx b/packages/canon/src/components/Box/docs/props-table.tsx
similarity index 94%
rename from packages/canon/src/components-new/Box/docs/props-table.tsx
rename to packages/canon/src/components/Box/docs/props-table.tsx
index b16f225568..bcdda93f2a 100644
--- a/packages/canon/src/components-new/Box/docs/props-table.tsx
+++ b/packages/canon/src/components/Box/docs/props-table.tsx
@@ -15,8 +15,8 @@
  */
 
 import React from 'react';
-import * as Table from '../../../../docs/components-new';
-import { Chip } from '../../../../docs/components-new';
+import * as Table from '../../../../docs/components';
+import { Chip } from '../../../../docs/components';
 import { listResponsiveValues } from '../../../utils/list-values';
 import { responsiveProperties } from '../sprinkles.css';
 
diff --git a/packages/canon/src/components-new/Box/docs/spacing-table.tsx b/packages/canon/src/components/Box/docs/spacing-table.tsx
similarity index 94%
rename from packages/canon/src/components-new/Box/docs/spacing-table.tsx
rename to packages/canon/src/components/Box/docs/spacing-table.tsx
index d6668e22ae..7d98576b0e 100644
--- a/packages/canon/src/components-new/Box/docs/spacing-table.tsx
+++ b/packages/canon/src/components/Box/docs/spacing-table.tsx
@@ -15,8 +15,8 @@
  */
 
 import React from 'react';
-import * as Table from '../../../../docs/components-new';
-import { Chip } from '../../../../docs/components-new';
+import * as Table from '../../../../docs/components';
+import { Chip } from '../../../../docs/components';
 import { listResponsiveValues } from '../../../utils/list-values';
 import { responsiveProperties } from '../sprinkles.css';
 
diff --git a/packages/canon/src/components-new/Box/index.tsx b/packages/canon/src/components/Box/index.tsx
similarity index 100%
rename from packages/canon/src/components-new/Box/index.tsx
rename to packages/canon/src/components/Box/index.tsx
diff --git a/packages/canon/src/components-new/Box/properties.ts b/packages/canon/src/components/Box/properties.ts
similarity index 100%
rename from packages/canon/src/components-new/Box/properties.ts
rename to packages/canon/src/components/Box/properties.ts
diff --git a/packages/canon/src/components-new/Box/sprinkles.css.ts b/packages/canon/src/components/Box/sprinkles.css.ts
similarity index 100%
rename from packages/canon/src/components-new/Box/sprinkles.css.ts
rename to packages/canon/src/components/Box/sprinkles.css.ts
diff --git a/packages/canon/src/components-new/Button/Button.stories.tsx b/packages/canon/src/components/Button/Button.stories.tsx
similarity index 100%
rename from packages/canon/src/components-new/Button/Button.stories.tsx
rename to packages/canon/src/components/Button/Button.stories.tsx
diff --git a/packages/canon/src/components-new/Button/Button.tsx b/packages/canon/src/components/Button/Button.tsx
similarity index 100%
rename from packages/canon/src/components-new/Button/Button.tsx
rename to packages/canon/src/components/Button/Button.tsx
diff --git a/packages/canon/src/components-new/Button/button.css.ts b/packages/canon/src/components/Button/button.css.ts
similarity index 100%
rename from packages/canon/src/components-new/Button/button.css.ts
rename to packages/canon/src/components/Button/button.css.ts
diff --git a/packages/canon/src/components-new/Button/index.tsx b/packages/canon/src/components/Button/index.tsx
similarity index 100%
rename from packages/canon/src/components-new/Button/index.tsx
rename to packages/canon/src/components/Button/index.tsx
diff --git a/packages/canon/src/components-new/Button/styles.css b/packages/canon/src/components/Button/styles.css
similarity index 100%
rename from packages/canon/src/components-new/Button/styles.css
rename to packages/canon/src/components/Button/styles.css
diff --git a/packages/canon/src/components-new/Icon/Icon.stories.tsx b/packages/canon/src/components/Icon/Icon.stories.tsx
similarity index 100%
rename from packages/canon/src/components-new/Icon/Icon.stories.tsx
rename to packages/canon/src/components/Icon/Icon.stories.tsx
diff --git a/packages/canon/src/components-new/Icon/Icon.tsx b/packages/canon/src/components/Icon/Icon.tsx
similarity index 100%
rename from packages/canon/src/components-new/Icon/Icon.tsx
rename to packages/canon/src/components/Icon/Icon.tsx
diff --git a/packages/canon/src/components-new/Icon/context.tsx b/packages/canon/src/components/Icon/context.tsx
similarity index 100%
rename from packages/canon/src/components-new/Icon/context.tsx
rename to packages/canon/src/components/Icon/context.tsx
diff --git a/packages/canon/src/components-new/Icon/custom-icon.tsx b/packages/canon/src/components/Icon/custom-icon.tsx
similarity index 100%
rename from packages/canon/src/components-new/Icon/custom-icon.tsx
rename to packages/canon/src/components/Icon/custom-icon.tsx
diff --git a/packages/canon/src/components-new/Icon/index.tsx b/packages/canon/src/components/Icon/index.tsx
similarity index 100%
rename from packages/canon/src/components-new/Icon/index.tsx
rename to packages/canon/src/components/Icon/index.tsx
diff --git a/packages/canon/src/components-new/Inline/Inline.stories.tsx b/packages/canon/src/components/Inline/Inline.stories.tsx
similarity index 100%
rename from packages/canon/src/components-new/Inline/Inline.stories.tsx
rename to packages/canon/src/components/Inline/Inline.stories.tsx
diff --git a/packages/canon/src/components-new/Inline/Inline.tsx b/packages/canon/src/components/Inline/Inline.tsx
similarity index 100%
rename from packages/canon/src/components-new/Inline/Inline.tsx
rename to packages/canon/src/components/Inline/Inline.tsx
diff --git a/packages/canon/src/components-new/Inline/index.ts b/packages/canon/src/components/Inline/index.ts
similarity index 100%
rename from packages/canon/src/components-new/Inline/index.ts
rename to packages/canon/src/components/Inline/index.ts
diff --git a/packages/canon/src/components-new/Stack/Stack.stories.tsx b/packages/canon/src/components/Stack/Stack.stories.tsx
similarity index 100%
rename from packages/canon/src/components-new/Stack/Stack.stories.tsx
rename to packages/canon/src/components/Stack/Stack.stories.tsx
diff --git a/packages/canon/src/components-new/Stack/Stack.tsx b/packages/canon/src/components/Stack/Stack.tsx
similarity index 100%
rename from packages/canon/src/components-new/Stack/Stack.tsx
rename to packages/canon/src/components/Stack/Stack.tsx
diff --git a/packages/canon/src/components-new/Stack/index.ts b/packages/canon/src/components/Stack/index.ts
similarity index 100%
rename from packages/canon/src/components-new/Stack/index.ts
rename to packages/canon/src/components/Stack/index.ts
diff --git a/packages/canon/src/components-new/Stack/sprinkles.css.ts b/packages/canon/src/components/Stack/sprinkles.css.ts
similarity index 100%
rename from packages/canon/src/components-new/Stack/sprinkles.css.ts
rename to packages/canon/src/components/Stack/sprinkles.css.ts
diff --git a/packages/canon/src/index.ts b/packages/canon/src/index.ts
index 622f58b96d..2bd3f11f48 100644
--- a/packages/canon/src/index.ts
+++ b/packages/canon/src/index.ts
@@ -20,6 +20,6 @@
  * @packageDocumentation
  */
 
-export * from './components-new/Button';
-export * from './components-new/Box';
-export * from './components-new/Icon';
+export * from './components/Button';
+export * from './components/Box';
+export * from './components/Icon';
diff --git a/packages/canon/src/theme/styles.css b/packages/canon/src/theme/styles.css
index d082d3cf90..fa5ed2ba4d 100644
--- a/packages/canon/src/theme/styles.css
+++ b/packages/canon/src/theme/styles.css
@@ -22,4 +22,4 @@
 @import './theme.css';
 
 /* Components */
-@import '../components-new/Button/styles.css';
+@import '../components/Button/styles.css';
diff --git a/packages/canon/src/utils/align.ts b/packages/canon/src/utils/align.ts
index 39215816ec..f4d7b5932e 100644
--- a/packages/canon/src/utils/align.ts
+++ b/packages/canon/src/utils/align.ts
@@ -17,7 +17,7 @@
 import {
   type OptionalResponsiveValue,
   mapResponsiveValue,
-} from '../components-new/Box/sprinkles.css';
+} from '../components/Box/sprinkles.css';
 
 export type Align = 'left' | 'center' | 'right';
 export type AlignY = 'top' | 'center' | 'bottom';
diff --git a/packages/canon/src/utils/list-values.ts b/packages/canon/src/utils/list-values.ts
index 42da674037..9e3464a4f5 100644
--- a/packages/canon/src/utils/list-values.ts
+++ b/packages/canon/src/utils/list-values.ts
@@ -17,7 +17,7 @@
 import {
   responsiveProperties,
   colorProperties,
-} from '../components-new/Box/sprinkles.css';
+} from '../components/Box/sprinkles.css';
 
 export const listResponsiveValues = (
   value: keyof typeof responsiveProperties.styles,