diff --git a/packages/grafana-ui/.storybook/preview.ts b/packages/grafana-ui/.storybook/preview.ts
index f79088c384e..902c0327320 100644
--- a/packages/grafana-ui/.storybook/preview.ts
+++ b/packages/grafana-ui/.storybook/preview.ts
@@ -45,7 +45,14 @@ addParameters({
     showNav: true,
     isFullscreen: false,
     isToolshown: true,
-    storySort: (a: any, b: any) => a[1].id.localeCompare(b[1].id),
+    storySort: (a: any, b: any) => {
+      if (a[1].kind.split('/')[0] === 'Docs Overview') {
+        return -1;
+      } else if (b[1].kind.split('/')[0] === 'Docs Overview') {
+        return 1;
+      }
+      return a[1].id.localeCompare(b[1].id);
+    },
   },
   knobs: {
     escapeHTML: false,
diff --git a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx
index a08d4d57845..0813313a152 100644
--- a/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx
+++ b/packages/grafana-ui/src/components/ButtonCascader/ButtonCascader.story.tsx
@@ -4,7 +4,7 @@ import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { ButtonCascader } from './ButtonCascader';
 
 export default {
-  title: 'General/ButtonCascader',
+  title: 'Forms/Cascader/ButtonCascader',
   component: ButtonCascader,
   decorators: [withKnobs, withCenteredStory],
 };
diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx
index 6320b48707e..4d19cc00c23 100644
--- a/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx
+++ b/packages/grafana-ui/src/components/Cascader/Cascader.story.tsx
@@ -6,7 +6,7 @@ import mdx from './Cascader.mdx';
 import React from 'react';
 
 export default {
-  title: 'General/Cascader',
+  title: 'Forms/Cascader',
   component: Cascader,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.tsx b/packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.internal.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.tsx
rename to packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.story.internal.tsx
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
index 93e085f6381..27f4b55f6d7 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.story.tsx
@@ -13,7 +13,7 @@ const getColorPickerKnobs = () => {
   };
 };
 
-const ColorPickerStories = storiesOf('General/ColorPicker/Pickers', module);
+const ColorPickerStories = storiesOf('Pickers and Editors/ColorPicker/Pickers', module);
 
 ColorPickerStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx
index d1629db28a9..22813e5be56 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.story.tsx
@@ -4,7 +4,7 @@ import { ColorPickerPopover } from './ColorPickerPopover';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { SeriesColorPickerPopover } from './SeriesColorPickerPopover';
 import { renderComponentWithTheme } from '../../utils/storybook/withTheme';
-const ColorPickerPopoverStories = storiesOf('General/ColorPicker/Popovers', module);
+const ColorPickerPopoverStories = storiesOf('Pickers and Editors/ColorPicker/Popovers', module);
 
 ColorPickerPopoverStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx b/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx
index 74fb8ca5a64..1e98f3c635e 100644
--- a/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx
+++ b/packages/grafana-ui/src/components/ConfirmButton/ConfirmButton.story.tsx
@@ -27,7 +27,7 @@ const getKnobs = () => {
   };
 };
 
-storiesOf('General/ConfirmButton', module)
+storiesOf('Forms/ConfirmButton', module)
   .addDecorator(withCenteredStory)
   .add('default', () => {
     const { size, buttonText, confirmText, confirmVariant, disabled, closeOnConfirm } = getKnobs();
diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx
index 68dff7b4853..ef49fc25ea2 100644
--- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx
+++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.story.tsx
@@ -24,7 +24,7 @@ const defaultActions = {
   },
 };
 
-const ConfirmModalStories = storiesOf('General/ConfirmModal', module);
+const ConfirmModalStories = storiesOf('Overlays/ConfirmModal', module);
 
 ConfirmModalStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx b/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx
index 3e78d19e05b..fea0ad5adcc 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/CustomHeaderSettings.story.tsx
@@ -4,7 +4,7 @@ import { CustomHeadersSettings } from './CustomHeadersSettings';
 import { DataSourceSettings } from '@grafana/data';
 
 export default {
-  title: 'Panel/DataSource/CustomHeadersSettings',
+  title: 'Data Source/CustomHeadersSettings',
   component: CustomHeadersSettings,
   decorators: [withCenteredStory, withHorizontallyCenteredStory],
 };
diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx
index 118026de1d5..a07a066585a 100644
--- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx
+++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx
@@ -31,7 +31,7 @@ const settingsMock: DataSourceSettings<any, any> = {
   readOnly: true,
 };
 
-const DataSourceHttpSettingsStories = storiesOf('Panel/DataSource/DataSourceHttpSettings', module);
+const DataSourceHttpSettingsStories = storiesOf('Data Source/DataSourceHttpSettings', module);
 
 DataSourceHttpSettingsStories.add('default', () => {
   return (
diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
index 63aae5ca576..75b82b3914c 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.story.tsx
@@ -6,7 +6,7 @@ import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import mdx from './Drawer.mdx';
 
 export default {
-  title: 'General/Drawer',
+  title: 'Overlays/Drawer',
   component: Drawer,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/FormField/FormField.story.tsx b/packages/grafana-ui/src/components/FormField/FormField.story.internal.tsx
similarity index 93%
rename from packages/grafana-ui/src/components/FormField/FormField.story.tsx
rename to packages/grafana-ui/src/components/FormField/FormField.story.internal.tsx
index f19802c19ff..754f98bf505 100644
--- a/packages/grafana-ui/src/components/FormField/FormField.story.tsx
+++ b/packages/grafana-ui/src/components/FormField/FormField.story.internal.tsx
@@ -14,7 +14,7 @@ const getKnobs = () => {
   };
 };
 
-const FormFieldStories = storiesOf('General/FormField', module);
+const FormFieldStories = storiesOf('Forms/Legacy/FormField', module);
 
 FormFieldStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx
index f2356ee0a6b..620a868ff63 100644
--- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx
+++ b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.story.internal.tsx
@@ -7,7 +7,7 @@ import { SelectableValue } from '@grafana/data';
 import { Select, AsyncSelect } from './Select';
 
 export default {
-  title: 'General/Select/Select',
+  title: 'Forms/Legacy/Select',
   component: Select,
   decorators: [withCenteredStory, withKnobs],
 };
diff --git a/packages/grafana-ui/src/components/Graph/Graph.story.tsx b/packages/grafana-ui/src/components/Graph/Graph.story.tsx
index eb1feeadc00..8af308fc78e 100644
--- a/packages/grafana-ui/src/components/Graph/Graph.story.tsx
+++ b/packages/grafana-ui/src/components/Graph/Graph.story.tsx
@@ -8,7 +8,7 @@ import { TooltipContentProps } from '../Chart/Tooltip';
 import { JSONFormatter } from '../JSONFormatter/JSONFormatter';
 
 export default {
-  title: 'Visualizations|Graph/Graph',
+  title: 'Visualizations/Graph',
   component: Graph,
   decorators: [withCenteredStory],
 };
diff --git a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx b/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx
index 4a2fbd34014..4323afab164 100644
--- a/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx
+++ b/packages/grafana-ui/src/components/InfoTooltip/InfoTooltip.story.tsx
@@ -4,6 +4,6 @@ import { storiesOf } from '@storybook/react';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { InfoTooltip } from './InfoTooltip';
 
-const story = storiesOf('General/Tooltip', module);
+const story = storiesOf('Overlays/Tooltip', module);
 story.addDecorator(withCenteredStory);
 story.add('InfoTooltip', () => <InfoTooltip>This is the content of the tooltip</InfoTooltip>);
diff --git a/packages/grafana-ui/src/components/Layout/Layout.mdx b/packages/grafana-ui/src/components/Layout/Layout.mdx
index da91db1d3bd..304c2adb3a1 100644
--- a/packages/grafana-ui/src/components/Layout/Layout.mdx
+++ b/packages/grafana-ui/src/components/Layout/Layout.mdx
@@ -1,7 +1,7 @@
-import { Story, Preview, Props } from '@storybook/addon-docs/blocks';
-import { Layout, HorizontalGroup, VerticalGroup } from './Layout';
-import { Button } from '../Button';
-import { Select } from '../index';
+import { Story, Preview, Props } from "@storybook/addon-docs/blocks";
+import { Layout, HorizontalGroup, VerticalGroup } from "./Layout";
+import { Button } from "../Button";
+import { Select } from "../index";
 
 # Layout
 
@@ -12,93 +12,85 @@ Used for aligning items in specified orientation. Useful for multiple elements t
 Expects multiple elements as `children` prop. This is the base for more specialised `Horizontal-` and `VerticalGroup` components.
 
 ### Props
+
 <Props of={Layout} />
 
 ## Horizontal
 
 Used for horizontally aligning several elements (e.g. Button, Select) with a predefined spacing between them.
+
 <Preview>
-    <HorizontalGroup>
-      <Button>Button 1</Button>
-      <Button>Button 2</Button>
-      <Button>Button 3</Button>
-    </HorizontalGroup>
- </Preview>
-
- <Preview>
-   <HorizontalGroup>
-     <Select
-       size='sm'
-       onChange={() => {}}
-       options={[
-         { value: 1, label: 'Option 1' },
-         { value: 2, label: 'Option 2' },
-       ]}
-     />
-     <Select
-       size='sm'
-       onChange={() => {}}
-       options={[
-         { value: 1, label: 'Option 1' },
-         { value: 2, label: 'Option 2' },
-       ]}
-     />
-     <Select
-       size='sm'
-       onChange={() => {}}
-       options={[
-         { value: 1, label: 'Option 1' },
-         { value: 2, label: 'Option 2' },
-       ]}
-     />
-   </HorizontalGroup>
- </Preview>
-
-
-### Props
-<Props of={HorizontalGroup} />
-
+  <HorizontalGroup>
+    <Button>Button 1</Button>
+    <Button>Button 2</Button>
+    <Button>Button 3</Button>
+  </HorizontalGroup>
+</Preview>
+<Preview>
+  <HorizontalGroup>
+    <Select
+      size="sm"
+      onChange={() => {}}
+      options={[
+        { value: 1, label: "Option 1" },
+        { value: 2, label: "Option 2" },
+      ]}
+    />
+    <Select
+      size="sm"
+      onChange={() => {}}
+      options={[
+        { value: 1, label: "Option 1" },
+        { value: 2, label: "Option 2" },
+      ]}
+    />
+    <Select
+      size="sm"
+      onChange={() => {}}
+      options={[
+        { value: 1, label: "Option 1" },
+        { value: 2, label: "Option 2" },
+      ]}
+    />
+  </HorizontalGroup>
+</Preview>
 
 ## Vertical
 
 Used for vertically aligning several elements (e.g. Button, Select) with a predefined spacing between them.
+
 <Preview>
-    <VerticalGroup>
-      <Button>Button 1</Button>
-      <Button>Button 2</Button>
-      <Button>Button 3</Button>
-    </VerticalGroup>
- </Preview>
-
- <Preview>
-   <VerticalGroup justify='center'>
+  <VerticalGroup>
+    <Button>Button 1</Button>
+    <Button>Button 2</Button>
+    <Button>Button 3</Button>
+  </VerticalGroup>
+</Preview>
+<Preview>
+  <VerticalGroup justify="center">
     <Select
-      size='sm'
+      size="sm"
       onChange={() => {}}
       options={[
-        { value: 1, label: 'Option 1' },
-        { value: 2, label: 'Option 2' },
+        { value: 1, label: "Option 1" },
+        { value: 2, label: "Option 2" },
       ]}
     />
     <Select
-      size='sm'
+      size="sm"
       onChange={() => {}}
       options={[
-        { value: 1, label: 'Option 1' },
-        { value: 2, label: 'Option 2' },
+        { value: 1, label: "Option 1" },
+        { value: 2, label: "Option 2" },
       ]}
     />
     <Select
-      size='sm'
+      size="sm"
       onChange={() => {}}
       options={[
-        { value: 1, label: 'Option 1' },
-        { value: 2, label: 'Option 2' },
+        { value: 1, label: "Option 1" },
+        { value: 2, label: "Option 2" },
       ]}
     />
-   </VerticalGroup>
- </Preview>
-
-
-### Props
-<Props of={VerticalGroup} />
+  </VerticalGroup>
+</Preview>
diff --git a/packages/grafana-ui/src/components/Layout/Layout.story.tsx b/packages/grafana-ui/src/components/Layout/Layout.story.tsx
index 0e11e476725..5d2df8ad939 100644
--- a/packages/grafana-ui/src/components/Layout/Layout.story.tsx
+++ b/packages/grafana-ui/src/components/Layout/Layout.story.tsx
@@ -10,6 +10,7 @@ export default {
   title: 'Layout/Groups',
   component: Layout,
   decorators: [withStoryContainer, withCenteredStory, withHorizontallyCenteredStory],
+  subcomponents: { HorizontalGroup, VerticalGroup },
   parameters: {
     docs: {
       page: mdx,
diff --git a/packages/grafana-ui/src/components/Legend/Legend.story.tsx b/packages/grafana-ui/src/components/Legend/Legend.story.tsx
index 63a1b4bf2e9..0c17958fe9a 100644
--- a/packages/grafana-ui/src/components/Legend/Legend.story.tsx
+++ b/packages/grafana-ui/src/components/Legend/Legend.story.tsx
@@ -87,7 +87,7 @@ const getStoriesKnobs = (table = false) => {
   };
 };
 
-const LegendStories = storiesOf('General/Legend/Legend', module);
+const LegendStories = storiesOf('Visualizations/Legend', module);
 
 LegendStories.add('list', () => {
   const { numberOfSeries, itemRenderer, containerWidth, rightAxisSeries, legendPlacement } = getStoriesKnobs();
diff --git a/packages/grafana-ui/src/components/List/List.story.tsx b/packages/grafana-ui/src/components/List/List.story.internal.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/List/List.story.tsx
rename to packages/grafana-ui/src/components/List/List.story.internal.tsx
diff --git a/packages/grafana-ui/src/components/Modal/Modal.story.tsx b/packages/grafana-ui/src/components/Modal/Modal.story.tsx
index 9dcc0577910..d5b4bc84b04 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.story.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.story.tsx
@@ -27,7 +27,7 @@ amet.`
   };
 };
 
-const ModalStories = storiesOf('General/Modal', module);
+const ModalStories = storiesOf('Overlays/Modal', module);
 ModalStories.addDecorator(withCenteredStory);
 
 ModalStories.add('default', () => {
diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx b/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx
index 91efa23f241..62db5d0f68d 100644
--- a/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx
+++ b/packages/grafana-ui/src/components/QueryField/QueryField.story.tsx
@@ -3,7 +3,7 @@ import { storiesOf } from '@storybook/react';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { QueryField } from './QueryField';
 
-const QueryFieldStories = storiesOf('Panel/QueryField', module);
+const QueryFieldStories = storiesOf('Data Source/QueryField', module);
 
 QueryFieldStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx
index ec7c5852bbe..6a2ac846569 100644
--- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx
+++ b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx
@@ -5,7 +5,7 @@ import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { UseState } from '../../utils/storybook/UseState';
 import { RefreshPicker } from './RefreshPicker';
 
-const RefreshSelectStories = storiesOf('Panel/RefreshPicker', module);
+const RefreshSelectStories = storiesOf('Pickers and Editors/RefreshPicker', module);
 
 RefreshSelectStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx b/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx
index af8fc3450f9..c9c0324d4d0 100644
--- a/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx
+++ b/packages/grafana-ui/src/components/SecretFormField/SecretFormField.story.tsx
@@ -7,7 +7,7 @@ import { SecretFormField } from './SecretFormField';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { UseState } from '../../utils/storybook/UseState';
 
-const SecretFormFieldStories = storiesOf('General/SecretFormField/SecretFormField', module);
+const SecretFormFieldStories = storiesOf('Forms/SecretFormField', module);
 
 SecretFormFieldStories.addDecorator(withCenteredStory);
 const getSecretFormFieldKnobs = () => {
diff --git a/packages/grafana-ui/src/components/Segment/Segment.story.tsx b/packages/grafana-ui/src/components/Segment/Segment.story.tsx
index 0a484c7147b..5118705f3f1 100644
--- a/packages/grafana-ui/src/components/Segment/Segment.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/Segment.story.tsx
@@ -45,8 +45,8 @@ export const ArrayOptions = () => {
 };
 
 export default {
-  title: 'Panel/Segment/SegmentSync',
-  component: ArrayOptions,
+  title: 'Data Source/Segment/SegmentSync',
+  component: Segment,
 };
 
 export const ArrayOptionsWithPrimitiveValue = () => {
diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
index d3620296e74..56482d8bcb7 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentAsync.story.tsx
@@ -49,8 +49,8 @@ export const ArrayOptions = () => {
 };
 
 export default {
-  title: 'Panel/Segment/SegmentAsync',
-  component: ArrayOptions,
+  title: 'Data Source/Segment/SegmentAsync',
+  component: SegmentAsync,
 };
 
 export const ArrayOptionsWithPrimitiveValue = () => {
diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
index 5e3fb4ce202..4965c643aa8 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
@@ -30,8 +30,8 @@ export const BasicInput = () => {
 };
 
 export default {
-  title: 'Panel/Segment/SegmentInput',
-  component: BasicInput,
+  title: 'Data Source/Segment/SegmentInput',
+  component: SegmentInput,
 };
 
 export const BasicInputWithPlaceholder = () => {
diff --git a/packages/grafana-ui/src/components/Slider/Slider.story.tsx b/packages/grafana-ui/src/components/Slider/Slider.story.tsx
index 2bd81439a5b..48dd5ac1b55 100644
--- a/packages/grafana-ui/src/components/Slider/Slider.story.tsx
+++ b/packages/grafana-ui/src/components/Slider/Slider.story.tsx
@@ -3,7 +3,7 @@ import { Slider } from './Slider';
 import { select, number, boolean } from '@storybook/addon-knobs';
 
 export default {
-  title: 'General/Slider',
+  title: 'Forms/Slider',
   component: Slider,
 };
 
diff --git a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
index 7f3ae8b7c03..5a47d10908f 100644
--- a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
+++ b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
@@ -61,7 +61,7 @@ export class WrapperWithState extends PureComponent<any, State> {
   }
 }
 
-const story = storiesOf('Panel/StatsPicker', module);
+const story = storiesOf('Pickers and Editors/StatsPicker', module);
 story.addDecorator(withCenteredStory);
 story.add('picker', () => {
   const { placeholder, defaultStat, allowMultiple, initialStats } = getKnobs();
diff --git a/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx b/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.internal.tsx
similarity index 88%
rename from packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx
rename to packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.internal.tsx
index 87839533f51..eaac9abfd9d 100644
--- a/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.tsx
+++ b/packages/grafana-ui/src/components/TableInputCSV/TableInputCSV.story.internal.tsx
@@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions';
 import { DataFrame } from '@grafana/data';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
-const TableInputStories = storiesOf('General/Experimental/TableInputCSV', module);
+const TableInputStories = storiesOf('Internal/TableInputCSV', module);
 
 TableInputStories.addDecorator(withCenteredStory);
 
diff --git a/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx b/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
index c6bc38c5b1c..4603fcb7a1a 100644
--- a/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
+++ b/packages/grafana-ui/src/components/Tabs/Tabs.story.tsx
@@ -6,7 +6,7 @@ import { Tab } from './Tab';
 import { TabContent } from './TabContent';
 
 export default {
-  title: 'General/Tabs',
+  title: 'Layout/Tabs',
   decorators: [withCenteredStory],
 };
 
diff --git a/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx b/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx
index fb14f31261d..774623d561d 100644
--- a/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx
+++ b/packages/grafana-ui/src/components/TagsInput/TagsInput.story.tsx
@@ -5,7 +5,7 @@ import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { UseState } from '../../utils/storybook/UseState';
 import { TagsInput } from './TagsInput';
 
-const TagsInputStories = storiesOf('General/TagsInput', module);
+const TagsInputStories = storiesOf('Forms/TagsInput', module);
 const mockTags = ['Some', 'Tags', 'With', 'This', 'New', 'Component'];
 
 TagsInputStories.addDecorator(withCenteredStory);
diff --git a/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.story.tsx b/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.story.tsx
index 00bcc501593..8bbefbaba66 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.story.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.story.tsx
@@ -14,7 +14,7 @@ const thresholds: ThresholdsConfig = {
 };
 
 export default {
-  title: 'Panel/ThresholdsEditorNew',
+  title: 'Pickers and Editors/ThresholdsEditorNew',
   component: ThresholdsEditor,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.tsx b/packages/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.internal.tsx
similarity index 94%
rename from packages/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.tsx
rename to packages/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.internal.tsx
index d2e297115ac..c85d6c1a395 100644
--- a/packages/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.tsx
+++ b/packages/grafana-ui/src/components/ToggleButtonGroup/ToggleButtonGroup.story.internal.tsx
@@ -6,7 +6,7 @@ import { ToggleButton, ToggleButtonGroup } from './ToggleButtonGroup';
 import { UseState } from '../../utils/storybook/UseState';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
-const ToggleButtonGroupStories = storiesOf('General/ToggleButtonGroup', module);
+const ToggleButtonGroupStories = storiesOf('Forms/Legacy/ToggleButtonGroup', module);
 
 const options = [
   { value: 'first', label: 'First' },
diff --git a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx
index 28639719405..5301bc2041d 100644
--- a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx
+++ b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.story.tsx
@@ -5,7 +5,7 @@ import { UnitPicker } from './UnitPicker';
 import mdx from './UnitPicker.mdx';
 
 export default {
-  title: 'General/UnitPicker',
+  title: 'Pickers and Editors/UnitPicker',
   component: UnitPicker,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.story.tsx b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.story.tsx
index 31444604102..e06bc8a5ad2 100644
--- a/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.story.tsx
+++ b/packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.story.tsx
@@ -3,7 +3,7 @@ import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import { ValueMappingsEditor } from './ValueMappingsEditor';
 
-const ValueMappingsEditorStories = storiesOf('Panel/ValueMappingsEditor', module);
+const ValueMappingsEditorStories = storiesOf('Pickers and Editors/ValueMappingsEditor', module);
 
 ValueMappingsEditorStories.add('default', () => {
   return <ValueMappingsEditor valueMappings={[]} onChange={action('Mapping changed')} />;
diff --git a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx
index b0757302663..5968dac8b3a 100644
--- a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx
+++ b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.story.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { generateOptions } from '../Select/mockOptions';
 
 export default {
-  title: 'General/ValuePicker',
+  title: 'Pickers and Editors/ValuePicker',
   component: ValuePicker,
   decorators: [withCenteredStory],
 };
diff --git a/packages/grafana-ui/src/utils/useDelayedSwitch.story.tsx b/packages/grafana-ui/src/utils/useDelayedSwitch.story.internal.tsx
similarity index 100%
rename from packages/grafana-ui/src/utils/useDelayedSwitch.story.tsx
rename to packages/grafana-ui/src/utils/useDelayedSwitch.story.internal.tsx