diff --git a/src/__stories__/createMemo.story.tsx b/src/__stories__/createMemo.story.tsx
index 9a07ddb2..9514be82 100644
--- a/src/__stories__/createMemo.story.tsx
+++ b/src/__stories__/createMemo.story.tsx
@@ -21,7 +21,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('createMemo', module)
+storiesOf('State/createMemo', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/createMemo.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useAdopt.story.tsx b/src/__stories__/useAdopt.story.tsx
index cc109d3e..d7ee3ada 100644
--- a/src/__stories__/useAdopt.story.tsx
+++ b/src/__stories__/useAdopt.story.tsx
@@ -92,7 +92,7 @@ const Animation = () => {
   );
 };
 
-storiesOf('useAdopt', module)
+storiesOf('State/useAdopt', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useAdopt.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useAsync.story.tsx b/src/__stories__/useAsync.story.tsx
index 8fe24b3d..b517ad5f 100644
--- a/src/__stories__/useAsync.story.tsx
+++ b/src/__stories__/useAsync.story.tsx
@@ -22,7 +22,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useAsync', module)
+storiesOf('Side effects/useAsync', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useAsync.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useAudio.story.tsx b/src/__stories__/useAudio.story.tsx
index f5e02d1f..67a13969 100644
--- a/src/__stories__/useAudio.story.tsx
+++ b/src/__stories__/useAudio.story.tsx
@@ -29,7 +29,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useAudio', module)
+storiesOf('UI/useAudio', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useAudio.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useBattery.story.tsx b/src/__stories__/useBattery.story.tsx
index e70192e5..74ae3724 100644
--- a/src/__stories__/useBattery.story.tsx
+++ b/src/__stories__/useBattery.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useBattery', module)
+storiesOf('Sensors/useBattery', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useBattery.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useBoolean.story.tsx b/src/__stories__/useBoolean.story.tsx
index 5d137a06..dfb34815 100644
--- a/src/__stories__/useBoolean.story.tsx
+++ b/src/__stories__/useBoolean.story.tsx
@@ -16,7 +16,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useBoolean', module)
+storiesOf('State/useBoolean', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useToggle.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useCallbag.story.tsx b/src/__stories__/useCallbag.story.tsx
index a4845925..0b5d210e 100644
--- a/src/__stories__/useCallbag.story.tsx
+++ b/src/__stories__/useCallbag.story.tsx
@@ -9,7 +9,7 @@ const Demo = () => {
   return <span>{`Counter: ${count}`}</span>
 };
 
-storiesOf('useCallbag', module)
+storiesOf('State/useCallbag', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useCallbag.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useCounter.story.tsx b/src/__stories__/useCounter.story.tsx
index a888a732..fade347d 100644
--- a/src/__stories__/useCounter.story.tsx
+++ b/src/__stories__/useCounter.story.tsx
@@ -20,7 +20,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useCounter', module)
+storiesOf('State/useCounter', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useCounter.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useCss.story.tsx b/src/__stories__/useCss.story.tsx
index f39d76ed..82669d1b 100644
--- a/src/__stories__/useCss.story.tsx
+++ b/src/__stories__/useCss.story.tsx
@@ -19,7 +19,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useCss', module)
+storiesOf('Side effects/useCss', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useCss.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useFavicon.story.tsx b/src/__stories__/useFavicon.story.tsx
index dc682b39..94e5a340 100644
--- a/src/__stories__/useFavicon.story.tsx
+++ b/src/__stories__/useFavicon.story.tsx
@@ -9,7 +9,7 @@ const Demo = () => {
   return null;
 };
 
-storiesOf('useFavicon', module)
+storiesOf('Side effects/useFavicon', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useFavicon.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useGeolocation.story.tsx b/src/__stories__/useGeolocation.story.tsx
index 41046afd..d229473e 100644
--- a/src/__stories__/useGeolocation.story.tsx
+++ b/src/__stories__/useGeolocation.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useGeolocation', module)
+storiesOf('Sensors/useGeolocation', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useGeolocation.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useGetSet.story.tsx b/src/__stories__/useGetSet.story.tsx
index 540a4c9c..afad3777 100644
--- a/src/__stories__/useGetSet.story.tsx
+++ b/src/__stories__/useGetSet.story.tsx
@@ -30,7 +30,7 @@ const DemoWrong = () => {
   );
 };
 
-storiesOf('useGetSet', module)
+storiesOf('State/useGetSet', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useGetSet.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useGetSetState.story.tsx b/src/__stories__/useGetSetState.story.tsx
index 15971bea..4186b3dc 100644
--- a/src/__stories__/useGetSetState.story.tsx
+++ b/src/__stories__/useGetSetState.story.tsx
@@ -16,7 +16,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useGetSetState', module)
+storiesOf('State/useGetSetState', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useGetSetState.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useHover.story.tsx b/src/__stories__/useHover.story.tsx
index f7f998e7..931697b1 100644
--- a/src/__stories__/useHover.story.tsx
+++ b/src/__stories__/useHover.story.tsx
@@ -18,7 +18,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useHover', module)
+storiesOf('Sensors/useHover', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useHover.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useHoverDirty.story.tsx b/src/__stories__/useHoverDirty.story.tsx
index b784e1ee..b589cafd 100644
--- a/src/__stories__/useHoverDirty.story.tsx
+++ b/src/__stories__/useHoverDirty.story.tsx
@@ -15,7 +15,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useHoverDirty', module)
+storiesOf('Sensors/useHoverDirty', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useHover.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useIdle.story.tsx b/src/__stories__/useIdle.story.tsx
index 4f80fc1e..d1aba3fd 100644
--- a/src/__stories__/useIdle.story.tsx
+++ b/src/__stories__/useIdle.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useIdle', module)
+storiesOf('Sensors/useIdle', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useIdle.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useLifecycles.story.tsx b/src/__stories__/useLifecycles.story.tsx
index 28e7750a..7c8a0b06 100644
--- a/src/__stories__/useLifecycles.story.tsx
+++ b/src/__stories__/useLifecycles.story.tsx
@@ -8,7 +8,7 @@ const Demo = () => {
   return null;
 };
 
-storiesOf('useLifecycles', module)
+storiesOf('Lifecycles/useLifecycles', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useLifecycles.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useList.story.tsx b/src/__stories__/useList.story.tsx
index 2c2b3642..86d22b68 100644
--- a/src/__stories__/useList.story.tsx
+++ b/src/__stories__/useList.story.tsx
@@ -15,7 +15,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useList', module)
+storiesOf('State/useList', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useList.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useLocalStorage.story.tsx b/src/__stories__/useLocalStorage.story.tsx
index 230c4a25..a24a904c 100644
--- a/src/__stories__/useLocalStorage.story.tsx
+++ b/src/__stories__/useLocalStorage.story.tsx
@@ -15,7 +15,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useLocalStorage', module)
+storiesOf('Side effects/useLocalStorage', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useLocalStorage.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useLocation.story.tsx b/src/__stories__/useLocation.story.tsx
index a20b6bd8..ec9c4e13 100644
--- a/src/__stories__/useLocation.story.tsx
+++ b/src/__stories__/useLocation.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useLocation', module)
+storiesOf('Sensors/useLocation', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useLocation.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useLogger.story.tsx b/src/__stories__/useLogger.story.tsx
index 28c44c62..326135dd 100644
--- a/src/__stories__/useLogger.story.tsx
+++ b/src/__stories__/useLogger.story.tsx
@@ -8,7 +8,7 @@ const Demo = (props) => {
   return null;
 };
 
-storiesOf('useLogger', module)
+storiesOf('Lifecycles/useLogger', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useLogger.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useMap.story.tsx b/src/__stories__/useMap.story.tsx
index c2f05bba..73093a84 100644
--- a/src/__stories__/useMap.story.tsx
+++ b/src/__stories__/useMap.story.tsx
@@ -17,7 +17,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useMap', module)
+storiesOf('State/useMap', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useMap.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useMedia.story.tsx b/src/__stories__/useMedia.story.tsx
index 66002bca..aa31db7a 100644
--- a/src/__stories__/useMedia.story.tsx
+++ b/src/__stories__/useMedia.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useMedia', module)
+storiesOf('Sensors/useMedia', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useMedia.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useMediaDevices.story.tsx b/src/__stories__/useMediaDevices.story.tsx
index ee4ee593..4829442a 100644
--- a/src/__stories__/useMediaDevices.story.tsx
+++ b/src/__stories__/useMediaDevices.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useMediaDevices', module)
+storiesOf('Sensors/useMediaDevices', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useMediaDevices.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useMotion.story.tsx b/src/__stories__/useMotion.story.tsx
index 9cc5ff69..1ca458fd 100644
--- a/src/__stories__/useMotion.story.tsx
+++ b/src/__stories__/useMotion.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useMotion', module)
+storiesOf('Sensors/useMotion', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useMotion.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useMount.story.tsx b/src/__stories__/useMount.story.tsx
index cf9c90f4..3d43250b 100644
--- a/src/__stories__/useMount.story.tsx
+++ b/src/__stories__/useMount.story.tsx
@@ -8,7 +8,7 @@ const Demo = () => {
   return null;
 };
 
-storiesOf('useMount', module)
+storiesOf('Lifecycles/useMount', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useMount.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useNetwork.story.tsx b/src/__stories__/useNetwork.story.tsx
index 835ca179..228aeae9 100644
--- a/src/__stories__/useNetwork.story.tsx
+++ b/src/__stories__/useNetwork.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useNetwork', module)
+storiesOf('Sensors/useNetwork', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useNetwork.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useObservable.story.tsx b/src/__stories__/useObservable.story.tsx
index bcc21a1b..626ba355 100644
--- a/src/__stories__/useObservable.story.tsx
+++ b/src/__stories__/useObservable.story.tsx
@@ -15,7 +15,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useObservable', module)
+storiesOf('State/useObservable', module)
   // .add('Docs', () => <ShowDocs md={require('../../docs/useObservable.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useOrientation.story.tsx b/src/__stories__/useOrientation.story.tsx
index 8c13e645..9c26c7fd 100644
--- a/src/__stories__/useOrientation.story.tsx
+++ b/src/__stories__/useOrientation.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useOrientation', module)
+storiesOf('Sensors/useOrientation', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useOrientation.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useOutsideClick.story.tsx b/src/__stories__/useOutsideClick.story.tsx
index 4422c02b..29984363 100644
--- a/src/__stories__/useOutsideClick.story.tsx
+++ b/src/__stories__/useOutsideClick.story.tsx
@@ -19,7 +19,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useOutsideClick', module)
+storiesOf('UI/useOutsideClick', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useOutsideClick.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useRaf.story.tsx b/src/__stories__/useRaf.story.tsx
index 21e8cf47..9faa33b2 100644
--- a/src/__stories__/useRaf.story.tsx
+++ b/src/__stories__/useRaf.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useRaf', module)
+storiesOf('Animations/useRaf', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useRaf.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useRenderProp.story.tsx b/src/__stories__/useRenderProp.story.tsx
index 23dca3b4..fd566be7 100644
--- a/src/__stories__/useRenderProp.story.tsx
+++ b/src/__stories__/useRenderProp.story.tsx
@@ -24,7 +24,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useRenderProp', module)
+storiesOf('State/useRenderProp', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useRenderProp.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useSessionStorage.story.tsx b/src/__stories__/useSessionStorage.story.tsx
index 00bfc134..36110e60 100644
--- a/src/__stories__/useSessionStorage.story.tsx
+++ b/src/__stories__/useSessionStorage.story.tsx
@@ -15,7 +15,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useSessionStorage', module)
+storiesOf('Side effects/useSessionStorage', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useSessionStorage.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useSetState.story.tsx b/src/__stories__/useSetState.story.tsx
index 2e46f944..b8eb61fb 100644
--- a/src/__stories__/useSetState.story.tsx
+++ b/src/__stories__/useSetState.story.tsx
@@ -24,7 +24,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useSetState', module)
+storiesOf('State/useSetState', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useSetState.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useSize.story.tsx b/src/__stories__/useSize.story.tsx
index efb6e3eb..df20b355 100644
--- a/src/__stories__/useSize.story.tsx
+++ b/src/__stories__/useSize.story.tsx
@@ -17,7 +17,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useSize', module)
+storiesOf('Sensors/useSize', module)
   .add('Example', () =>
     <Demo/>
   )
diff --git a/src/__stories__/useSpeech.story.tsx b/src/__stories__/useSpeech.story.tsx
index b79c1ace..96f9b1e8 100644
--- a/src/__stories__/useSpeech.story.tsx
+++ b/src/__stories__/useSpeech.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useSpeech', module)
+storiesOf('UI/useSpeech', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useSpeech.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useSpring.story.tsx b/src/__stories__/useSpring.story.tsx
index c450de85..6c9ecb9e 100644
--- a/src/__stories__/useSpring.story.tsx
+++ b/src/__stories__/useSpring.story.tsx
@@ -17,7 +17,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useSpring', module)
+storiesOf('Animations/useSpring', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useSpring.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useTimeout.story.tsx b/src/__stories__/useTimeout.story.tsx
index 8dbc6e6a..73c8ae81 100644
--- a/src/__stories__/useTimeout.story.tsx
+++ b/src/__stories__/useTimeout.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useTimeout', module)
+storiesOf('Animations/useTimeout', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useTimeout.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useTitle.story.tsx b/src/__stories__/useTitle.story.tsx
index f5ad8f3e..ddffd99c 100644
--- a/src/__stories__/useTitle.story.tsx
+++ b/src/__stories__/useTitle.story.tsx
@@ -9,7 +9,7 @@ const Demo = () => {
   return null;
 };
 
-storiesOf('useTitle', module)
+storiesOf('Side effects/useTitle', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useTitle.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useToggle.story.tsx b/src/__stories__/useToggle.story.tsx
index 829ece0e..f697543a 100644
--- a/src/__stories__/useToggle.story.tsx
+++ b/src/__stories__/useToggle.story.tsx
@@ -16,7 +16,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useToggle', module)
+storiesOf('State/useToggle', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useToggle.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useTween.story.tsx b/src/__stories__/useTween.story.tsx
index b9591f49..f51c3f22 100644
--- a/src/__stories__/useTween.story.tsx
+++ b/src/__stories__/useTween.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useTween', module)
+storiesOf('Animations/useTween', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useTween.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useUnmount.story.tsx b/src/__stories__/useUnmount.story.tsx
index 0b744792..68c13d6c 100644
--- a/src/__stories__/useUnmount.story.tsx
+++ b/src/__stories__/useUnmount.story.tsx
@@ -8,7 +8,7 @@ const Demo = () => {
   return null;
 };
 
-storiesOf('useUnmount', module)
+storiesOf('Lifecycles/useUnmount', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useUnmount.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useUpdate.story.tsx b/src/__stories__/useUpdate.story.tsx
index b445f3c2..be0d5abe 100644
--- a/src/__stories__/useUpdate.story.tsx
+++ b/src/__stories__/useUpdate.story.tsx
@@ -13,7 +13,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useUpdate', module)
+storiesOf('Animations/useUpdate', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useUpdate.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useVideo.story.tsx b/src/__stories__/useVideo.story.tsx
index 4b8b74b2..20e07d6a 100644
--- a/src/__stories__/useVideo.story.tsx
+++ b/src/__stories__/useVideo.story.tsx
@@ -28,7 +28,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useVideo', module)
+storiesOf('UI/useVideo', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useVideo.md')} />)
   .add('Demo', () =>
     <Demo/>
diff --git a/src/__stories__/useWait.story.tsx b/src/__stories__/useWait.story.tsx
index 4ee807a7..b231c600 100644
--- a/src/__stories__/useWait.story.tsx
+++ b/src/__stories__/useWait.story.tsx
@@ -32,7 +32,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useWait', module)
+storiesOf('UI/useWait', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useWait.md')} />)
   .add('Demo', () =>
     <useWait.Waiter><Demo/></useWait.Waiter>
diff --git a/src/__stories__/useWindowSize.story.tsx b/src/__stories__/useWindowSize.story.tsx
index aea94884..01dbc56c 100644
--- a/src/__stories__/useWindowSize.story.tsx
+++ b/src/__stories__/useWindowSize.story.tsx
@@ -14,7 +14,7 @@ const Demo = () => {
   );
 };
 
-storiesOf('useWindowSize', module)
+storiesOf('Sensors/useWindowSize', module)
   .add('Docs', () => <ShowDocs md={require('../../docs/useWindowSize.md')} />)
   .add('Demo', () =>
     <Demo/>