diff --git a/docs/storybook/1-components/ActivityIndicator/ActivityIndicatorScreen.js b/docs/storybook/1-components/ActivityIndicator/ActivityIndicatorScreen.js
index 5fdc734e..78b2d86a 100644
--- a/docs/storybook/1-components/ActivityIndicator/ActivityIndicatorScreen.js
+++ b/docs/storybook/1-components/ActivityIndicator/ActivityIndicatorScreen.js
@@ -12,7 +12,7 @@ import React from 'react';
 import UIExplorer, { Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const ActivityIndicatorScreen = () =>
-  <UIExplorer title="ActivityIndicator" url="components/ActivityIndicator">
+  <UIExplorer title="ActivityIndicator" url="1-components/ActivityIndicator">
     <Description>Displays a customizable activity indicator</Description>
     <Section title="Props">
       <DocItem name="...View props" />
diff --git a/docs/storybook/1-components/Button/ButtonScreen.js b/docs/storybook/1-components/Button/ButtonScreen.js
index 1d972860..9614025e 100644
--- a/docs/storybook/1-components/Button/ButtonScreen.js
+++ b/docs/storybook/1-components/Button/ButtonScreen.js
@@ -18,7 +18,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const ButtonScreen = () =>
-  <UIExplorer title="Button" url="components/Button">
+  <UIExplorer title="Button" url="1-components/Button">
     <Description>
       <AppText>
         A basic button component. Supports a minimal level of customization. You can build your own
diff --git a/docs/storybook/1-components/Image/ImageScreen.js b/docs/storybook/1-components/Image/ImageScreen.js
index 76f98e81..54428374 100644
--- a/docs/storybook/1-components/Image/ImageScreen.js
+++ b/docs/storybook/1-components/Image/ImageScreen.js
@@ -26,7 +26,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const ImageScreen = () =>
-  <UIExplorer title="Image" url="components/Image">
+  <UIExplorer title="Image" url="1-components/Image">
     <Description>
       An accessibile image component with support for image resizing, default image, and child
       content.
diff --git a/docs/storybook/1-components/ProgressBar/ProgressScreen.js b/docs/storybook/1-components/ProgressBar/ProgressScreen.js
index a95a7800..e67a0e46 100644
--- a/docs/storybook/1-components/ProgressBar/ProgressScreen.js
+++ b/docs/storybook/1-components/ProgressBar/ProgressScreen.js
@@ -11,7 +11,7 @@ import React from 'react';
 import UIExplorer, { Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const ProgressBarScreen = () =>
-  <UIExplorer title="ProgressBar" url="components/ProgressBar">
+  <UIExplorer title="ProgressBar" url="1-components/ProgressBar">
     <Description>Display an activity progress bar</Description>
     <Section title="Props">
       <DocItem name="...View props" />
diff --git a/docs/storybook/1-components/ScrollView/ScrollViewScreen.js b/docs/storybook/1-components/ScrollView/ScrollViewScreen.js
index 7b074963..c34ef484 100644
--- a/docs/storybook/1-components/ScrollView/ScrollViewScreen.js
+++ b/docs/storybook/1-components/ScrollView/ScrollViewScreen.js
@@ -19,7 +19,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const ScrollViewScreen = () =>
-  <UIExplorer title="ScrollView" url="components/ScrollView">
+  <UIExplorer title="ScrollView" url="1-components/ScrollView">
     <Description>
       <AppText>
         A scrollable <Code>View</Code> that provides itegration with the touch-locking responder
diff --git a/docs/storybook/1-components/Switch/SwitchScreen.js b/docs/storybook/1-components/Switch/SwitchScreen.js
index f3899df8..a127595b 100644
--- a/docs/storybook/1-components/Switch/SwitchScreen.js
+++ b/docs/storybook/1-components/Switch/SwitchScreen.js
@@ -23,7 +23,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const SwitchScreen = () =>
-  <UIExplorer title="Switch" url="components/Switch">
+  <UIExplorer title="Switch" url="1-components/Switch">
     <Description>
       <AppText>
         This is a controlled component that requires an <Code>onValueChange</Code> callback that
diff --git a/docs/storybook/1-components/Text/TextScreen.js b/docs/storybook/1-components/Text/TextScreen.js
index b01f3eb0..735eafc7 100644
--- a/docs/storybook/1-components/Text/TextScreen.js
+++ b/docs/storybook/1-components/Text/TextScreen.js
@@ -19,7 +19,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const TextScreen = () =>
-  <UIExplorer title="Text" url="components/Text">
+  <UIExplorer title="Text" url="1-components/Text">
     <Description>
       <AppText>
         Text is component for displaying text. It supports style, basic touch handling, and inherits
diff --git a/docs/storybook/1-components/TextInput/TextInputScreen.js b/docs/storybook/1-components/TextInput/TextInputScreen.js
index 7ae0fe5a..ec82edc0 100644
--- a/docs/storybook/1-components/TextInput/TextInputScreen.js
+++ b/docs/storybook/1-components/TextInput/TextInputScreen.js
@@ -31,7 +31,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const TextInputScreen = () =>
-  <UIExplorer title="TextInput" url="components/TextInput">
+  <UIExplorer title="TextInput" url="1-components/TextInput">
     <Description>
       <AppText>
         Accessible single- and multi-line text input via a keyboard. Supports features such as
diff --git a/docs/storybook/1-components/Touchable/TouchableHighlightScreen.js b/docs/storybook/1-components/Touchable/TouchableHighlightScreen.js
index 086b3f6b..8d21d6a6 100644
--- a/docs/storybook/1-components/Touchable/TouchableHighlightScreen.js
+++ b/docs/storybook/1-components/Touchable/TouchableHighlightScreen.js
@@ -12,7 +12,7 @@ import { TouchableHighlightDisabled } from './examples/PropDisabled';
 import UIExplorer, { AppText, Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const TouchableHighlightScreen = () =>
-  <UIExplorer title="TouchableHighlight" url="components/Touchable">
+  <UIExplorer title="TouchableHighlight" url="1-components/Touchable">
     <Description>
       <AppText>
         A wrapper for making views respond properly to touches. On press down, the opacity of the
diff --git a/docs/storybook/1-components/Touchable/TouchableOpacityScreen.js b/docs/storybook/1-components/Touchable/TouchableOpacityScreen.js
index df2426db..a1f0f2f2 100644
--- a/docs/storybook/1-components/Touchable/TouchableOpacityScreen.js
+++ b/docs/storybook/1-components/Touchable/TouchableOpacityScreen.js
@@ -11,7 +11,7 @@ import { TouchableOpacityDisabled } from './examples/PropDisabled';
 import UIExplorer, { AppText, Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const TouchableOpacityScreen = () =>
-  <UIExplorer title="TouchableOpacity" url="components/Touchable">
+  <UIExplorer title="TouchableOpacity" url="1-components/Touchable">
     <Description>
       <AppText>
         A wrapper for making views respond properly to touches. On press down, the opacity of the
diff --git a/docs/storybook/1-components/Touchable/TouchableWithoutFeedbackScreen.js b/docs/storybook/1-components/Touchable/TouchableWithoutFeedbackScreen.js
index 03e52bee..4fe437c3 100644
--- a/docs/storybook/1-components/Touchable/TouchableWithoutFeedbackScreen.js
+++ b/docs/storybook/1-components/Touchable/TouchableWithoutFeedbackScreen.js
@@ -19,7 +19,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const TouchableWithoutFeedbackScreen = () =>
-  <UIExplorer title="TouchableWithoutFeedback" url="components/Touchable">
+  <UIExplorer title="TouchableWithoutFeedback" url="1-components/Touchable">
     <Description>
       <AppText>
         Do not use unless you have a very good reason. All the elements that respond to press should
diff --git a/docs/storybook/1-components/View/ViewScreen.js b/docs/storybook/1-components/View/ViewScreen.js
index b16895af..b4f1eeae 100644
--- a/docs/storybook/1-components/View/ViewScreen.js
+++ b/docs/storybook/1-components/View/ViewScreen.js
@@ -20,7 +20,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const ViewScreen = () =>
-  <UIExplorer title="View" url="components/View">
+  <UIExplorer title="View" url="1-components/View">
     <Description>
       <AppText>
         View is the fundamental UI building block. It is a component that supports style, layout
diff --git a/docs/storybook/2-apis/AppRegistry/AppRegistryScreen.js b/docs/storybook/2-apis/AppRegistry/AppRegistryScreen.js
index 900fe4c3..1c6c40ef 100644
--- a/docs/storybook/2-apis/AppRegistry/AppRegistryScreen.js
+++ b/docs/storybook/2-apis/AppRegistry/AppRegistryScreen.js
@@ -13,7 +13,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const AppRegistryScreen = () =>
-  <UIExplorer title="AppRegistry" url="apis/AppRegistry">
+  <UIExplorer title="AppRegistry" url="2-apis/AppRegistry">
     <Description>
       <AppText>
         AppRegistry is the control point for registering, running, prerendering, and unmounting all
diff --git a/docs/storybook/2-apis/AppState/AppStateScreen.js b/docs/storybook/2-apis/AppState/AppStateScreen.js
index 16d6dbcb..d236e920 100644
--- a/docs/storybook/2-apis/AppState/AppStateScreen.js
+++ b/docs/storybook/2-apis/AppState/AppStateScreen.js
@@ -16,7 +16,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const AppStateScreen = () =>
-  <UIExplorer title="AppState" url="apis/AppState">
+  <UIExplorer title="AppState" url="2-apis/AppState">
     <Description>
       <AppText>
         AppState can tell you if the app is in the foreground or background, and notify you when the
diff --git a/docs/storybook/2-apis/AsyncStorage/AsyncStorageScreen.js b/docs/storybook/2-apis/AsyncStorage/AsyncStorageScreen.js
index 7c105cb4..b0168d42 100644
--- a/docs/storybook/2-apis/AsyncStorage/AsyncStorageScreen.js
+++ b/docs/storybook/2-apis/AsyncStorage/AsyncStorageScreen.js
@@ -13,7 +13,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const AsyncStorageScreen = () =>
-  <UIExplorer title="AsyncStorage" url="apis/AsyncStorage">
+  <UIExplorer title="AsyncStorage" url="2-apis/AsyncStorage">
     <Description>
       <AppText>
         AsyncStorage is a simple, unencrypted, asynchronous, persistent, key-value storage system
diff --git a/docs/storybook/2-apis/Clipboard/ClipboardScreen.js b/docs/storybook/2-apis/Clipboard/ClipboardScreen.js
index 4178bef5..f06d0542 100644
--- a/docs/storybook/2-apis/Clipboard/ClipboardScreen.js
+++ b/docs/storybook/2-apis/Clipboard/ClipboardScreen.js
@@ -7,7 +7,7 @@ import SetStringExample from './examples/SetString';
 import UIExplorer, { Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const ClipboardScreen = () =>
-  <UIExplorer title="Clipboard" url="apis/Clipboard">
+  <UIExplorer title="Clipboard" url="2-apis/Clipboard">
     <Description>
       Clipboard gives you an interface for setting to the clipboard. (Getting clipboard content is
       not supported on web.)
diff --git a/docs/storybook/2-apis/Dimensions/DimensionsScreen.js b/docs/storybook/2-apis/Dimensions/DimensionsScreen.js
index b1b92fed..03e4d9a0 100644
--- a/docs/storybook/2-apis/Dimensions/DimensionsScreen.js
+++ b/docs/storybook/2-apis/Dimensions/DimensionsScreen.js
@@ -17,7 +17,7 @@ import UIExplorer, {
 import React from 'react';
 
 const DimensionsScreen = () =>
-  <UIExplorer title="Dimensions" url="apis/Dimensions">
+  <UIExplorer title="Dimensions" url="2-apis/Dimensions">
     <Description>
       Note: dimensions may change (e.g., due to device rotation) so any rendering logic or styles
       that depend on these constants should try to call this function on every render, rather than
diff --git a/docs/storybook/2-apis/I18nManager/I18nManagerScreen.js b/docs/storybook/2-apis/I18nManager/I18nManagerScreen.js
index 35b3c6ac..0d671a3a 100644
--- a/docs/storybook/2-apis/I18nManager/I18nManagerScreen.js
+++ b/docs/storybook/2-apis/I18nManager/I18nManagerScreen.js
@@ -9,7 +9,7 @@ import React from 'react';
 import UIExplorer, { Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const I18nManagerScreen = () =>
-  <UIExplorer title="I18nManager" url="apis/I18nManager">
+  <UIExplorer title="I18nManager" url="2-apis/I18nManager">
     <Description>Control and set the layout and writing direction of the application.</Description>
     <Section title="Properties">
       <DocItem
diff --git a/docs/storybook/2-apis/Linking/LinkingScreen.js b/docs/storybook/2-apis/Linking/LinkingScreen.js
index 4ec2b8b7..b5a3ab28 100644
--- a/docs/storybook/2-apis/Linking/LinkingScreen.js
+++ b/docs/storybook/2-apis/Linking/LinkingScreen.js
@@ -9,7 +9,7 @@ import React from 'react';
 import UIExplorer, { Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const LinkingScreen = () =>
-  <UIExplorer title="Linking" url="apis/Linking">
+  <UIExplorer title="Linking" url="2-apis/Linking">
     <Description>
       Linking gives you a general interface for securely opening external URLs from JavaScript.
     </Description>
diff --git a/docs/storybook/2-apis/NetInfo/NetInfoScreen.js b/docs/storybook/2-apis/NetInfo/NetInfoScreen.js
index 1a9ff5ef..adc64ae5 100644
--- a/docs/storybook/2-apis/NetInfo/NetInfoScreen.js
+++ b/docs/storybook/2-apis/NetInfo/NetInfoScreen.js
@@ -14,7 +14,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const NetInfoScreen = () =>
-  <UIExplorer title="NetInfo" url="apis/NetInfo">
+  <UIExplorer title="NetInfo" url="2-apis/NetInfo">
     <Description>
       <AppText>
         NetInfo asynchronously determines the online/offline status of the application.
diff --git a/docs/storybook/2-apis/PanResponder/PanResponderScreen.js b/docs/storybook/2-apis/PanResponder/PanResponderScreen.js
index 5d8ec3fa..82399d1c 100644
--- a/docs/storybook/2-apis/PanResponder/PanResponderScreen.js
+++ b/docs/storybook/2-apis/PanResponder/PanResponderScreen.js
@@ -7,7 +7,7 @@ import React from 'react';
 import UIExplorer, { AppText, Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const PanResponderScreen = () =>
-  <UIExplorer title="PanResponder" url="apis/PanResponder">
+  <UIExplorer title="PanResponder" url="2-apis/PanResponder">
     <Description>
       PanResponder reconciles several touches into a single gesture. It makes single-touch gestures
       resilient to extra touches, and can be used to recognize simple multi-touch gestures. For more
diff --git a/docs/storybook/2-apis/PixelRatio/PixelRatioScreen.js b/docs/storybook/2-apis/PixelRatio/PixelRatioScreen.js
index ba2305ba..6df0ae71 100644
--- a/docs/storybook/2-apis/PixelRatio/PixelRatioScreen.js
+++ b/docs/storybook/2-apis/PixelRatio/PixelRatioScreen.js
@@ -13,7 +13,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const PixelRatioScreen = () =>
-  <UIExplorer title="PixelRatio" url="apis/PixelRatio">
+  <UIExplorer title="PixelRatio" url="2-apis/PixelRatio">
     <Description>PixelRatio class gives access to the device pixel density.</Description>
     <Section title="Methods">
       <DocItem
diff --git a/docs/storybook/2-apis/Platform/PlatformScreen.js b/docs/storybook/2-apis/Platform/PlatformScreen.js
index 5cfda748..0e7627c2 100644
--- a/docs/storybook/2-apis/Platform/PlatformScreen.js
+++ b/docs/storybook/2-apis/Platform/PlatformScreen.js
@@ -6,7 +6,7 @@ import React from 'react';
 import UIExplorer, { Description, DocItem, Section, storiesOf } from '../../ui-explorer';
 
 const PlatformScreen = () =>
-  <UIExplorer title="Platform" url="apis/Platform">
+  <UIExplorer title="Platform" url="2-apis/Platform">
     <Description>
       Detect what is the platform in which the app is running. This piece of functionality can be
       useful when only small parts of a component are platform specific.
diff --git a/docs/storybook/2-apis/StyleSheet/StyleSheetScreen.js b/docs/storybook/2-apis/StyleSheet/StyleSheetScreen.js
index 14534870..05401b3c 100644
--- a/docs/storybook/2-apis/StyleSheet/StyleSheetScreen.js
+++ b/docs/storybook/2-apis/StyleSheet/StyleSheetScreen.js
@@ -13,7 +13,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const StyleSheetScreen = () =>
-  <UIExplorer title="StyleSheet" url="apis/StyleSheet">
+  <UIExplorer title="StyleSheet" url="2-apis/StyleSheet">
     <Description>
       The StyleSheet abstraction converts predefined styles to (vendor-prefixed) CSS without
       requiring a compile-time step. Styles that cannot be resolved outside of the render loop
diff --git a/docs/storybook/2-apis/Vibration/VibrationScreen.js b/docs/storybook/2-apis/Vibration/VibrationScreen.js
index 200889c3..49678ab4 100644
--- a/docs/storybook/2-apis/Vibration/VibrationScreen.js
+++ b/docs/storybook/2-apis/Vibration/VibrationScreen.js
@@ -13,7 +13,7 @@ import UIExplorer, {
 } from '../../ui-explorer';
 
 const VibrationScreen = () =>
-  <UIExplorer title="Vibration" url="apis/Vibration">
+  <UIExplorer title="Vibration" url="2-apis/Vibration">
     <Description>
       <AppText>
         Vibration is described as a pattern of on-off pulses, which may be of varying lengths. The