diff --git a/packages/core/src/components/Button/Button.stories.tsx b/packages/core/src/components/Button/Button.stories.tsx
index aaca389f82..a5005574fe 100644
--- a/packages/core/src/components/Button/Button.stories.tsx
+++ b/packages/core/src/components/Button/Button.stories.tsx
@@ -24,7 +24,7 @@ const Location = () => {
 };
 
 export default {
-  title: 'Button',
+  title: 'Inputs/Button',
   component: Button,
   decorators: [
     (storyFn: FunctionComponentFactory<{}>) => (
diff --git a/packages/core/src/components/CodeSnippet/CodeSnippet.stories.tsx b/packages/core/src/components/CodeSnippet/CodeSnippet.stories.tsx
index 77f3ca51cc..6df7e5bb6d 100644
--- a/packages/core/src/components/CodeSnippet/CodeSnippet.stories.tsx
+++ b/packages/core/src/components/CodeSnippet/CodeSnippet.stories.tsx
@@ -19,7 +19,7 @@ import { CodeSnippet } from './CodeSnippet';
 import { InfoCard } from '../../layout/InfoCard';
 
 export default {
-  title: 'CodeSnippet',
+  title: 'Data Display/CodeSnippet',
   component: CodeSnippet,
 };
 
diff --git a/packages/core/src/components/CopyTextButton/CopyTextButton.stories.tsx b/packages/core/src/components/CopyTextButton/CopyTextButton.stories.tsx
index 1894574df2..e6f5f8cece 100644
--- a/packages/core/src/components/CopyTextButton/CopyTextButton.stories.tsx
+++ b/packages/core/src/components/CopyTextButton/CopyTextButton.stories.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { CopyTextButton } from '.';
 
 export default {
-  title: 'CopyTextButton',
+  title: 'Inputs/CopyTextButton',
   component: CopyTextButton,
 };
 
diff --git a/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx b/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx
index 148e7b6803..d77a713b34 100644
--- a/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx
+++ b/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx
@@ -28,7 +28,7 @@ import {
 } from '@backstage/core-api';
 
 export default {
-  title: 'DismissableBanner',
+  title: 'Feedback/DismissableBanner',
   component: DismissableBanner,
 };
 
diff --git a/packages/core/src/components/EmptyState/EmptyState.stories.tsx b/packages/core/src/components/EmptyState/EmptyState.stories.tsx
index 15d61f14c0..8f846797a1 100644
--- a/packages/core/src/components/EmptyState/EmptyState.stories.tsx
+++ b/packages/core/src/components/EmptyState/EmptyState.stories.tsx
@@ -20,7 +20,7 @@ import { Button } from '@material-ui/core';
 import { MissingAnnotationEmptyState } from './MissingAnnotationEmptyState';
 
 export default {
-  title: 'EmptyState',
+  title: 'Feedback/EmptyState',
   component: EmptyState,
 };
 
diff --git a/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx b/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx
index b65c5bff5d..9718393427 100644
--- a/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx
+++ b/packages/core/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx
@@ -21,7 +21,7 @@ const containerStyle = { width: 800, height: 400, margin: 20 };
 const opacityArray = [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0];
 
 export default {
-  title: 'HorizontalScrollGrid',
+  title: 'Layout/HorizontalScrollGrid',
   component: HorizontalScrollGrid,
 };
 
diff --git a/packages/core/src/components/Lifecycle/Lifecycle.stories.tsx b/packages/core/src/components/Lifecycle/Lifecycle.stories.tsx
index c29eb8a02f..ccce7fba25 100644
--- a/packages/core/src/components/Lifecycle/Lifecycle.stories.tsx
+++ b/packages/core/src/components/Lifecycle/Lifecycle.stories.tsx
@@ -17,7 +17,7 @@ import React from 'react';
 import { Lifecycle } from './Lifecycle';
 
 export default {
-  title: 'Lifecycle',
+  title: 'Feedback/Lifecycle',
   component: Lifecycle,
 };
 
diff --git a/packages/core/src/components/Link/Link.stories.tsx b/packages/core/src/components/Link/Link.stories.tsx
index 2bd499fa33..852d51970f 100644
--- a/packages/core/src/components/Link/Link.stories.tsx
+++ b/packages/core/src/components/Link/Link.stories.tsx
@@ -29,7 +29,7 @@ const Location = () => {
 };
 
 export default {
-  title: 'Link',
+  title: 'Navigation/Link',
   component: Link,
   decorators: [
     (storyFn: FunctionComponentFactory<{}>) => (
diff --git a/packages/core/src/components/Progress/Progress.stories.tsx b/packages/core/src/components/Progress/Progress.stories.tsx
index b935f60695..cd17dce8b4 100644
--- a/packages/core/src/components/Progress/Progress.stories.tsx
+++ b/packages/core/src/components/Progress/Progress.stories.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { Progress } from '.';
 
 export default {
-  title: 'Progress',
+  title: 'Feedback/Progress',
   component: Progress,
 };
 
diff --git a/packages/core/src/components/ProgressBars/Gauge.stories.tsx b/packages/core/src/components/ProgressBars/Gauge.stories.tsx
index 6599b0f768..7882714529 100644
--- a/packages/core/src/components/ProgressBars/Gauge.stories.tsx
+++ b/packages/core/src/components/ProgressBars/Gauge.stories.tsx
@@ -20,7 +20,7 @@ import { Gauge } from './Gauge';
 const containerStyle = { width: 300 };
 
 export default {
-  title: 'Gauge',
+  title: 'Feedback/Gauge',
   component: Gauge,
 };
 
diff --git a/packages/core/src/components/ProgressBars/GaugeCard.stories.tsx b/packages/core/src/components/ProgressBars/GaugeCard.stories.tsx
index 922bb63b2f..45de49cd2d 100644
--- a/packages/core/src/components/ProgressBars/GaugeCard.stories.tsx
+++ b/packages/core/src/components/ProgressBars/GaugeCard.stories.tsx
@@ -21,7 +21,7 @@ import { Grid } from '@material-ui/core';
 const linkInfo = { title: 'Go to XYZ Location', link: '#' };
 
 export default {
-  title: 'Progress Card',
+  title: 'Data Display/Progress Card',
   component: GaugeCard,
 };
 
diff --git a/packages/core/src/components/ProgressBars/LinearGauge.stories.tsx b/packages/core/src/components/ProgressBars/LinearGauge.stories.tsx
index c4492986b6..a745d210b4 100644
--- a/packages/core/src/components/ProgressBars/LinearGauge.stories.tsx
+++ b/packages/core/src/components/ProgressBars/LinearGauge.stories.tsx
@@ -20,7 +20,7 @@ import { LinearGauge } from './LinearGauge';
 const containerStyle = { width: 300 };
 
 export default {
-  title: 'LinearGauge',
+  title: 'Feedback/LinearGauge',
   component: LinearGauge,
 };
 
diff --git a/packages/core/src/components/SimpleStepper/SimpleStepper.stories.tsx b/packages/core/src/components/SimpleStepper/SimpleStepper.stories.tsx
index 52710ffeaf..e7163ea533 100644
--- a/packages/core/src/components/SimpleStepper/SimpleStepper.stories.tsx
+++ b/packages/core/src/components/SimpleStepper/SimpleStepper.stories.tsx
@@ -19,7 +19,7 @@ import { TextField } from '@material-ui/core';
 import { SimpleStepper, SimpleStepperStep } from '.';
 
 export default {
-  title: 'SimpleStepper',
+  title: 'Navigation/SimpleStepper',
   component: SimpleStepper,
 };
 
diff --git a/packages/core/src/components/Status/Status.stories.tsx b/packages/core/src/components/Status/Status.stories.tsx
index 01e2876524..560d07ad87 100644
--- a/packages/core/src/components/Status/Status.stories.tsx
+++ b/packages/core/src/components/Status/Status.stories.tsx
@@ -27,7 +27,7 @@ import { Table } from '../Table';
 import { InfoCard } from '../../layout/InfoCard';
 
 export default {
-  title: 'Status',
+  title: 'Feedback/Status',
   component: StatusOK,
 };
 
diff --git a/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx b/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx
index 9db7385872..97591ebab3 100644
--- a/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx
+++ b/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx
@@ -37,7 +37,7 @@ const metadata = {
 };
 
 export default {
-  title: 'Structured Metadata Table',
+  title: 'Data Display/Structured Metadata Table',
   component: StructuredMetadataTable,
 };
 
diff --git a/packages/core/src/components/Table/Table.stories.tsx b/packages/core/src/components/Table/Table.stories.tsx
index 1ec896fd43..4be85e494f 100644
--- a/packages/core/src/components/Table/Table.stories.tsx
+++ b/packages/core/src/components/Table/Table.stories.tsx
@@ -19,7 +19,7 @@ import { Table, SubvalueCell, TableColumn } from './';
 import { TableFilter } from './Table';
 
 export default {
-  title: 'Table',
+  title: 'Data Display/Table',
   component: Table,
 };
 
diff --git a/packages/core/src/components/Tabs/Tabs.stories.tsx b/packages/core/src/components/Tabs/Tabs.stories.tsx
index 930a825392..00819c44f1 100644
--- a/packages/core/src/components/Tabs/Tabs.stories.tsx
+++ b/packages/core/src/components/Tabs/Tabs.stories.tsx
@@ -19,7 +19,7 @@ import { Tabs } from './Tabs';
 import AccessAlarmIcon from '@material-ui/icons/AccessAlarm';
 
 export default {
-  title: 'Tabs',
+  title: 'Navigation/Tabs',
   component: Tabs,
 };
 
diff --git a/packages/core/src/components/TrendLine/TrendLine.stories.tsx b/packages/core/src/components/TrendLine/TrendLine.stories.tsx
index cc2fdda052..4eb74b2f17 100644
--- a/packages/core/src/components/TrendLine/TrendLine.stories.tsx
+++ b/packages/core/src/components/TrendLine/TrendLine.stories.tsx
@@ -20,7 +20,7 @@ import { TrendLine } from './TrendLine';
 import { InfoCard } from '../../layout/InfoCard';
 
 export default {
-  title: 'TrendLine',
+  title: 'Data Display/TrendLine',
   component: TrendLine,
 };
 
diff --git a/packages/core/src/components/WarningPanel/WarningPanel.stories.tsx b/packages/core/src/components/WarningPanel/WarningPanel.stories.tsx
index 92487ed8c5..5098f0aa31 100644
--- a/packages/core/src/components/WarningPanel/WarningPanel.stories.tsx
+++ b/packages/core/src/components/WarningPanel/WarningPanel.stories.tsx
@@ -19,7 +19,7 @@ import { WarningPanel } from './WarningPanel';
 import { Link, Button } from '@material-ui/core';
 
 export default {
-  title: 'Warning Panel',
+  title: 'Feedback/Warning Panel',
   component: WarningPanel,
 };
 
diff --git a/packages/core/src/components/stories/Chip.stories.tsx b/packages/core/src/components/stories/Chip.stories.tsx
index c0e644fcc5..a605666482 100644
--- a/packages/core/src/components/stories/Chip.stories.tsx
+++ b/packages/core/src/components/stories/Chip.stories.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { Chip } from '@material-ui/core';
 
 export default {
-  title: 'Chip',
+  title: 'Data Display/Chip',
   component: Chip,
 };
 
diff --git a/packages/core/src/layout/Header/Header.stories.tsx b/packages/core/src/layout/Header/Header.stories.tsx
index 39b9133c0a..91045d4bb4 100644
--- a/packages/core/src/layout/Header/Header.stories.tsx
+++ b/packages/core/src/layout/Header/Header.stories.tsx
@@ -19,7 +19,7 @@ import { HeaderLabel } from '../HeaderLabel';
 import { Page, pageTheme } from '../Page';
 
 export default {
-  title: 'Header',
+  title: 'Layout/Header',
   component: Header,
 };
 
diff --git a/packages/core/src/layout/InfoCard/InfoCard.stories.tsx b/packages/core/src/layout/InfoCard/InfoCard.stories.tsx
index 3e476c5480..4886a38b0f 100644
--- a/packages/core/src/layout/InfoCard/InfoCard.stories.tsx
+++ b/packages/core/src/layout/InfoCard/InfoCard.stories.tsx
@@ -20,7 +20,7 @@ import { Grid, Typography } from '@material-ui/core';
 const linkInfo = { title: 'Go to XYZ Location', link: '#' };
 
 export default {
-  title: 'Information Card',
+  title: 'Layout/Information Card',
   component: InfoCard,
 };
 
diff --git a/packages/core/src/layout/ItemCard/ItemCard.stories.tsx b/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
index 46b93da370..998856e041 100644
--- a/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
+++ b/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
@@ -18,7 +18,7 @@ import { ItemCard } from '.';
 import { Grid } from '@material-ui/core';
 
 export default {
-  title: 'Item Card',
+  title: 'Layout/Item Card',
   component: ItemCard,
 };
 
diff --git a/packages/core/src/layout/Page/Page.stories.tsx b/packages/core/src/layout/Page/Page.stories.tsx
index 8fd779196d..2a60f182a1 100644
--- a/packages/core/src/layout/Page/Page.stories.tsx
+++ b/packages/core/src/layout/Page/Page.stories.tsx
@@ -36,7 +36,7 @@ import {
 import { Box, Typography, Link, Chip, Grid } from '@material-ui/core';
 
 export default {
-  title: 'Example Plugin',
+  title: 'Layout/Example Plugin',
   component: Page,
 };
 
diff --git a/packages/core/src/layout/Sidebar/Sidebar.stories.tsx b/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
index 908fbba75c..d6a01fea33 100644
--- a/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
+++ b/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
@@ -28,7 +28,7 @@ import AddCircleOutlineIcon from '@material-ui/icons/AddCircleOutline';
 import { MemoryRouter } from 'react-router-dom';
 
 export default {
-  title: 'Sidebar',
+  title: 'Layout/Sidebar',
   component: Sidebar,
   decorators: [
     (storyFn: () => JSX.Element) => (
diff --git a/packages/core/src/layout/TabbedCard/TabbedCard.stories.tsx b/packages/core/src/layout/TabbedCard/TabbedCard.stories.tsx
index 23c2ab5b49..f4af6dcf9f 100644
--- a/packages/core/src/layout/TabbedCard/TabbedCard.stories.tsx
+++ b/packages/core/src/layout/TabbedCard/TabbedCard.stories.tsx
@@ -20,7 +20,7 @@ import { Grid } from '@material-ui/core';
 const cardContentStyle = { height: 200, width: 500 };
 
 export default {
-  title: 'Tabbed Card',
+  title: 'Layout/Tabbed Card',
   component: TabbedCard,
   decorators: [
     (storyFn: () => JSX.Element) => (
diff --git a/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx b/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
index 579f2de640..fd3d6ce0f0 100644
--- a/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
+++ b/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
@@ -33,7 +33,7 @@ import { Settings } from './Settings';
 import { SettingsPage } from './SettingsPage';
 
 export default {
-  title: 'Settings',
+  title: 'Plugins/user-settings/Settings',
   component: Settings,
   decorators: [
     (storyFn: () => JSX.Element) => (