diff --git a/examples/PanResponder/PanResponderExample.js b/examples/apis/PanResponder/PanResponderExample.js
similarity index 98%
rename from examples/PanResponder/PanResponderExample.js
rename to examples/apis/PanResponder/PanResponderExample.js
index cd1905d8..69d292f2 100644
--- a/examples/PanResponder/PanResponderExample.js
+++ b/examples/apis/PanResponder/PanResponderExample.js
@@ -113,5 +113,5 @@ var styles = StyleSheet.create({
 });
 
 
-storiesOf('PanResponder', module)
+storiesOf('api: PanResponder', module)
   .add('example', () => <PanResponderExample />)
diff --git a/examples/ActivityIndicator/ActivityIndicatorExample.js b/examples/components/ActivityIndicator/ActivityIndicatorExample.js
similarity index 98%
rename from examples/ActivityIndicator/ActivityIndicatorExample.js
rename to examples/components/ActivityIndicator/ActivityIndicatorExample.js
index 19cf2331..e70b3685 100644
--- a/examples/ActivityIndicator/ActivityIndicatorExample.js
+++ b/examples/components/ActivityIndicator/ActivityIndicatorExample.js
@@ -170,6 +170,6 @@ const styles = StyleSheet.create({
 });
 
 examples.forEach((example) => {
-  storiesOf('<ActivityIndicator>', module)
+  storiesOf('component: ActivityIndicator', module)
     .add(example.title, () => example.render())
 })
diff --git a/examples/Image/ImageExample.js b/examples/components/Image/ImageExample.js
similarity index 99%
rename from examples/Image/ImageExample.js
rename to examples/components/Image/ImageExample.js
index 1223fd5f..75a610fb 100644
--- a/examples/Image/ImageExample.js
+++ b/examples/components/Image/ImageExample.js
@@ -651,7 +651,7 @@ var styles = StyleSheet.create({
 });
 
 examples.forEach((example) => {
-  storiesOf('<Image>', module)
+  storiesOf('component: Image', module)
     .addDecorator((renderStory) => <View>{renderStory()}</View>)
     .add(example.title, () => example.render())
 })
diff --git a/examples/Image/bunny.png b/examples/components/Image/bunny.png
similarity index 100%
rename from examples/Image/bunny.png
rename to examples/components/Image/bunny.png
diff --git a/examples/Image/uie_thumb_normal@2x.png b/examples/components/Image/uie_thumb_normal@2x.png
similarity index 100%
rename from examples/Image/uie_thumb_normal@2x.png
rename to examples/components/Image/uie_thumb_normal@2x.png
diff --git a/examples/Image/uie_thumb_selected@2x.png b/examples/components/Image/uie_thumb_selected@2x.png
similarity index 100%
rename from examples/Image/uie_thumb_selected@2x.png
rename to examples/components/Image/uie_thumb_selected@2x.png
diff --git a/examples/ListView/ListViewExample.js b/examples/components/ListView/ListViewExample.js
similarity index 100%
rename from examples/ListView/ListViewExample.js
rename to examples/components/ListView/ListViewExample.js
diff --git a/examples/ScrollView/ScrollViewExample.js b/examples/components/ScrollView/ScrollViewExample.js
similarity index 97%
rename from examples/ScrollView/ScrollViewExample.js
rename to examples/components/ScrollView/ScrollViewExample.js
index 4a70cb32..fb20339d 100644
--- a/examples/ScrollView/ScrollViewExample.js
+++ b/examples/components/ScrollView/ScrollViewExample.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { storiesOf, action } from '@kadira/storybook';
 import { ScrollView, StyleSheet, Text, View } from 'react-native'
 
