diff --git a/packages/components/stories/Excel.stories.ts b/packages/components/stories/Excel.stories.ts
index bda3ba97..c242b502 100644
--- a/packages/components/stories/Excel.stories.ts
+++ b/packages/components/stories/Excel.stories.ts
@@ -4,7 +4,7 @@ import { Excel, ExcelProps } from '../src/components/Excel';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/Excel',
+  title: 'Components/Tabular/Excel',
   component: Excel,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/FlatUiTable.stories.ts b/packages/components/stories/FlatUiTable.stories.ts
index 5546fa34..1baf616b 100644
--- a/packages/components/stories/FlatUiTable.stories.ts
+++ b/packages/components/stories/FlatUiTable.stories.ts
@@ -4,7 +4,7 @@ import { FlatUiTable, FlatUiTableProps } from '../src/components/FlatUiTable';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/FlatUiTable',
+  title: 'Components/Tabular/FlatUiTable',
   component: FlatUiTable,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/Iframe.stories.ts b/packages/components/stories/Iframe.stories.ts
index 6d5884a8..759acfe4 100644
--- a/packages/components/stories/Iframe.stories.ts
+++ b/packages/components/stories/Iframe.stories.ts
@@ -3,7 +3,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { Iframe, IframeProps } from '../src/components/Iframe';
 
 const meta: Meta = {
-  title: 'Components/Iframe',
+  title: 'Components/Embedding/Iframe',
   component: Iframe,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/LineChart.stories.ts b/packages/components/stories/LineChart.stories.ts
index 8428ee8d..9b17c2c9 100644
--- a/packages/components/stories/LineChart.stories.ts
+++ b/packages/components/stories/LineChart.stories.ts
@@ -4,7 +4,7 @@ import { LineChart, LineChartProps } from '../src/components/LineChart';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/LineChart',
+  title: 'Components/Charts/LineChart',
   component: LineChart,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/Map.stories.ts b/packages/components/stories/Map.stories.ts
index 7358fa62..85c7d20f 100644
--- a/packages/components/stories/Map.stories.ts
+++ b/packages/components/stories/Map.stories.ts
@@ -4,7 +4,7 @@ import { Map, MapProps } from '../src/components/Map';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/Map',
+  title: 'Components/Geospatial/Map',
   component: Map,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/PdfViewer.stories.ts b/packages/components/stories/PdfViewer.stories.ts
index 352109f1..0abaf05f 100644
--- a/packages/components/stories/PdfViewer.stories.ts
+++ b/packages/components/stories/PdfViewer.stories.ts
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { PdfViewer, PdfViewerProps } from '../src/components/PdfViewer';
 
 const meta: Meta = {
-  title: 'Components/PdfViewer',
+  title: 'Components/Embedding/PdfViewer',
   component: PdfViewer,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/Plotly.stories.ts b/packages/components/stories/Plotly.stories.ts
index d35559dc..bd3e8177 100644
--- a/packages/components/stories/Plotly.stories.ts
+++ b/packages/components/stories/Plotly.stories.ts
@@ -4,7 +4,7 @@ import { Plotly } from '../src/components/Plotly';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/Plotly',
+  title: 'Components/Charts/Plotly',
   component: Plotly,
   tags: ['autodocs'],
 };
diff --git a/packages/components/stories/PlotlyBarChart.stories.ts b/packages/components/stories/PlotlyBarChart.stories.ts
index a7b3d4a9..7bc3c20f 100644
--- a/packages/components/stories/PlotlyBarChart.stories.ts
+++ b/packages/components/stories/PlotlyBarChart.stories.ts
@@ -7,7 +7,7 @@ import {
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/PlotlyBarChart',
+  title: 'Components/Charts/PlotlyBarChart',
   component: PlotlyBarChart,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/PlotlyLineChart.stories.ts b/packages/components/stories/PlotlyLineChart.stories.ts
index 435b6bb8..f028dbdd 100644
--- a/packages/components/stories/PlotlyLineChart.stories.ts
+++ b/packages/components/stories/PlotlyLineChart.stories.ts
@@ -4,7 +4,7 @@ import { PlotlyLineChart, PlotlyLineChartProps } from '../src/components/PlotlyL
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/PlotlyLineChart',
+  title: 'Components/Charts/PlotlyLineChart',
   component: PlotlyLineChart,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/Table.stories.ts b/packages/components/stories/Table.stories.ts
index 2f551bd7..d1023c8f 100644
--- a/packages/components/stories/Table.stories.ts
+++ b/packages/components/stories/Table.stories.ts
@@ -4,7 +4,7 @@ import { Table, TableProps } from '../src/components/Table';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/Table',
+  title: 'Components/Tabular/Table',
   component: Table,
   tags: ['autodocs'],
   argTypes: {
diff --git a/packages/components/stories/Vega.stories.ts b/packages/components/stories/Vega.stories.ts
index bbc8f7e3..6c4eed65 100644
--- a/packages/components/stories/Vega.stories.ts
+++ b/packages/components/stories/Vega.stories.ts
@@ -4,7 +4,7 @@ import { Vega } from '../src/components/Vega';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/Vega',
+  title: 'Components/Charts/Vega',
   component: Vega,
   tags: ['autodocs'],
 };
diff --git a/packages/components/stories/VegaLite.stories.ts b/packages/components/stories/VegaLite.stories.ts
index c0936720..28a43771 100644
--- a/packages/components/stories/VegaLite.stories.ts
+++ b/packages/components/stories/VegaLite.stories.ts
@@ -4,7 +4,7 @@ import { VegaLite } from '../src/components/VegaLite';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 const meta: Meta = {
-  title: 'Components/VegaLite',
+  title: 'Components/Charts/VegaLite',
   component: VegaLite,
   tags: ['autodocs'],
   argTypes: {