diff --git a/core/core/src/stories/controls-array.stories.js b/core/core/src/stories/controls-array.stories.js
index 3f5cffc82..f85eae6b0 100644
--- a/core/core/src/stories/controls-array.stories.js
+++ b/core/core/src/stories/controls-array.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { ArrayControl } from './components/ArrayControl';
 
 export default {
diff --git a/core/core/src/stories/controls-boolean.stories.js b/core/core/src/stories/controls-boolean.stories.js
index 1f8971595..ecea05af4 100644
--- a/core/core/src/stories/controls-boolean.stories.js
+++ b/core/core/src/stories/controls-boolean.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { BooleanControl } from './components/BooleanControl';
 
 export default {
diff --git a/core/core/src/stories/controls-button.stories.js b/core/core/src/stories/controls-button.stories.js
index 80077b207..43e49a8ba 100644
--- a/core/core/src/stories/controls-button.stories.js
+++ b/core/core/src/stories/controls-button.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button } from 'theme-ui';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { ButtonControl } from './components/ButtonControl';
 
 export default {
diff --git a/core/core/src/stories/controls-color.stories.js b/core/core/src/stories/controls-color.stories.js
index 9f386038d..6e1ea0375 100644
--- a/core/core/src/stories/controls-color.stories.js
+++ b/core/core/src/stories/controls-color.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { ColorControl } from './components/ColorControl';
 
 export default {
diff --git a/core/core/src/stories/controls-date.stories.js b/core/core/src/stories/controls-date.stories.js
index f68a2148a..ea407c596 100644
--- a/core/core/src/stories/controls-date.stories.js
+++ b/core/core/src/stories/controls-date.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { DateControl } from './components/DateControl';
 
 export default {
diff --git a/core/core/src/stories/controls-files.stories.js b/core/core/src/stories/controls-files.stories.js
index 3ead230ff..51770ef10 100644
--- a/core/core/src/stories/controls-files.stories.js
+++ b/core/core/src/stories/controls-files.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { FilesControl } from './components/FilesControl';
 
 export default {
diff --git a/core/core/src/stories/controls-number.stories.js b/core/core/src/stories/controls-number.stories.js
index b28dbede0..82aad5b88 100644
--- a/core/core/src/stories/controls-number.stories.js
+++ b/core/core/src/stories/controls-number.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { NumberControl } from './components/NumberControl';
 
 export default {
diff --git a/core/core/src/stories/controls-object.stories.js b/core/core/src/stories/controls-object.stories.js
index 65aed6af6..ab43bf8e4 100644
--- a/core/core/src/stories/controls-object.stories.js
+++ b/core/core/src/stories/controls-object.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button } from 'theme-ui';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { ObjectControl } from './components/ObjectControl';
 
 export default {
diff --git a/core/core/src/stories/controls-options.stories.js b/core/core/src/stories/controls-options.stories.js
index a96ba3c8f..4efa49181 100644
--- a/core/core/src/stories/controls-options.stories.js
+++ b/core/core/src/stories/controls-options.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { OptionsControl } from './components/OptionsControl';
 
 export default {
diff --git a/core/core/src/stories/controls-text.stories.js b/core/core/src/stories/controls-text.stories.js
index a42811444..3f3f29625 100644
--- a/core/core/src/stories/controls-text.stories.js
+++ b/core/core/src/stories/controls-text.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ControlTypes } from '../components';
+import { ControlTypes } from '../controls';
 import { TextControl } from './components/TextControl';
 
 export default {
diff --git a/examples/gatsby/.config/buildtime.js b/examples/gatsby/.config/buildtime.js
index 8c9091a6b..3aa623ff1 100644
--- a/examples/gatsby/.config/buildtime.js
+++ b/examples/gatsby/.config/buildtime.js
@@ -7,7 +7,6 @@ module.exports = {
     '../../stories/src/tutorial/*.mdx',
     '../../stories/src/stories/*.stories.(js|jsx|tsx|mdx)',
     '../src/stories/*.stories.(js|jsx|tsx|mdx)',
-    '../../../ui/app-components/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/app/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/components/src/**/*.stories.(js|jsx|tsx|mdx)',
   ],
diff --git a/examples/gatsby/.config/runtime.js b/examples/gatsby/.config/runtime.js
index 8c0d89f6b..93be94514 100644
--- a/examples/gatsby/.config/runtime.js
+++ b/examples/gatsby/.config/runtime.js
@@ -1,4 +1,4 @@
-const categories = ['Introduction', 'Application','Controls','Blocks', 'Editors', 'Components', 'App components', 'Plugins']
+const categories = ['Introduction', 'Application','Controls','Blocks', 'Editors', 'Components', 'Plugins']
 
 module.exports = {
   siteTitle: `Component controls`,
diff --git a/examples/storybook-6-no-docs/.storybook/main.js b/examples/storybook-6-no-docs/.storybook/main.js
index 3f78a6604..2666d6eff 100644
--- a/examples/storybook-6-no-docs/.storybook/main.js
+++ b/examples/storybook-6-no-docs/.storybook/main.js
@@ -29,9 +29,8 @@ module.exports = {
     '../../../ui/editors/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/components/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/app/src/**/*.stories.(js|jsx|tsx|mdx)',
-    '../../../ui/app-components/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/blocks/src/**/*.stories.(js|jsx|tsx|mdx)',
-    '../../../core/specification/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
+    '../../../core/core/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../plugins/axe-plugin/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
     '../../stories/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../stories/**/*.stories.(js|jsx|tsx|mdx)',
diff --git a/examples/storybook-6-no-docs/.storybook/preview.js b/examples/storybook-6-no-docs/.storybook/preview.js
index 57edc56e9..e62711bbc 100644
--- a/examples/storybook-6-no-docs/.storybook/preview.js
+++ b/examples/storybook-6-no-docs/.storybook/preview.js
@@ -5,7 +5,7 @@ import { ThemeProvider } from '@component-controls/storybook';
 addDecorator(story => (
   <ThemeProvider>{story()}</ThemeProvider>
 ));
-const categories = ['Introduction', 'Application','Controls','Blocks', 'Editors', 'Components', 'App components', 'Plugins']
+const categories = ['Introduction', 'Application','Controls','Blocks', 'Editors', 'Components', 'Plugins']
 addParameters({
   dependencies: { hideEmpty: true },
   options: {
diff --git a/examples/storybook-6/.storybook/main.js b/examples/storybook-6/.storybook/main.js
index d523014ed..6b244194d 100644
--- a/examples/storybook-6/.storybook/main.js
+++ b/examples/storybook-6/.storybook/main.js
@@ -3,10 +3,9 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 
 module.exports = {
   stories: [
-    '../../../core/specification/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
+    '../../../core/core/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/editors/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/app/src/**/*.stories.(js|jsx|tsx|mdx)',
-    '../../../ui/app-components/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/components/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../ui/blocks/src/**/*.stories.(js|jsx|tsx|mdx)',
     '../../../plugins/axe-plugin/src/stories/**/*.stories.(js|jsx|tsx|mdx)',
diff --git a/examples/storybook-6/.storybook/preview.js b/examples/storybook-6/.storybook/preview.js
index 57edc56e9..e62711bbc 100644
--- a/examples/storybook-6/.storybook/preview.js
+++ b/examples/storybook-6/.storybook/preview.js
@@ -5,7 +5,7 @@ import { ThemeProvider } from '@component-controls/storybook';
 addDecorator(story => (
   <ThemeProvider>{story()}</ThemeProvider>
 ));
-const categories = ['Introduction', 'Application','Controls','Blocks', 'Editors', 'Components', 'App components', 'Plugins']
+const categories = ['Introduction', 'Application','Controls','Blocks', 'Editors', 'Components', 'Plugins']
 addParameters({
   dependencies: { hideEmpty: true },
   options: {