diff --git a/examples/cra-react15/.storybook/config.js b/examples/cra-react15/.storybook/config.js
index 17104723187..115943f0f4f 100644
--- a/examples/cra-react15/.storybook/config.js
+++ b/examples/cra-react15/.storybook/config.js
@@ -1,14 +1,10 @@
-import { configure, addParameters } from '@storybook/react';
+import { load, addParameters } from '@storybook/react';
 import { create } from '@storybook/theming/create';
 
-function loadStories() {
-  require('../src/stories');
-}
-
 addParameters({
   options: {
     theme: create({ colorPrimary: 'hotpink', colorSecondary: 'orangered' }),
   },
 });
 
-configure(loadStories, module);
+load(require.context('../src/stories', true, /\.stories\.js$/), module);
diff --git a/examples/cra-react15/src/stories/button.stories.js b/examples/cra-react15/src/stories/button.stories.js
new file mode 100644
index 00000000000..ca0e01a2ac9
--- /dev/null
+++ b/examples/cra-react15/src/stories/button.stories.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import { action } from '@storybook/addon-actions';
+import { Button } from '@storybook/react/demo';
+
+export default {
+  title: 'Button',
+  parameters: {
+    component: Button,
+  },
+};
+
+export const story1 = () => <Button onClick={action('clicked')}>Hello Button</Button>;
+story1.title = 'with text';
+
+export const story2 = () => (
+  <Button onClick={action('clicked')}>
+    <span role="img" aria-label="so cool">
+      😀 😎 👍 💯
+    </span>
+  </Button>
+);
+story2.title = 'with some emoji';
diff --git a/examples/cra-react15/src/stories/index.js b/examples/cra-react15/src/stories/index.js
deleted file mode 100644
index 9813c023564..00000000000
--- a/examples/cra-react15/src/stories/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
-import { linkTo } from '@storybook/addon-links';
-
-import { Button, Welcome } from '@storybook/react/demo';
-
-storiesOf('Welcome', module)
-  .addParameters({
-    component: Welcome,
-  })
-  .add('to Storybook', () => <Welcome showApp={linkTo('Button')} />);
-
-storiesOf('Button', module)
-  .addParameters({
-    component: Button,
-  })
-  .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => (
-    <Button onClick={action('clicked')}>
-      <span role="img" aria-label="so cool">
-        😀 😎 👍 💯
-      </span>
-    </Button>
-  ));
diff --git a/examples/cra-react15/src/stories/welcome.stories.js b/examples/cra-react15/src/stories/welcome.stories.js
new file mode 100644
index 00000000000..bb587d6136a
--- /dev/null
+++ b/examples/cra-react15/src/stories/welcome.stories.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import { linkTo } from '@storybook/addon-links';
+import { Welcome } from '@storybook/react/demo';
+
+export default {
+  title: 'Welcome',
+  parameters: {
+    component: Welcome,
+  },
+};
+
+export const story1 = () => <Welcome showApp={linkTo('Button')} />;
+story1.title = 'to Storybook';