diff --git a/blocks/components/index.js b/blocks/components/index.js
deleted file mode 100644
index c705635de2b5f..0000000000000
--- a/blocks/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Editable } from './editable';
diff --git a/blocks/components/editable/format-toolbar.js b/blocks/editable/format-toolbar.js
similarity index 100%
rename from blocks/components/editable/format-toolbar.js
rename to blocks/editable/format-toolbar.js
diff --git a/blocks/components/editable/index.js b/blocks/editable/index.js
similarity index 100%
rename from blocks/components/editable/index.js
rename to blocks/editable/index.js
diff --git a/blocks/components/editable/style.scss b/blocks/editable/style.scss
similarity index 100%
rename from blocks/components/editable/style.scss
rename to blocks/editable/style.scss
diff --git a/blocks/components/editable/tinymce.js b/blocks/editable/tinymce.js
similarity index 100%
rename from blocks/components/editable/tinymce.js
rename to blocks/editable/tinymce.js
diff --git a/blocks/index.js b/blocks/index.js
index fd71c3133a898..ac6ee3b22e546 100644
--- a/blocks/index.js
+++ b/blocks/index.js
@@ -13,4 +13,4 @@ import './library';
 // Blocks are inferred from the HTML source of a post through a parsing mechanism
 // and then stored as objects in state, from which it is then rendered for editing.
 export * from './api';
-export * from './components';
+export { default as Editable } from './editable';
diff --git a/blocks/library/button/index.js b/blocks/library/button/index.js
index 687f4f6bc9a78..c54635b7bab55 100644
--- a/blocks/library/button/index.js
+++ b/blocks/library/button/index.js
@@ -8,7 +8,7 @@ import IconButton from 'components/icon-button';
  */
 import './style.scss';
 import { registerBlock, query } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { attr, children } = query;
 
diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
index f5cbc2e0e9f34..54d3d1122d779 100644
--- a/blocks/library/embed/index.js
+++ b/blocks/library/embed/index.js
@@ -8,7 +8,7 @@ import Button from 'components/button';
  * Internal dependencies
  */
 import { registerBlock, query } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { attr, children } = query;
 
diff --git a/blocks/library/heading/index.js b/blocks/library/heading/index.js
index 94063f94458df..a01c592b622a2 100644
--- a/blocks/library/heading/index.js
+++ b/blocks/library/heading/index.js
@@ -3,7 +3,7 @@
  */
 import './style.scss';
 import { registerBlock, query } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { children, prop } = query;
 
diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
index ae4e17e6af0ec..0cf5500d3c477 100644
--- a/blocks/library/image/index.js
+++ b/blocks/library/image/index.js
@@ -9,7 +9,7 @@ import Button from 'components/button';
  */
 import './style.scss';
 import { registerBlock, query } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { attr, children } = query;
 
diff --git a/blocks/library/list/index.js b/blocks/library/list/index.js
index 38ee80081a010..0f852b2507a62 100644
--- a/blocks/library/list/index.js
+++ b/blocks/library/list/index.js
@@ -3,7 +3,7 @@
  */
 import './style.scss';
 import { registerBlock, query as hpq } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { children, prop } = hpq;
 
diff --git a/blocks/library/pullquote/index.js b/blocks/library/pullquote/index.js
index 0df3166174ca3..9e00c889052d1 100644
--- a/blocks/library/pullquote/index.js
+++ b/blocks/library/pullquote/index.js
@@ -3,7 +3,7 @@
  */
 import './style.scss';
 import { registerBlock, query as hpq } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { children, query } = hpq;
 
diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
index f3dbc9acae70e..4d63b42dca9e3 100644
--- a/blocks/library/quote/index.js
+++ b/blocks/library/quote/index.js
@@ -3,7 +3,7 @@
  */
 import './style.scss';
 import { registerBlock, query as hpq } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { children, query } = hpq;
 
diff --git a/blocks/library/text/index.js b/blocks/library/text/index.js
index 5ba3a76ae10b5..bf6bf44e1357d 100644
--- a/blocks/library/text/index.js
+++ b/blocks/library/text/index.js
@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import { registerBlock, createBlock, query } from '../../api';
-import Editable from '../../components/editable';
+import Editable from '../../editable';
 
 const { children } = query;