-storiesOf('<ScrollView>', module)
+storiesOf('component: ScrollView', module)
   .add('vertical', () => (
     <View style={styles.scrollViewContainer}>
       <ScrollView
diff --git a/examples/Switch/SwitchExample.js b/examples/components/Switch/SwitchExample.js
similarity index 99%
rename from examples/Switch/SwitchExample.js
rename to examples/components/Switch/SwitchExample.js
index 9e34af58..03e6ca94 100644
--- a/examples/Switch/SwitchExample.js
+++ b/examples/components/Switch/SwitchExample.js
@@ -185,6 +185,6 @@ var examples = [
 ];
 
 examples.forEach((example) => {
-  storiesOf('<Switch>', module)
+  storiesOf('component: Switch', module)
     .add(example.title, () => example.render())
 })
diff --git a/examples/Text/TextExample.js b/examples/components/Text/TextExample.js
similarity index 99%
rename from examples/Text/TextExample.js
rename to examples/components/Text/TextExample.js
index f6f41e80..1c9a9c3c 100644
--- a/examples/Text/TextExample.js
+++ b/examples/components/Text/TextExample.js
@@ -466,7 +466,7 @@ var styles = StyleSheet.create({
 });
 
 examples.forEach((example) => {
-  storiesOf('<Text>', module)
+  storiesOf('component: Text', module)
     .addDecorator((renderStory) => <View style={{ width: 320 }}>{renderStory()}</View>)
     .add(example.title, () => example.render())
 })
diff --git a/examples/TextInput/TextInputExample.js b/examples/components/TextInput/TextInputExample.js
similarity index 97%
rename from examples/TextInput/TextInputExample.js
rename to examples/components/TextInput/TextInputExample.js
index 8da68309..b5026001 100644
--- a/examples/TextInput/TextInputExample.js
+++ b/examples/components/TextInput/TextInputExample.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { storiesOf, action } from '@kadira/storybook';
 import { StyleSheet, TextInput, View } from 'react-native'
 
-storiesOf('<TextInput>', module)
+storiesOf('component: TextInput', module)
   .add('tbd', () => (
     <View>
       <TextInput
diff --git a/examples/Touchable/TouchableExample.js b/examples/components/Touchable/TouchableExample.js
similarity index 99%
rename from examples/Touchable/TouchableExample.js
rename to examples/components/Touchable/TouchableExample.js
index c6122b04..9c6b1a6c 100644
--- a/examples/Touchable/TouchableExample.js
+++ b/examples/components/Touchable/TouchableExample.js
@@ -445,6 +445,6 @@ var styles = StyleSheet.create({
 });
 
 examples.forEach((example) => {
-  storiesOf('<Touchable*>', module)
+  storiesOf('component: Touchable*', module)
     .add(example.title, () => example.render())
 })
diff --git a/examples/View/ViewExample.js b/examples/components/View/ViewExample.js
similarity index 99%
rename from examples/View/ViewExample.js
rename to examples/components/View/ViewExample.js
index 580dff50..18f3a6e8 100644
--- a/examples/View/ViewExample.js
+++ b/examples/components/View/ViewExample.js
@@ -245,6 +245,6 @@ const examples = [
 ];
 
 examples.forEach((example) => {
-  storiesOf('<View>', module)
+  storiesOf('component: View', module)
     .add(example.title, () => example.render())
 })
diff --git a/examples/View/ViewTransformsExample.js b/examples/components/View/ViewTransformsExample.js
similarity index 99%
rename from examples/View/ViewTransformsExample.js
rename to examples/components/View/ViewTransformsExample.js
index c50d5c1d..23a7aa49 100644
--- a/examples/View/ViewTransformsExample.js
+++ b/examples/components/View/ViewTransformsExample.js
@@ -281,6 +281,6 @@ const examples = [
 ];
 
 examples.forEach((example) => {
-  storiesOf('<View> transforms', module)
+  storiesOf('component: View (transforms)', module)
     .add(example.title, () => example.render())
 })
diff --git a/examples/Game2048/Game2048.js b/examples/demos/Game2048/Game2048.js
similarity index 100%
rename from examples/Game2048/Game2048.js
rename to examples/demos/Game2048/Game2048.js
diff --git a/examples/Game2048/Game2048Example.js b/examples/demos/Game2048/Game2048Example.js
similarity index 82%
rename from examples/Game2048/Game2048Example.js
rename to examples/demos/Game2048/Game2048Example.js
index fab8e072..3c078f87 100644
--- a/examples/Game2048/Game2048Example.js
+++ b/examples/demos/Game2048/Game2048Example.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { storiesOf, action } from '@kadira/storybook';
 import Game2048 from './Game2048'
 
-storiesOf('Game2048', module)
+storiesOf('demo: Game2048', module)
   .add('the game', () => (
     <Game2048 />
   ))
diff --git a/examples/Game2048/GameBoard.js b/examples/demos/Game2048/GameBoard.js
similarity index 100%
rename from examples/Game2048/GameBoard.js
rename to examples/demos/Game2048/GameBoard.js
diff --git a/examples/TicTacToe/TicTacToe.js b/examples/demos/TicTacToe/TicTacToe.js
similarity index 100%
rename from examples/TicTacToe/TicTacToe.js
rename to examples/demos/TicTacToe/TicTacToe.js
diff --git a/examples/TicTacToe/TicTacToeExample.js b/examples/demos/TicTacToe/TicTacToeExample.js
similarity index 82%
rename from examples/TicTacToe/TicTacToeExample.js
rename to examples/demos/TicTacToe/TicTacToeExample.js
index 7273ba96..205ddba2 100644
--- a/examples/TicTacToe/TicTacToeExample.js
+++ b/examples/demos/TicTacToe/TicTacToeExample.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { storiesOf, action } from '@kadira/storybook';
 import TicTacToe from './TicTacToe'
 
-storiesOf('TicTacToe', module)
+storiesOf('demo: TicTacToe', module)
   .add('the game', () => (
     <TicTacToe />
   ))