diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09e3fdce..9748c0bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - [Core] `closable()` mixin is now triggered on `touchend` events on touch devices. (#176)
 - [Storybook] Update examples for `<Popover>` to add a row of hyperlink `<Button>`. (#176)
+- [Storybook] Split stories into different package-based sections. (#177)
 
 ## [1.9.0]
 ### Added
diff --git a/packages/storybook/.storybook/config.js b/packages/storybook/.storybook/config.js
index 522f6885..02b8ef75 100644
--- a/packages/storybook/.storybook/config.js
+++ b/packages/storybook/.storybook/config.js
@@ -12,6 +12,7 @@ setOptions({
     name: 'iCHEF gypcrete',
     url: 'https://github.com/iCHEF/gypcrete',
     showDownPanel: true,
+    hierarchyRootSeparator: /\|/,
 });
 
 setDefaults({
diff --git a/packages/storybook/examples/Button/BasicButton.js b/packages/storybook/examples/core/Button/BasicButton.js
similarity index 100%
rename from packages/storybook/examples/Button/BasicButton.js
rename to packages/storybook/examples/core/Button/BasicButton.js
diff --git a/packages/storybook/examples/Button/ButtonWithStatus.js b/packages/storybook/examples/core/Button/ButtonWithStatus.js
similarity index 100%
rename from packages/storybook/examples/Button/ButtonWithStatus.js
rename to packages/storybook/examples/core/Button/ButtonWithStatus.js
diff --git a/packages/storybook/examples/Button/CustomTagButton.js b/packages/storybook/examples/core/Button/CustomTagButton.js
similarity index 100%
rename from packages/storybook/examples/Button/CustomTagButton.js
rename to packages/storybook/examples/core/Button/CustomTagButton.js
diff --git a/packages/storybook/examples/Button/DisabledButton.js b/packages/storybook/examples/core/Button/DisabledButton.js
similarity index 100%
rename from packages/storybook/examples/Button/DisabledButton.js
rename to packages/storybook/examples/core/Button/DisabledButton.js
diff --git a/packages/storybook/examples/Button/ExpandedButton.js b/packages/storybook/examples/core/Button/ExpandedButton.js
similarity index 100%
rename from packages/storybook/examples/Button/ExpandedButton.js
rename to packages/storybook/examples/core/Button/ExpandedButton.js
diff --git a/packages/storybook/examples/Button/SolidButton.js b/packages/storybook/examples/core/Button/SolidButton.js
similarity index 100%
rename from packages/storybook/examples/Button/SolidButton.js
rename to packages/storybook/examples/core/Button/SolidButton.js
diff --git a/packages/storybook/examples/Button/index.js b/packages/storybook/examples/core/Button/index.js
similarity index 91%
rename from packages/storybook/examples/Button/index.js
rename to packages/storybook/examples/core/Button/index.js
index 6d0b0d16..893f58cb 100644
--- a/packages/storybook/examples/Button/index.js
+++ b/packages/storybook/examples/core/Button/index.js
@@ -2,6 +2,7 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Button, { PureButton } from '@ichef/gypcrete/src/Button';
+import getPropTables from 'utils/getPropTables';
 
 import BasicButtonExample from './BasicButton';
 import SolidButtonExample from './SolidButton';
@@ -10,9 +11,7 @@ import ExpandedButtonExample from './ExpandedButton';
 import ButtonWithStatusExample from './ButtonWithStatus';
 import CustomTagButtonExample from './CustomTagButton';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Button', module)
+storiesOf('@ichef/gypcrete|Button', module)
     .add('basic usage',
         withInfo()(BasicButtonExample)
     )
diff --git a/packages/storybook/examples/Checkbox/BasicCheckbox.js b/packages/storybook/examples/core/Checkbox/BasicCheckbox.js
similarity index 100%
rename from packages/storybook/examples/Checkbox/BasicCheckbox.js
rename to packages/storybook/examples/core/Checkbox/BasicCheckbox.js
diff --git a/packages/storybook/examples/Checkbox/CheckboxWithIndeterminate.js b/packages/storybook/examples/core/Checkbox/CheckboxWithIndeterminate.js
similarity index 100%
rename from packages/storybook/examples/Checkbox/CheckboxWithIndeterminate.js
rename to packages/storybook/examples/core/Checkbox/CheckboxWithIndeterminate.js
diff --git a/packages/storybook/examples/Checkbox/CheckboxWithStatus.js b/packages/storybook/examples/core/Checkbox/CheckboxWithStatus.js
similarity index 100%
rename from packages/storybook/examples/Checkbox/CheckboxWithStatus.js
rename to packages/storybook/examples/core/Checkbox/CheckboxWithStatus.js
diff --git a/packages/storybook/examples/Checkbox/index.js b/packages/storybook/examples/core/Checkbox/index.js
similarity index 89%
rename from packages/storybook/examples/Checkbox/index.js
rename to packages/storybook/examples/core/Checkbox/index.js
index 5f6c901f..e1d4ef57 100644
--- a/packages/storybook/examples/Checkbox/index.js
+++ b/packages/storybook/examples/core/Checkbox/index.js
@@ -3,14 +3,13 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Checkbox, { PureCheckbox } from '@ichef/gypcrete/src/Checkbox';
+import getPropTables from 'utils/getPropTables';
 
 import BasicCheckboxExample from './BasicCheckbox';
 import CheckboxWithIndeterminateExample from './CheckboxWithIndeterminate';
 import CheckboxWithStatusExample from './CheckboxWithStatus';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Checkbox', module)
+storiesOf('@ichef/gypcrete|Checkbox', module)
     .add('basic usage',
         withInfo()(BasicCheckboxExample)
     )
diff --git a/packages/storybook/examples/ColumnView/BasicUsage.js b/packages/storybook/examples/core/ColumnView/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/ColumnView/BasicUsage.js
rename to packages/storybook/examples/core/ColumnView/BasicUsage.js
diff --git a/packages/storybook/examples/ColumnView/index.js b/packages/storybook/examples/core/ColumnView/index.js
similarity index 75%
rename from packages/storybook/examples/ColumnView/index.js
rename to packages/storybook/examples/core/ColumnView/index.js
index 4d9b612a..e9c730bb 100644
--- a/packages/storybook/examples/ColumnView/index.js
+++ b/packages/storybook/examples/core/ColumnView/index.js
@@ -2,11 +2,10 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import ColumnView from '@ichef/gypcrete/src/ColumnView';
+import getPropTables from 'utils/getPropTables';
 import BasicUsage from './BasicUsage';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('ColumnView', module)
+storiesOf('@ichef/gypcrete|ColumnView', module)
     .add('basic usage',
         withInfo()(BasicUsage)
     )
diff --git a/packages/storybook/examples/EditableText/Alignments.js b/packages/storybook/examples/core/EditableText/Alignments.js
similarity index 100%
rename from packages/storybook/examples/EditableText/Alignments.js
rename to packages/storybook/examples/core/EditableText/Alignments.js
diff --git a/packages/storybook/examples/EditableText/BasicUsage.js b/packages/storybook/examples/core/EditableText/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/EditableText/BasicUsage.js
rename to packages/storybook/examples/core/EditableText/BasicUsage.js
diff --git a/packages/storybook/examples/EditableText/MultiLines.js b/packages/storybook/examples/core/EditableText/MultiLines.js
similarity index 100%
rename from packages/storybook/examples/EditableText/MultiLines.js
rename to packages/storybook/examples/core/EditableText/MultiLines.js
diff --git a/packages/storybook/examples/EditableText/index.js b/packages/storybook/examples/core/EditableText/index.js
similarity index 85%
rename from packages/storybook/examples/EditableText/index.js
rename to packages/storybook/examples/core/EditableText/index.js
index 52521f19..6d4d7421 100644
--- a/packages/storybook/examples/EditableText/index.js
+++ b/packages/storybook/examples/core/EditableText/index.js
@@ -2,14 +2,13 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import EditableText, { PureEditableText } from '@ichef/gypcrete/src/EditableText';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
 import Alignments from './Alignments';
 import MultiLines from './MultiLines';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('EditableText', module)
+storiesOf('@ichef/gypcrete|EditableText', module)
     .add('Basic usage',
         withInfo()(BasicUsage)
     )
diff --git a/packages/storybook/examples/HeaderRow/BasicUsage.js b/packages/storybook/examples/core/HeaderRow/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/HeaderRow/BasicUsage.js
rename to packages/storybook/examples/core/HeaderRow/BasicUsage.js
diff --git a/packages/storybook/examples/HeaderRow/OptionalArea.js b/packages/storybook/examples/core/HeaderRow/OptionalArea.js
similarity index 100%
rename from packages/storybook/examples/HeaderRow/OptionalArea.js
rename to packages/storybook/examples/core/HeaderRow/OptionalArea.js
diff --git a/packages/storybook/examples/HeaderRow/index.js b/packages/storybook/examples/core/HeaderRow/index.js
similarity index 83%
rename from packages/storybook/examples/HeaderRow/index.js
rename to packages/storybook/examples/core/HeaderRow/index.js
index f42688dc..a2c1312c 100644
--- a/packages/storybook/examples/HeaderRow/index.js
+++ b/packages/storybook/examples/core/HeaderRow/index.js
@@ -2,14 +2,12 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import HeaderRow from '@ichef/gypcrete/src/HeaderRow';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
 import OptionalArea from './OptionalArea';
 
-import getPropTables from '../../utils/getPropTables';
-
-
-storiesOf('HeaderRow', module)
+storiesOf('@ichef/gypcrete|HeaderRow', module)
     .add('Basic usage', withInfo()(BasicUsage))
     .add(
         'Optional area',
diff --git a/packages/storybook/examples/Icon/BasicIcons.js b/packages/storybook/examples/core/Icon/BasicIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/BasicIcons.js
rename to packages/storybook/examples/core/Icon/BasicIcons.js
diff --git a/packages/storybook/examples/Icon/CRMIcons.js b/packages/storybook/examples/core/Icon/CRMIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/CRMIcons.js
rename to packages/storybook/examples/core/Icon/CRMIcons.js
diff --git a/packages/storybook/examples/Icon/IconColors.js b/packages/storybook/examples/core/Icon/IconColors.js
similarity index 100%
rename from packages/storybook/examples/Icon/IconColors.js
rename to packages/storybook/examples/core/Icon/IconColors.js
diff --git a/packages/storybook/examples/Icon/InlineIcons.js b/packages/storybook/examples/core/Icon/InlineIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/InlineIcons.js
rename to packages/storybook/examples/core/Icon/InlineIcons.js
diff --git a/packages/storybook/examples/Icon/InventoryIcons.js b/packages/storybook/examples/core/Icon/InventoryIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/InventoryIcons.js
rename to packages/storybook/examples/core/Icon/InventoryIcons.js
diff --git a/packages/storybook/examples/Icon/LargeIcon.js b/packages/storybook/examples/core/Icon/LargeIcon.js
similarity index 100%
rename from packages/storybook/examples/Icon/LargeIcon.js
rename to packages/storybook/examples/core/Icon/LargeIcon.js
diff --git a/packages/storybook/examples/Icon/MenuPageIcons.js b/packages/storybook/examples/core/Icon/MenuPageIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/MenuPageIcons.js
rename to packages/storybook/examples/core/Icon/MenuPageIcons.js
diff --git a/packages/storybook/examples/Icon/PaginationIcons.js b/packages/storybook/examples/core/Icon/PaginationIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/PaginationIcons.js
rename to packages/storybook/examples/core/Icon/PaginationIcons.js
diff --git a/packages/storybook/examples/Icon/PaymentIcons.js b/packages/storybook/examples/core/Icon/PaymentIcons.js
similarity index 100%
rename from packages/storybook/examples/Icon/PaymentIcons.js
rename to packages/storybook/examples/core/Icon/PaymentIcons.js
diff --git a/packages/storybook/examples/Icon/index.js b/packages/storybook/examples/core/Icon/index.js
similarity index 93%
rename from packages/storybook/examples/Icon/index.js
rename to packages/storybook/examples/core/Icon/index.js
index ac5a2dbd..c7e6ed02 100644
--- a/packages/storybook/examples/Icon/index.js
+++ b/packages/storybook/examples/core/Icon/index.js
@@ -2,6 +2,7 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Icon from '@ichef/gypcrete/src/Icon';
+import getPropTables from 'utils/getPropTables';
 
 import BasicIconsSet from './BasicIcons';
 import PaymentIconsSet from './PaymentIcons';
@@ -14,9 +15,7 @@ import InlineIconsSet from './InlineIcons';
 import LargeIconExample from './LargeIcon';
 import IconColorsExample from './IconColors';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Icon', module)
+storiesOf('@ichef/gypcrete|Icon', module)
     .add('basic icons set',
         withInfo()(BasicIconsSet)
     )
diff --git a/packages/storybook/examples/IconButton/BasicIconButton.js b/packages/storybook/examples/core/IconButton/BasicIconButton.js
similarity index 100%
rename from packages/storybook/examples/IconButton/BasicIconButton.js
rename to packages/storybook/examples/core/IconButton/BasicIconButton.js
diff --git a/packages/storybook/examples/IconButton/IconButtonWithStatus.js b/packages/storybook/examples/core/IconButton/IconButtonWithStatus.js
similarity index 100%
rename from packages/storybook/examples/IconButton/IconButtonWithStatus.js
rename to packages/storybook/examples/core/IconButton/IconButtonWithStatus.js
diff --git a/packages/storybook/examples/IconButton/index.js b/packages/storybook/examples/core/IconButton/index.js
similarity index 86%
rename from packages/storybook/examples/IconButton/index.js
rename to packages/storybook/examples/core/IconButton/index.js
index 2883ddeb..72d0101d 100644
--- a/packages/storybook/examples/IconButton/index.js
+++ b/packages/storybook/examples/core/IconButton/index.js
@@ -2,13 +2,12 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import IconButton from '@ichef/gypcrete/src/IconButton';
+import getPropTables from 'utils/getPropTables';
 
 import BasicIconButtonExample from './BasicIconButton';
 import IconButtonWithStatusExample from './IconButtonWithStatus';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('IconButton', module)
+storiesOf('@ichef/gypcrete|IconButton', module)
     .add('basic usage',
         withInfo('IconButton is a variant of `<Button>`.')(
             BasicIconButtonExample
diff --git a/packages/storybook/examples/IconCheckbox/BasicIconCheckbox.js b/packages/storybook/examples/core/IconCheckbox/BasicIconCheckbox.js
similarity index 100%
rename from packages/storybook/examples/IconCheckbox/BasicIconCheckbox.js
rename to packages/storybook/examples/core/IconCheckbox/BasicIconCheckbox.js
diff --git a/packages/storybook/examples/IconCheckbox/IconCheckboxWithStatus.js b/packages/storybook/examples/core/IconCheckbox/IconCheckboxWithStatus.js
similarity index 100%
rename from packages/storybook/examples/IconCheckbox/IconCheckboxWithStatus.js
rename to packages/storybook/examples/core/IconCheckbox/IconCheckboxWithStatus.js
diff --git a/packages/storybook/examples/IconCheckbox/index.js b/packages/storybook/examples/core/IconCheckbox/index.js
similarity index 85%
rename from packages/storybook/examples/IconCheckbox/index.js
rename to packages/storybook/examples/core/IconCheckbox/index.js
index a4743425..91ccae36 100644
--- a/packages/storybook/examples/IconCheckbox/index.js
+++ b/packages/storybook/examples/core/IconCheckbox/index.js
@@ -1,15 +1,13 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import IconCheckbox from '@ichef/gypcrete/src/IconCheckbox';
+import getPropTables from 'utils/getPropTables';
 
 import BasicIconCheckboxExample from './BasicIconCheckbox';
 import IconCheckboxWithStatusExample from './IconCheckboxWithStatus';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('IconCheckbox', module)
+storiesOf('@ichef/gypcrete|IconCheckbox', module)
     .add('basic usage',
         withInfo('IconCheckbox is a variant of `<Checkbox>`')(
             BasicIconCheckboxExample
diff --git a/packages/storybook/examples/InfiniteScroll/BasicUsage.js b/packages/storybook/examples/core/InfiniteScroll/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/InfiniteScroll/BasicUsage.js
rename to packages/storybook/examples/core/InfiniteScroll/BasicUsage.js
diff --git a/packages/storybook/examples/InfiniteScroll/PageAsContainer.js b/packages/storybook/examples/core/InfiniteScroll/PageAsContainer.js
similarity index 100%
rename from packages/storybook/examples/InfiniteScroll/PageAsContainer.js
rename to packages/storybook/examples/core/InfiniteScroll/PageAsContainer.js
diff --git a/packages/storybook/examples/InfiniteScroll/index.js b/packages/storybook/examples/core/InfiniteScroll/index.js
similarity index 86%
rename from packages/storybook/examples/InfiniteScroll/index.js
rename to packages/storybook/examples/core/InfiniteScroll/index.js
index 640cad25..666253b2 100644
--- a/packages/storybook/examples/InfiniteScroll/index.js
+++ b/packages/storybook/examples/core/InfiniteScroll/index.js
@@ -3,13 +3,12 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import InfiniteScroll from '@ichef/gypcrete/src/InfiniteScroll';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsageExample from './BasicUsage';
 import PageAsContainerExample from './PageAsContainer';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('InfiniteScroll')
+storiesOf('@ichef/gypcrete|InfiniteScroll', module)
     .add('basic usage',
         withInfo('placed in a fixed height container')(
             () => <BasicUsageExample />
diff --git a/packages/storybook/examples/List/NestedList.js b/packages/storybook/examples/core/List/NestedList.js
similarity index 100%
rename from packages/storybook/examples/List/NestedList.js
rename to packages/storybook/examples/core/List/NestedList.js
diff --git a/packages/storybook/examples/List/NormalList.js b/packages/storybook/examples/core/List/NormalList.js
similarity index 100%
rename from packages/storybook/examples/List/NormalList.js
rename to packages/storybook/examples/core/List/NormalList.js
diff --git a/packages/storybook/examples/List/SettingList.js b/packages/storybook/examples/core/List/SettingList.js
similarity index 100%
rename from packages/storybook/examples/List/SettingList.js
rename to packages/storybook/examples/core/List/SettingList.js
diff --git a/packages/storybook/examples/List/index.js b/packages/storybook/examples/core/List/index.js
similarity index 86%
rename from packages/storybook/examples/List/index.js
rename to packages/storybook/examples/core/List/index.js
index d224c36e..266a618c 100644
--- a/packages/storybook/examples/List/index.js
+++ b/packages/storybook/examples/core/List/index.js
@@ -4,14 +4,13 @@ import { withInfo } from '@storybook/addon-info';
 // For props table
 import List from '@ichef/gypcrete/src/List';
 import ListRow from '@ichef/gypcrete/src/ListRow';
+import getPropTables from 'utils/getPropTables';
 
 import NormalList from './NormalList';
 import SettingList from './SettingList';
 import NestedList from './NestedList';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('List', module)
+storiesOf('@ichef/gypcrete|List', module)
     .add('Normal list',
         withInfo()(NormalList)
     )
diff --git a/packages/storybook/examples/Modal/BasicModal.js b/packages/storybook/examples/core/Modal/BasicModal.js
similarity index 100%
rename from packages/storybook/examples/Modal/BasicModal.js
rename to packages/storybook/examples/core/Modal/BasicModal.js
diff --git a/packages/storybook/examples/Modal/ModalHeader.js b/packages/storybook/examples/core/Modal/ModalHeader.js
similarity index 100%
rename from packages/storybook/examples/Modal/ModalHeader.js
rename to packages/storybook/examples/core/Modal/ModalHeader.js
diff --git a/packages/storybook/examples/Modal/index.js b/packages/storybook/examples/core/Modal/index.js
similarity index 94%
rename from packages/storybook/examples/Modal/index.js
rename to packages/storybook/examples/core/Modal/index.js
index 5a6a88f1..2ebf755b 100644
--- a/packages/storybook/examples/Modal/index.js
+++ b/packages/storybook/examples/core/Modal/index.js
@@ -3,11 +3,11 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Modal, { PureModal } from '@ichef/gypcrete/src/Modal';
+import getPropTables from 'utils/getPropTables';
 
 import BasicModalExample, { ClosableModalExample } from './BasicModal';
-import getPropTables from '../../utils/getPropTables';
 
-storiesOf('Modal', module)
+storiesOf('@ichef/gypcrete|Modal', module)
     .add(
         'basic usage',
         withInfo()(() => (
diff --git a/packages/storybook/examples/Popover/Anchored.js b/packages/storybook/examples/core/Popover/Anchored.js
similarity index 100%
rename from packages/storybook/examples/Popover/Anchored.js
rename to packages/storybook/examples/core/Popover/Anchored.js
diff --git a/packages/storybook/examples/Popover/Basic.js b/packages/storybook/examples/core/Popover/Basic.js
similarity index 100%
rename from packages/storybook/examples/Popover/Basic.js
rename to packages/storybook/examples/core/Popover/Basic.js
diff --git a/packages/storybook/examples/Popover/DemoList.js b/packages/storybook/examples/core/Popover/DemoList.js
similarity index 100%
rename from packages/storybook/examples/Popover/DemoList.js
rename to packages/storybook/examples/core/Popover/DemoList.js
diff --git a/packages/storybook/examples/Popover/index.js b/packages/storybook/examples/core/Popover/index.js
similarity index 84%
rename from packages/storybook/examples/Popover/index.js
rename to packages/storybook/examples/core/Popover/index.js
index d4ce338b..4bd9e2f7 100644
--- a/packages/storybook/examples/Popover/index.js
+++ b/packages/storybook/examples/core/Popover/index.js
@@ -2,15 +2,13 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import Popover, { PurePopover } from '@ichef/gypcrete/src/Popover';
+import getPropTables from 'utils/getPropTables';
 
 import BasicExample from './Basic';
 import AnchoredExample from './Anchored';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Popover', module)
+storiesOf('@ichef/gypcrete|Popover', module)
     .add('basic usage', withInfo()(BasicExample))
     .add(
         'anchored popover',
diff --git a/packages/storybook/examples/Popup/BasicPopup.js b/packages/storybook/examples/core/Popup/BasicPopup.js
similarity index 100%
rename from packages/storybook/examples/Popup/BasicPopup.js
rename to packages/storybook/examples/core/Popup/BasicPopup.js
diff --git a/packages/storybook/examples/Popup/HorizontalButtons.js b/packages/storybook/examples/core/Popup/HorizontalButtons.js
similarity index 100%
rename from packages/storybook/examples/Popup/HorizontalButtons.js
rename to packages/storybook/examples/core/Popup/HorizontalButtons.js
diff --git a/packages/storybook/examples/Popup/index.js b/packages/storybook/examples/core/Popup/index.js
similarity index 81%
rename from packages/storybook/examples/Popup/index.js
rename to packages/storybook/examples/core/Popup/index.js
index cf4af5e3..840483e0 100644
--- a/packages/storybook/examples/Popup/index.js
+++ b/packages/storybook/examples/core/Popup/index.js
@@ -1,15 +1,13 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import Popup, { PurePopup } from '@ichef/gypcrete/src/Popup';
+import getPropTables from 'utils/getPropTables';
 
 import BasicPopupExample from './BasicPopup';
 import HorizontalButtonsExample from './HorizontalButtons';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Popup', module)
+storiesOf('@ichef/gypcrete|Popup', module)
     .add('basic usage', withInfo()(BasicPopupExample))
     .add('horizontal buttons', withInfo()(HorizontalButtonsExample))
     // Props table
diff --git a/packages/storybook/examples/SearchInput/BasicSearchInput.js b/packages/storybook/examples/core/SearchInput/BasicSearchInput.js
similarity index 100%
rename from packages/storybook/examples/SearchInput/BasicSearchInput.js
rename to packages/storybook/examples/core/SearchInput/BasicSearchInput.js
diff --git a/packages/storybook/examples/SearchInput/index.js b/packages/storybook/examples/core/SearchInput/index.js
similarity index 78%
rename from packages/storybook/examples/SearchInput/index.js
rename to packages/storybook/examples/core/SearchInput/index.js
index 81e1809d..5a1d1f36 100644
--- a/packages/storybook/examples/SearchInput/index.js
+++ b/packages/storybook/examples/core/SearchInput/index.js
@@ -1,13 +1,12 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import SearchInput, { PureSearchInput } from '@ichef/gypcrete/src/SearchInput';
+import getPropTables from 'utils/getPropTables';
 
 import BasicSearchInputExample from './BasicSearchInput';
-import getPropTables from '../../utils/getPropTables';
 
-storiesOf('SearchInput', module)
+storiesOf('@ichef/gypcrete|SearchInput', module)
     .add('basic usage',
         withInfo()(BasicSearchInputExample)
     )
diff --git a/packages/storybook/examples/Section/DemoContent.js b/packages/storybook/examples/core/Section/DemoContent.js
similarity index 100%
rename from packages/storybook/examples/Section/DemoContent.js
rename to packages/storybook/examples/core/Section/DemoContent.js
diff --git a/packages/storybook/examples/Section/index.js b/packages/storybook/examples/core/Section/index.js
similarity index 94%
rename from packages/storybook/examples/Section/index.js
rename to packages/storybook/examples/core/Section/index.js
index ae7c4560..e478a3f3 100644
--- a/packages/storybook/examples/Section/index.js
+++ b/packages/storybook/examples/core/Section/index.js
@@ -3,12 +3,12 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Section from '@ichef/gypcrete/src/Section';
+
+import getPropTables from 'utils/getPropTables';
 import DebugBox from 'utils/DebugBox';
 import DemoContent from './DemoContent';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Section', module)
+storiesOf('@ichef/gypcrete|Section', module)
     .add('Plain section', withInfo('Plain <Section> with spacing around container')(() => (
         <DebugBox>
             <Section>
diff --git a/packages/storybook/examples/StatusIcon/BasicStatusIcon.js b/packages/storybook/examples/core/StatusIcon/BasicStatusIcon.js
similarity index 100%
rename from packages/storybook/examples/StatusIcon/BasicStatusIcon.js
rename to packages/storybook/examples/core/StatusIcon/BasicStatusIcon.js
diff --git a/packages/storybook/examples/StatusIcon/CornerStatusIcon.js b/packages/storybook/examples/core/StatusIcon/CornerStatusIcon.js
similarity index 100%
rename from packages/storybook/examples/StatusIcon/CornerStatusIcon.js
rename to packages/storybook/examples/core/StatusIcon/CornerStatusIcon.js
diff --git a/packages/storybook/examples/StatusIcon/index.js b/packages/storybook/examples/core/StatusIcon/index.js
similarity index 82%
rename from packages/storybook/examples/StatusIcon/index.js
rename to packages/storybook/examples/core/StatusIcon/index.js
index d3927e38..55baf30a 100644
--- a/packages/storybook/examples/StatusIcon/index.js
+++ b/packages/storybook/examples/core/StatusIcon/index.js
@@ -1,15 +1,13 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import StatusIcon from '@ichef/gypcrete/src/StatusIcon';
+import getPropTables from 'utils/getPropTables';
 
 import BasicStatusIconExample from './BasicStatusIcon';
 import CornerStatusIconExample from './CornerStatusIcon';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('StatusIcon', module)
+storiesOf('@ichef/gypcrete|StatusIcon', module)
     .add('basic usage',
         withInfo()(BasicStatusIconExample)
     )
diff --git a/packages/storybook/examples/SwichIcon/BasicUsage.js b/packages/storybook/examples/core/SwichIcon/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/SwichIcon/BasicUsage.js
rename to packages/storybook/examples/core/SwichIcon/BasicUsage.js
diff --git a/packages/storybook/examples/SwichIcon/index.js b/packages/storybook/examples/core/SwichIcon/index.js
similarity index 81%
rename from packages/storybook/examples/SwichIcon/index.js
rename to packages/storybook/examples/core/SwichIcon/index.js
index e6199c5d..4a419580 100644
--- a/packages/storybook/examples/SwichIcon/index.js
+++ b/packages/storybook/examples/core/SwichIcon/index.js
@@ -2,11 +2,10 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import SwitchIcon from '@ichef/gypcrete/src/SwitchIcon';
+import getPropTables from 'utils/getPropTables';
 import BasicUsage from './BasicUsage';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('SwitchIcon', module)
+storiesOf('@ichef/gypcrete|SwitchIcon', module)
     .add('Basic usage',
         withInfo(
             `A <SwitchIcon> is a visual element that is supposed
diff --git a/packages/storybook/examples/Switch/BasicUsage.js b/packages/storybook/examples/core/Switch/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/Switch/BasicUsage.js
rename to packages/storybook/examples/core/Switch/BasicUsage.js
diff --git a/packages/storybook/examples/Switch/ControlledInput.js b/packages/storybook/examples/core/Switch/ControlledInput.js
similarity index 100%
rename from packages/storybook/examples/Switch/ControlledInput.js
rename to packages/storybook/examples/core/Switch/ControlledInput.js
diff --git a/packages/storybook/examples/Switch/InputProps.js b/packages/storybook/examples/core/Switch/InputProps.js
similarity index 100%
rename from packages/storybook/examples/Switch/InputProps.js
rename to packages/storybook/examples/core/Switch/InputProps.js
diff --git a/packages/storybook/examples/Switch/WithStatus.js b/packages/storybook/examples/core/Switch/WithStatus.js
similarity index 100%
rename from packages/storybook/examples/Switch/WithStatus.js
rename to packages/storybook/examples/core/Switch/WithStatus.js
diff --git a/packages/storybook/examples/Switch/index.js b/packages/storybook/examples/core/Switch/index.js
similarity index 90%
rename from packages/storybook/examples/Switch/index.js
rename to packages/storybook/examples/core/Switch/index.js
index d4836abf..0578f2a0 100644
--- a/packages/storybook/examples/Switch/index.js
+++ b/packages/storybook/examples/core/Switch/index.js
@@ -2,15 +2,14 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Switch, { PureSwitch } from '@ichef/gypcrete/src/Switch';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
 import ControlledInput from './ControlledInput';
 import WithStatus from './WithStatus';
 import InputProps from './InputProps';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Switch', module)
+storiesOf('@ichef/gypcrete|Switch', module)
     .add('Basic usage',
         withInfo(
             `A <Switch> is a row component which can be turned either on
diff --git a/packages/storybook/examples/Tag/BasicTag.js b/packages/storybook/examples/core/Tag/BasicTag.js
similarity index 100%
rename from packages/storybook/examples/Tag/BasicTag.js
rename to packages/storybook/examples/core/Tag/BasicTag.js
diff --git a/packages/storybook/examples/Tag/TagWithParentColor.js b/packages/storybook/examples/core/Tag/TagWithParentColor.js
similarity index 100%
rename from packages/storybook/examples/Tag/TagWithParentColor.js
rename to packages/storybook/examples/core/Tag/TagWithParentColor.js
diff --git a/packages/storybook/examples/Tag/index.js b/packages/storybook/examples/core/Tag/index.js
similarity index 81%
rename from packages/storybook/examples/Tag/index.js
rename to packages/storybook/examples/core/Tag/index.js
index 51b436f9..d00e2edf 100644
--- a/packages/storybook/examples/Tag/index.js
+++ b/packages/storybook/examples/core/Tag/index.js
@@ -1,15 +1,13 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import Tag from '@ichef/gypcrete/src/Tag';
+import getPropTables from 'utils/getPropTables';
 
 import BasicTagExample from './BasicTag';
 import TagWithParentColorExample from './TagWithParentColor';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Tag', module)
+storiesOf('@ichef/gypcrete|Tag', module)
     .add('basic usage',
         withInfo()(BasicTagExample)
     )
diff --git a/packages/storybook/examples/Text/BasicText.js b/packages/storybook/examples/core/Text/BasicText.js
similarity index 100%
rename from packages/storybook/examples/Text/BasicText.js
rename to packages/storybook/examples/core/Text/BasicText.js
diff --git a/packages/storybook/examples/Text/Ellipsis.js b/packages/storybook/examples/core/Text/Ellipsis.js
similarity index 100%
rename from packages/storybook/examples/Text/Ellipsis.js
rename to packages/storybook/examples/core/Text/Ellipsis.js
diff --git a/packages/storybook/examples/Text/TextWithStatusIcon.js b/packages/storybook/examples/core/Text/TextWithStatusIcon.js
similarity index 100%
rename from packages/storybook/examples/Text/TextWithStatusIcon.js
rename to packages/storybook/examples/core/Text/TextWithStatusIcon.js
diff --git a/packages/storybook/examples/Text/index.js b/packages/storybook/examples/core/Text/index.js
similarity index 85%
rename from packages/storybook/examples/Text/index.js
rename to packages/storybook/examples/core/Text/index.js
index 3ac6ded6..8ea96974 100644
--- a/packages/storybook/examples/Text/index.js
+++ b/packages/storybook/examples/core/Text/index.js
@@ -1,16 +1,14 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import Text, { PureText } from '@ichef/gypcrete/src/Text';
+import getPropTables from 'utils/getPropTables';
 
 import BasicTextExample from './BasicText';
 import EllipsisExample from './Ellipsis';
 import TextWithStatusIconExample from './TextWithStatusIcon';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Text', module)
+storiesOf('@ichef/gypcrete|Text', module)
     .add('basic usage',
         withInfo()(BasicTextExample)
     )
diff --git a/packages/storybook/examples/TextInput/BasicUsage.js b/packages/storybook/examples/core/TextInput/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/TextInput/BasicUsage.js
rename to packages/storybook/examples/core/TextInput/BasicUsage.js
diff --git a/packages/storybook/examples/TextInput/MultiLines.js b/packages/storybook/examples/core/TextInput/MultiLines.js
similarity index 100%
rename from packages/storybook/examples/TextInput/MultiLines.js
rename to packages/storybook/examples/core/TextInput/MultiLines.js
diff --git a/packages/storybook/examples/TextInput/WithStatus.js b/packages/storybook/examples/core/TextInput/WithStatus.js
similarity index 100%
rename from packages/storybook/examples/TextInput/WithStatus.js
rename to packages/storybook/examples/core/TextInput/WithStatus.js
diff --git a/packages/storybook/examples/TextInput/index.js b/packages/storybook/examples/core/TextInput/index.js
similarity index 84%
rename from packages/storybook/examples/TextInput/index.js
rename to packages/storybook/examples/core/TextInput/index.js
index 6bd7dedd..2f8e784f 100644
--- a/packages/storybook/examples/TextInput/index.js
+++ b/packages/storybook/examples/core/TextInput/index.js
@@ -1,16 +1,14 @@
 import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-// For props table
 import TextInput, { PureTextInput } from '@ichef/gypcrete/src/TextInput';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
 import WithStatus from './WithStatus';
 import MultiLines from './MultiLines';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('TextInput', module)
+storiesOf('@ichef/gypcrete|TextInput', module)
     .add('Basic usage',
         withInfo()(BasicUsage)
     )
diff --git a/packages/storybook/examples/TextLabel/BasicTextLabel.js b/packages/storybook/examples/core/TextLabel/BasicTextLabel.js
similarity index 100%
rename from packages/storybook/examples/TextLabel/BasicTextLabel.js
rename to packages/storybook/examples/core/TextLabel/BasicTextLabel.js
diff --git a/packages/storybook/examples/TextLabel/Editable.js b/packages/storybook/examples/core/TextLabel/Editable.js
similarity index 100%
rename from packages/storybook/examples/TextLabel/Editable.js
rename to packages/storybook/examples/core/TextLabel/Editable.js
diff --git a/packages/storybook/examples/TextLabel/TextLabelWithStatus.js b/packages/storybook/examples/core/TextLabel/TextLabelWithStatus.js
similarity index 100%
rename from packages/storybook/examples/TextLabel/TextLabelWithStatus.js
rename to packages/storybook/examples/core/TextLabel/TextLabelWithStatus.js
diff --git a/packages/storybook/examples/TextLabel/TextLabelWithText.js b/packages/storybook/examples/core/TextLabel/TextLabelWithText.js
similarity index 100%
rename from packages/storybook/examples/TextLabel/TextLabelWithText.js
rename to packages/storybook/examples/core/TextLabel/TextLabelWithText.js
diff --git a/packages/storybook/examples/TextLabel/index.js b/packages/storybook/examples/core/TextLabel/index.js
similarity index 88%
rename from packages/storybook/examples/TextLabel/index.js
rename to packages/storybook/examples/core/TextLabel/index.js
index 6d777938..c2ce2879 100644
--- a/packages/storybook/examples/TextLabel/index.js
+++ b/packages/storybook/examples/core/TextLabel/index.js
@@ -2,15 +2,14 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import TextLabel, { PureTextLabel } from '@ichef/gypcrete/src/TextLabel';
+import getPropTables from 'utils/getPropTables';
 
 import BasicTextLabelExample from './BasicTextLabel';
 import TextLabelWithStatusExample from './TextLabelWithStatus';
 import TextLabelWithTextExample from './TextLabelWithText';
 import Editable from './Editable';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('TextLabel', module)
+storiesOf('@ichef/gypcrete|TextLabel', module)
     .add('basic usage',
         withInfo()(BasicTextLabelExample)
     )
diff --git a/packages/storybook/examples/Tooltip/AnchoredTooltip.js b/packages/storybook/examples/core/Tooltip/AnchoredTooltip.js
similarity index 100%
rename from packages/storybook/examples/Tooltip/AnchoredTooltip.js
rename to packages/storybook/examples/core/Tooltip/AnchoredTooltip.js
diff --git a/packages/storybook/examples/Tooltip/BasicTooltip.js b/packages/storybook/examples/core/Tooltip/BasicTooltip.js
similarity index 100%
rename from packages/storybook/examples/Tooltip/BasicTooltip.js
rename to packages/storybook/examples/core/Tooltip/BasicTooltip.js
diff --git a/packages/storybook/examples/Tooltip/index.js b/packages/storybook/examples/core/Tooltip/index.js
similarity index 86%
rename from packages/storybook/examples/Tooltip/index.js
rename to packages/storybook/examples/core/Tooltip/index.js
index 1fe39dbc..2bda131f 100644
--- a/packages/storybook/examples/Tooltip/index.js
+++ b/packages/storybook/examples/core/Tooltip/index.js
@@ -3,13 +3,12 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import Tooltip, { PureTooltip } from '@ichef/gypcrete/src/Tooltip';
+import getPropTables from 'utils/getPropTables';
 
 import BasicTooltipExample from './BasicTooltip';
 import AnchoredTooltipExample from './AnchoredTooltip';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('Tooltip', module)
+storiesOf('@ichef/gypcrete|Tooltip', module)
     .add('basic usage',
         withInfo()(BasicTooltipExample)
     )
diff --git a/packages/storybook/examples/Form.SelectList/MultipleControlled.js b/packages/storybook/examples/form/SelectList/MultipleControlled.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/MultipleControlled.js
rename to packages/storybook/examples/form/SelectList/MultipleControlled.js
diff --git a/packages/storybook/examples/Form.SelectList/MultipleMinCheck.js b/packages/storybook/examples/form/SelectList/MultipleMinCheck.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/MultipleMinCheck.js
rename to packages/storybook/examples/form/SelectList/MultipleMinCheck.js
diff --git a/packages/storybook/examples/Form.SelectList/MultipleReadOnlyOption.js b/packages/storybook/examples/form/SelectList/MultipleReadOnlyOption.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/MultipleReadOnlyOption.js
rename to packages/storybook/examples/form/SelectList/MultipleReadOnlyOption.js
diff --git a/packages/storybook/examples/Form.SelectList/MultipleUncontrolled.js b/packages/storybook/examples/form/SelectList/MultipleUncontrolled.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/MultipleUncontrolled.js
rename to packages/storybook/examples/form/SelectList/MultipleUncontrolled.js
diff --git a/packages/storybook/examples/Form.SelectList/MultipleWithoutCheckAll.js b/packages/storybook/examples/form/SelectList/MultipleWithoutCheckAll.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/MultipleWithoutCheckAll.js
rename to packages/storybook/examples/form/SelectList/MultipleWithoutCheckAll.js
diff --git a/packages/storybook/examples/Form.SelectList/SingleControlled.js b/packages/storybook/examples/form/SelectList/SingleControlled.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/SingleControlled.js
rename to packages/storybook/examples/form/SelectList/SingleControlled.js
diff --git a/packages/storybook/examples/Form.SelectList/SingleUncontrolled.js b/packages/storybook/examples/form/SelectList/SingleUncontrolled.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectList/SingleUncontrolled.js
rename to packages/storybook/examples/form/SelectList/SingleUncontrolled.js
diff --git a/packages/storybook/examples/Form.SelectList/index.js b/packages/storybook/examples/form/SelectList/index.js
similarity index 91%
rename from packages/storybook/examples/Form.SelectList/index.js
rename to packages/storybook/examples/form/SelectList/index.js
index 49155f11..7985f997 100644
--- a/packages/storybook/examples/Form.SelectList/index.js
+++ b/packages/storybook/examples/form/SelectList/index.js
@@ -3,6 +3,7 @@ import { withInfo } from '@storybook/addon-info';
 
 import SelectList from '@ichef/gypcrete-form/src/SelectList';
 import SelectOption from '@ichef/gypcrete-form/src/SelectOption';
+import getPropTables from 'utils/getPropTables';
 
 import SingleControlled from './SingleControlled';
 import SingleUncontrolled from './SingleUncontrolled';
@@ -12,9 +13,7 @@ import MultipleWithoutCheckAll from './MultipleWithoutCheckAll';
 import MultipleReadOnlyOption from './MultipleReadOnlyOption';
 import MultipleMinCheck from './MultipleMinCheck';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('[Form] SelectList', module)
+storiesOf('@ichef/gypcrete-form|SelectList', module)
     .add('single (uncontrolled)', withInfo()(SingleUncontrolled))
     .add('single (controlled)', withInfo()(SingleControlled))
     .add('multiple (uncontrolled)', withInfo()(MultipleUncontrolled))
diff --git a/packages/storybook/examples/Form.SelectRow/BasicUsage.js b/packages/storybook/examples/form/SelectRow/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectRow/BasicUsage.js
rename to packages/storybook/examples/form/SelectRow/BasicUsage.js
diff --git a/packages/storybook/examples/Form.SelectRow/Customize.js b/packages/storybook/examples/form/SelectRow/Customize.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectRow/Customize.js
rename to packages/storybook/examples/form/SelectRow/Customize.js
diff --git a/packages/storybook/examples/Form.SelectRow/MultipleValues.js b/packages/storybook/examples/form/SelectRow/MultipleValues.js
similarity index 100%
rename from packages/storybook/examples/Form.SelectRow/MultipleValues.js
rename to packages/storybook/examples/form/SelectRow/MultipleValues.js
diff --git a/packages/storybook/examples/Form.SelectRow/index.js b/packages/storybook/examples/form/SelectRow/index.js
similarity index 83%
rename from packages/storybook/examples/Form.SelectRow/index.js
rename to packages/storybook/examples/form/SelectRow/index.js
index 4a3b0e19..7b249c8b 100644
--- a/packages/storybook/examples/Form.SelectRow/index.js
+++ b/packages/storybook/examples/form/SelectRow/index.js
@@ -2,14 +2,13 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import SelectRow from '@ichef/gypcrete-form/src/SelectRow';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
 import MultipleValues from './MultipleValues';
 import Customize from './Customize';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('[Form] SelectRow', module)
+storiesOf('@ichef/gypcrete-form|SelectRow', module)
     .add('basic usage', withInfo()(BasicUsage))
     .add('multiple selection', withInfo()(MultipleValues))
     .add('customize labels', withInfo()(Customize))
diff --git a/packages/storybook/examples/Form.SwitchRow/BasicUsage.js b/packages/storybook/examples/form/SwitchRow/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/Form.SwitchRow/BasicUsage.js
rename to packages/storybook/examples/form/SwitchRow/BasicUsage.js
diff --git a/packages/storybook/examples/Form.SwitchRow/index.js b/packages/storybook/examples/form/SwitchRow/index.js
similarity index 75%
rename from packages/storybook/examples/Form.SwitchRow/index.js
rename to packages/storybook/examples/form/SwitchRow/index.js
index 6c905236..292b9b7c 100644
--- a/packages/storybook/examples/Form.SwitchRow/index.js
+++ b/packages/storybook/examples/form/SwitchRow/index.js
@@ -2,11 +2,11 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import SwitchRow from '@ichef/gypcrete-form/src/SwitchRow';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
-import getPropTables from '../../utils/getPropTables';
 
-storiesOf('[Form] SwitchRow', module)
+storiesOf('@ichef/gypcrete-form|SwitchRow', module)
     .add('basic usage', withInfo()(BasicUsage))
     // Props table
     .add('props', getPropTables([SwitchRow]));
diff --git a/packages/storybook/examples/Form.TextInputRow/BasicUsage.js b/packages/storybook/examples/form/TextInputRow/BasicUsage.js
similarity index 100%
rename from packages/storybook/examples/Form.TextInputRow/BasicUsage.js
rename to packages/storybook/examples/form/TextInputRow/BasicUsage.js
diff --git a/packages/storybook/examples/Form.TextInputRow/ControlledRow.js b/packages/storybook/examples/form/TextInputRow/ControlledRow.js
similarity index 100%
rename from packages/storybook/examples/Form.TextInputRow/ControlledRow.js
rename to packages/storybook/examples/form/TextInputRow/ControlledRow.js
diff --git a/packages/storybook/examples/Form.TextInputRow/MultiLineUsage.js b/packages/storybook/examples/form/TextInputRow/MultiLineUsage.js
similarity index 100%
rename from packages/storybook/examples/Form.TextInputRow/MultiLineUsage.js
rename to packages/storybook/examples/form/TextInputRow/MultiLineUsage.js
diff --git a/packages/storybook/examples/Form.TextInputRow/index.js b/packages/storybook/examples/form/TextInputRow/index.js
similarity index 80%
rename from packages/storybook/examples/Form.TextInputRow/index.js
rename to packages/storybook/examples/form/TextInputRow/index.js
index 69afb578..3d183ea0 100644
--- a/packages/storybook/examples/Form.TextInputRow/index.js
+++ b/packages/storybook/examples/form/TextInputRow/index.js
@@ -2,13 +2,12 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import TextInputRow from '@ichef/gypcrete-form/src/TextInputRow';
+import getPropTables from 'utils/getPropTables';
 
 import BasicUsage from './BasicUsage';
 import MultiLineUsage from './MultiLineUsage';
 
-import getPropTables from '../../utils/getPropTables';
-
-storiesOf('[Form] TextInputRow', module)
+storiesOf('@ichef/gypcrete-form|TextInputRow', module)
     .add('basic usage', withInfo()(BasicUsage))
     .add('multi-line usage', withInfo()(MultiLineUsage))
     // Props table
diff --git a/packages/storybook/examples/ImageEditor.ImageEditor/index.js b/packages/storybook/examples/imageeditor/ImageEditor/index.js
similarity index 93%
rename from packages/storybook/examples/ImageEditor.ImageEditor/index.js
rename to packages/storybook/examples/imageeditor/ImageEditor/index.js
index 0ccc628a..e4231b36 100644
--- a/packages/storybook/examples/ImageEditor.ImageEditor/index.js
+++ b/packages/storybook/examples/imageeditor/ImageEditor/index.js
@@ -3,14 +3,14 @@ import { storiesOf } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
 import ImageEditor from '@ichef/gypcrete-imageeditor/src/index';
+import getPropTables from 'utils/getPropTables';
 
 import handleLoadSuccess from './utils/handleLoadSuccess';
 import handleCropChange from './utils/handleCropChange';
-import getPropTables from '../../utils/getPropTables';
 
 const EXAMPLE_IMAGE = 'https://i.imgur.com/VfBVxsO.jpg';
 
-storiesOf('[ImageEditor] ImageEditor', module)
+storiesOf('@ichef/gypcrete-imageeditor|ImageEditor', module)
     .add('Basic usage', withInfo()(() => (
         <ImageEditor
             control
diff --git a/packages/storybook/examples/ImageEditor.ImageEditor/utils/handleCropChange.js b/packages/storybook/examples/imageeditor/ImageEditor/utils/handleCropChange.js
similarity index 100%
rename from packages/storybook/examples/ImageEditor.ImageEditor/utils/handleCropChange.js
rename to packages/storybook/examples/imageeditor/ImageEditor/utils/handleCropChange.js
diff --git a/packages/storybook/examples/ImageEditor.ImageEditor/utils/handleLoadSuccess.js b/packages/storybook/examples/imageeditor/ImageEditor/utils/handleLoadSuccess.js
similarity index 100%
rename from packages/storybook/examples/ImageEditor.ImageEditor/utils/handleLoadSuccess.js
rename to packages/storybook/examples/imageeditor/ImageEditor/utils/handleLoadSuccess.js