From 3db8496a131a53fb7b5e465dec50d4892aaa4cb4 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 1 May 2018 13:29:15 +0100
Subject: [PATCH 01/12] Framework: Move reusable block components from the
 blocks module to the editor module

---
 blocks/README.md                              | 110 -----------------
 .../raw-handling/test/integration/index.js    |   2 +-
 blocks/api/test/factory.js                    |   2 +-
 blocks/api/test/parser.js                     |   2 +-
 blocks/api/test/registration.js               |   2 +-
 blocks/api/test/serializer.js                 |   6 +-
 blocks/contrast-checker/style.scss            |   3 -
 blocks/index.js                               |  28 -----
 blocks/index.native.js                        |   1 -
 core-blocks/audio/index.js                    |   4 +-
 core-blocks/block/index.js                    |   2 +-
 core-blocks/button/editor.scss                |  10 +-
 core-blocks/button/index.js                   |   2 +-
 .../button/test/__snapshots__/index.js.snap   |   6 +-
 core-blocks/categories/block.js               |   2 +-
 core-blocks/code/edit.js                      |   2 +-
 core-blocks/code/edit.native.js               |   2 +-
 core-blocks/code/editor.scss                  |   2 +-
 core-blocks/code/index.js                     |   4 +-
 .../code/test/__snapshots__/index.js.snap     |   2 +-
 core-blocks/columns/index.js                  |   2 +-
 core-blocks/cover-image/editor.scss           |   6 +-
 core-blocks/cover-image/index.js              |   6 +-
 core-blocks/embed/index.js                    |   6 +-
 core-blocks/freeform/editor.scss              |   2 +-
 core-blocks/gallery/block.js                  |   4 +-
 core-blocks/gallery/editor.scss               |   6 +-
 core-blocks/gallery/gallery-image.js          |   2 +-
 core-blocks/gallery/index.js                  |   2 +-
 core-blocks/heading/index.js                  |   5 +-
 .../heading/test/__snapshots__/index.js.snap  |   6 +-
 core-blocks/html/index.js                     |   3 +-
 core-blocks/image/block.js                    |   6 +-
 core-blocks/image/editor.scss                 |   4 +-
 core-blocks/image/index.js                    |   2 +-
 core-blocks/latest-posts/block.js             |   2 +-
 core-blocks/list/editor.scss                  |   6 +-
 core-blocks/list/index.js                     |   5 +-
 .../list/test/__snapshots__/index.js.snap     |   6 +-
 core-blocks/more/index.js                     |   6 +-
 core-blocks/paragraph/index.js                |   5 +-
 .../test/__snapshots__/index.js.snap          |   6 +-
 core-blocks/preformatted/index.js             |   7 +-
 .../test/__snapshots__/index.js.snap          |   6 +-
 core-blocks/pullquote/editor.scss             |  12 +-
 core-blocks/pullquote/index.js                |   2 +-
 .../test/__snapshots__/index.js.snap          |   6 +-
 core-blocks/quote/index.js                    |   5 +-
 .../quote/test/__snapshots__/index.js.snap    |   6 +-
 core-blocks/shortcode/editor.scss             |   2 +-
 core-blocks/shortcode/index.js                |   2 +-
 .../test/__snapshots__/index.js.snap          |   2 +-
 core-blocks/subhead/index.js                  |   6 +-
 core-blocks/table/index.js                    |   4 +-
 core-blocks/table/table-block.js              |   2 +-
 .../table/test/__snapshots__/index.js.snap    |   4 +-
 core-blocks/test/full-content.js              |   2 +-
 core-blocks/test/helpers/index.js             |   2 +-
 core-blocks/text-columns/editor.scss          |   2 +-
 core-blocks/text-columns/index.js             |   2 +-
 .../test/__snapshots__/index.js.snap          |  12 +-
 core-blocks/verse/index.js                    |   6 +-
 .../verse/test/__snapshots__/index.js.snap    |   6 +-
 core-blocks/video/index.js                    |   4 +-
 docs/extensibility/autocomplete.md            |   2 +-
 .../assets/stylesheets/_admin-schemes.scss    |   4 +-
 edit-post/assets/stylesheets/_z-index.scss    |   9 +-
 editor/README.md                              | 111 ++++++++++++++++++
 .../components}/alignment-toolbar/index.js    |   0
 .../test/__snapshots__/index.js.snap          |   0
 .../alignment-toolbar/test/index.js           |   0
 .../components}/autocomplete/README.md        |   0
 .../components}/autocomplete/index.js         |   1 +
 .../components}/autocomplete/test/index.js    |   0
 .../components}/autocompleters/README.md      |   0
 .../components}/autocompleters/block.js       |   8 +-
 .../components}/autocompleters/index.js       |   0
 .../components}/autocompleters/style.scss     |  14 +--
 .../components}/autocompleters/test/block.js  |   6 +-
 .../components}/autocompleters/user.js        |   8 +-
 .../block-alignment-toolbar/index.js          |   6 +-
 .../test/__snapshots__/index.js.snap          |   0
 .../block-alignment-toolbar/test/index.js     |   0
 .../components}/block-controls/index.js       |   0
 .../test/__snapshots__/index.js.snap          |   0
 .../components}/block-controls/test/index.js  |   0
 .../components}/block-edit/context.js         |   0
 .../components}/block-edit/edit.js            |  10 +-
 .../components}/block-edit/index.js           |   0
 .../components}/block-edit/test/edit.js       |  10 +-
 .../block-format-controls/index.js            |   0
 .../components}/block-icon/index.js           |   0
 .../components}/block-icon/test/index.js      |   0
 editor/components/block-inspector/index.js    |  10 +-
 editor/components/block-list/block.js         |   2 +-
 editor/components/block-preview/index.js      |   3 +-
 editor/components/block-switcher/index.js     |   3 +-
 editor/components/block-toolbar/index.js      |   3 +-
 .../components}/color-palette/index.js        |   2 +-
 .../color-palette/with-color-context.js       |   9 +-
 {blocks => editor/components}/colors/index.js |   0
 {blocks => editor/components}/colors/utils.js |   0
 .../components}/colors/with-colors.js         |   2 +-
 .../components}/contrast-checker/index.js     |   2 +-
 editor/components/contrast-checker/style.scss |   3 +
 .../test/__snapshots__/index.js.snap          |   6 +-
 .../contrast-checker/test/index.js            |   0
 .../components}/image-placeholder/index.js    |   3 +-
 editor/components/index.js                    |  25 ++++
 .../components}/inner-blocks/README.md        |   0
 .../components}/inner-blocks/index.js         |   0
 .../inserter-with-shortcuts/index.js          |   3 +-
 editor/components/inserter/group.js           |   6 +-
 .../inspector-advanced-controls/index.js      |   0
 .../components}/inspector-controls/index.js   |   0
 .../components}/media-upload/README.md        |   2 +-
 .../components}/media-upload/index.js         |   1 +
 .../components}/panel-color/index.js          |   2 +-
 .../components}/plain-text/README.md          |   0
 .../components}/plain-text/index.js           |   2 +-
 .../components}/plain-text/index.native.js    |   0
 .../components}/plain-text/style.native.scss  |   0
 .../components}/plain-text/style.scss         |   2 +-
 .../components/post-featured-image/index.js   |   2 +-
 editor/components/provider/index.js           |   7 +-
 .../components}/rich-text/README.md           |   0
 .../components}/rich-text/aria.js             |   0
 .../components}/rich-text/constants.js        |   0
 .../rich-text/format-toolbar/index.js         |  22 ++--
 .../rich-text/format-toolbar/style.scss       |  18 +--
 .../components}/rich-text/format.js           |   0
 .../components}/rich-text/index.js            |   6 +-
 .../components}/rich-text/patterns.js         |   2 +-
 .../components}/rich-text/provider.js         |   0
 .../components}/rich-text/style.scss          |   7 +-
 .../test/__snapshots__/format.js.snap         |   0
 .../components}/rich-text/test/format.js      |   0
 .../components}/rich-text/test/index.js       |   0
 .../components}/rich-text/tinymce.js          |   4 +-
 .../components}/url-input/button.js           |   8 +-
 .../components}/url-input/index.js            |  14 +--
 .../components}/url-input/style.scss          |  18 +--
 .../components}/url-input/test/button.js      |   4 +-
 {blocks => editor}/hooks/align.js             |   5 +-
 {blocks => editor}/hooks/anchor.js            |   4 +-
 {blocks => editor}/hooks/custom-class-name.js |   4 +-
 .../hooks/default-autocompleters.js           |   4 +-
 .../hooks/generated-class-name.js             |   6 +-
 {blocks => editor}/hooks/index.js             |   0
 {blocks => editor}/hooks/layout.js            |   0
 {blocks => editor}/hooks/test/align.js        |  10 +-
 {blocks => editor}/hooks/test/anchor.js       |   0
 .../hooks/test/custom-class-name.js           |   0
 .../hooks/test/default-autocompleters.js      |   2 +-
 .../hooks/test/generated-class-name.js        |   0
 {blocks => editor}/hooks/test/layout.js       |   0
 editor/index.js                               |   1 +
 editor/index.native.js                        |   1 +
 lib/client-assets.php                         |  38 ++----
 159 files changed, 418 insertions(+), 443 deletions(-)
 delete mode 100644 blocks/contrast-checker/style.scss
 rename {blocks => editor/components}/alignment-toolbar/index.js (100%)
 rename {blocks => editor/components}/alignment-toolbar/test/__snapshots__/index.js.snap (100%)
 rename {blocks => editor/components}/alignment-toolbar/test/index.js (100%)
 rename {blocks => editor/components}/autocomplete/README.md (100%)
 rename {blocks => editor/components}/autocomplete/index.js (99%)
 rename {blocks => editor/components}/autocomplete/test/index.js (100%)
 rename {blocks => editor/components}/autocompleters/README.md (100%)
 rename {blocks => editor/components}/autocompleters/block.js (88%)
 rename {blocks => editor/components}/autocompleters/index.js (100%)
 rename {blocks => editor/components}/autocompleters/style.scss (70%)
 rename {blocks => editor/components}/autocompleters/test/block.js (97%)
 rename {blocks => editor/components}/autocompleters/user.js (72%)
 rename {blocks => editor/components}/block-alignment-toolbar/index.js (93%)
 rename {blocks => editor/components}/block-alignment-toolbar/test/__snapshots__/index.js.snap (100%)
 rename {blocks => editor/components}/block-alignment-toolbar/test/index.js (100%)
 rename {blocks => editor/components}/block-controls/index.js (100%)
 rename {blocks => editor/components}/block-controls/test/__snapshots__/index.js.snap (100%)
 rename {blocks => editor/components}/block-controls/test/index.js (100%)
 rename {blocks => editor/components}/block-edit/context.js (100%)
 rename {blocks => editor/components}/block-edit/edit.js (88%)
 rename {blocks => editor/components}/block-edit/index.js (100%)
 rename {blocks => editor/components}/block-edit/test/edit.js (96%)
 rename {blocks => editor/components}/block-format-controls/index.js (100%)
 rename {blocks => editor/components}/block-icon/index.js (100%)
 rename {blocks => editor/components}/block-icon/test/index.js (100%)
 rename {blocks => editor/components}/color-palette/index.js (76%)
 rename blocks/with-color-context/index.js => editor/components/color-palette/with-color-context.js (86%)
 rename {blocks => editor/components}/colors/index.js (100%)
 rename {blocks => editor/components}/colors/utils.js (100%)
 rename {blocks => editor/components}/colors/with-colors.js (95%)
 rename {blocks => editor/components}/contrast-checker/index.js (96%)
 create mode 100644 editor/components/contrast-checker/style.scss
 rename {blocks => editor/components}/contrast-checker/test/__snapshots__/index.js.snap (94%)
 rename {blocks => editor/components}/contrast-checker/test/index.js (100%)
 rename {blocks => editor/components}/image-placeholder/index.js (95%)
 rename {blocks => editor/components}/inner-blocks/README.md (100%)
 rename {blocks => editor/components}/inner-blocks/index.js (100%)
 rename {blocks => editor/components}/inspector-advanced-controls/index.js (100%)
 rename {blocks => editor/components}/inspector-controls/index.js (100%)
 rename {blocks => editor/components}/media-upload/README.md (97%)
 rename {blocks => editor/components}/media-upload/index.js (95%)
 rename {blocks => editor/components}/panel-color/index.js (92%)
 rename {blocks => editor/components}/plain-text/README.md (100%)
 rename {blocks => editor/components}/plain-text/index.js (86%)
 rename {blocks => editor/components}/plain-text/index.native.js (100%)
 rename {blocks => editor/components}/plain-text/style.native.scss (100%)
 rename {blocks => editor/components}/plain-text/style.scss (83%)
 rename {blocks => editor/components}/rich-text/README.md (100%)
 rename {blocks => editor/components}/rich-text/aria.js (100%)
 rename {blocks => editor/components}/rich-text/constants.js (100%)
 rename {blocks => editor/components}/rich-text/format-toolbar/index.js (92%)
 rename {blocks => editor/components}/rich-text/format-toolbar/style.scss (72%)
 rename {blocks => editor/components}/rich-text/format.js (100%)
 rename {blocks => editor/components}/rich-text/index.js (99%)
 rename {blocks => editor/components}/rich-text/patterns.js (98%)
 rename {blocks => editor/components}/rich-text/provider.js (100%)
 rename {blocks => editor/components}/rich-text/style.scss (94%)
 rename {blocks => editor/components}/rich-text/test/__snapshots__/format.js.snap (100%)
 rename {blocks => editor/components}/rich-text/test/format.js (100%)
 rename {blocks => editor/components}/rich-text/test/index.js (100%)
 rename {blocks => editor/components}/rich-text/tinymce.js (97%)
 rename {blocks => editor/components}/url-input/button.js (88%)
 rename {blocks => editor/components}/url-input/index.js (92%)
 rename {blocks => editor/components}/url-input/style.scss (81%)
 rename {blocks => editor/components}/url-input/test/button.js (95%)
 rename {blocks => editor}/hooks/align.js (95%)
 rename {blocks => editor}/hooks/anchor.js (96%)
 rename {blocks => editor}/hooks/custom-class-name.js (96%)
 rename {blocks => editor}/hooks/default-autocompleters.js (84%)
 rename {blocks => editor}/hooks/generated-class-name.js (92%)
 rename {blocks => editor}/hooks/index.js (100%)
 rename {blocks => editor}/hooks/layout.js (100%)
 rename {blocks => editor}/hooks/test/align.js (99%)
 rename {blocks => editor}/hooks/test/anchor.js (100%)
 rename {blocks => editor}/hooks/test/custom-class-name.js (100%)
 rename {blocks => editor}/hooks/test/default-autocompleters.js (96%)
 rename {blocks => editor}/hooks/test/generated-class-name.js (100%)
 rename {blocks => editor}/hooks/test/layout.js (100%)
 create mode 100644 editor/index.native.js

diff --git a/blocks/README.md b/blocks/README.md
index 8ce7772cdeb4c..77a7624ed0a06 100644
--- a/blocks/README.md
+++ b/blocks/README.md
@@ -263,113 +263,3 @@ Returns type definitions associated with a registered block.
 
 Returns settings associated with a registered control.
 
-## Components
-
-Because many blocks share the same complex behaviors, the following components
-are made available to simplify implementations of your block's `edit` function.
-
-### `BlockControls`
-
-When returned by your block's `edit` implementation, renders a toolbar of icon
-buttons. This is useful for block-level modifications to be made available when
-a block is selected. For example, if your block supports alignment, you may
-want to display alignment options in the selected block's toolbar.
-
-Example:
-
-```js
-( function( blocks, element ) {
-	var el = element.createElement,
-		BlockControls = blocks.BlockControls,
-		AlignmentToolbar = blocks.AlignmentToolbar;
-
-	function edit( props ) {
-		return [
-			// Controls: (only visible when block is selected)
-			el( BlockControls, { key: 'controls' },
-				el( AlignmentToolbar, {
-					value: props.align,
-					onChange: function( nextAlign ) {
-						props.setAttributes( { align: nextAlign } )
-					}
-				} )
-			),
-
-			// Block content: (with alignment as attribute)
-			el( 'p', { key: 'text', style: { textAlign: props.align } },
-				'Hello World!'
-			),
-		];
-	}
-} )(
-	window.wp.blocks,
-	window.wp.element
-);
-```
-
-Note in this example that we render `AlignmentToolbar` as a child of the
-`BlockControls` element. This is another pre-configured component you can use
-to simplify block text alignment.
-
-Alternatively, you can create your own toolbar controls by passing an array of
-`controls` as a prop to the `BlockControls` component. Each control should be
-an object with the following properties:
-
-- `icon: string` - Slug of the Dashicon to be shown in the control's toolbar button
-- `title: string` - A human-readable localized text to be shown as the tooltip label of the control's button
-- `subscript: ?string` - Optional text to be shown adjacent the button icon as subscript (for example, heading levels)
-- `isActive: ?boolean` - Whether the control should be considered active / selected. Defaults to `false`.
-
-To create divisions between sets of controls within the same `BlockControls`
-element, passing `controls` instead as a nested array (array of arrays of
-objects). A divider will be shown between each set of controls.
-
-### `RichText`
-
-Render a rich
-[`contenteditable` input](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Editable_content),
-providing users the option to add emphasis to content or links to content. It
-behaves similarly to a
-[controlled component](https://facebook.github.io/react/docs/forms.html#controlled-components),
-except that `onChange` is triggered less frequently than would be expected from
-a traditional `input` field, usually when the user exits the field.
-
-The following properties (non-exhaustive list) are made available:
-
-- `value: string` - Markup value of the field. Only valid markup is
-  allowed, as determined by `inline` value and available controls.
-- `onChange: Function` - Callback handler when the value of the field changes,
-  passing the new value as its only argument.
-- `placeholder: string` - A text hint to be shown to the user when the field
-  value is empty, similar to the
-  [`input` and `textarea` attribute of the same name](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms/HTML5_updates#The_placeholder_attribute).
-- `multiline: String` - A tag name to use for the tag that should be inserted
-  when Enter is pressed.  For example: `li` in a list block, and `p` for a
-	block that can contain multiple paragraphs.  The default is that only inline
-	elements are allowed to be used in inserted into the text, effectively
-  disabling the behavior of the "Enter" key.
-
-Example:
-
-```js
-( function( blocks, element ) {
-	var el = element.createElement,
-		RichText = blocks.RichText;
-
-	function edit( props ) {
-		function onChange( value ) {
-			props.setAttributes( { text: value } );
-		}
-
-		return el( RichText, {
-			value: props.attributes.text,
-			onChange: onChange
-		} );
-	}
-
-	// blocks.registerBlockType( ..., { edit: edit, ... } );
-} )(
-	window.wp.blocks,
-	window.wp.element
-);
-```
diff --git a/blocks/api/raw-handling/test/integration/index.js b/blocks/api/raw-handling/test/integration/index.js
index 2dc567ad10895..2a66cf04a5ff6 100644
--- a/blocks/api/raw-handling/test/integration/index.js
+++ b/blocks/api/raw-handling/test/integration/index.js
@@ -34,7 +34,7 @@ function readFile( filePath ) {
 describe( 'raw handling: integration', () => {
 	beforeAll( () => {
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 		registerCoreBlocks();
 	} );
 
diff --git a/blocks/api/test/factory.js b/blocks/api/test/factory.js
index 98f44734cd379..553d337245fd0 100644
--- a/blocks/api/test/factory.js
+++ b/blocks/api/test/factory.js
@@ -31,7 +31,7 @@ describe( 'block factory', () => {
 
 	beforeAll( () => {
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 	} );
 
 	afterEach( () => {
diff --git a/blocks/api/test/parser.js b/blocks/api/test/parser.js
index 36208909138aa..1eacdc317e37f 100644
--- a/blocks/api/test/parser.js
+++ b/blocks/api/test/parser.js
@@ -43,7 +43,7 @@ describe( 'block parser', () => {
 
 	beforeAll( () => {
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 	} );
 
 	afterEach( () => {
diff --git a/blocks/api/test/registration.js b/blocks/api/test/registration.js
index e68e8471c3220..0c6317ba11c96 100644
--- a/blocks/api/test/registration.js
+++ b/blocks/api/test/registration.js
@@ -30,7 +30,7 @@ describe( 'blocks', () => {
 
 	beforeAll( () => {
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 	} );
 
 	afterEach( () => {
diff --git a/blocks/api/test/serializer.js b/blocks/api/test/serializer.js
index 78a8394e6e41a..345c3ef3cc2f7 100644
--- a/blocks/api/test/serializer.js
+++ b/blocks/api/test/serializer.js
@@ -23,12 +23,14 @@ import {
 	setUnknownTypeHandlerName,
 } from '../registration';
 import { createBlock } from '../';
-import InnerBlocks from '../../inner-blocks';
+
+// Todo: move the test to the inner-blocks folder
+import InnerBlocks from '../../../editor/components/inner-blocks';
 
 describe( 'block serializer', () => {
 	beforeAll( () => {
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 	} );
 
 	afterEach( () => {
diff --git a/blocks/contrast-checker/style.scss b/blocks/contrast-checker/style.scss
deleted file mode 100644
index 2456bd495e4ec..0000000000000
--- a/blocks/contrast-checker/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.blocks-contrast-checker > .notice {
-	margin: 0;
-}
diff --git a/blocks/index.js b/blocks/index.js
index e36deba7e0281..624f66f8396ad 100644
--- a/blocks/index.js
+++ b/blocks/index.js
@@ -1,8 +1,3 @@
-/**
- * Internal dependencies
- */
-import './hooks';
-
 // A "block" is the abstract term used to describe units of markup that,
 // when composed together, form the content or layout of a page.
 // The API for blocks is exposed via `wp.blocks`.
@@ -13,29 +8,6 @@ import './hooks';
 // 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 './autocompleters';
-export * from './colors';
 
 export { default as editorMediaUpload } from './editor-media-upload';
-export { default as AlignmentToolbar } from './alignment-toolbar';
-export { default as Autocomplete } from './autocomplete';
-export { default as BlockAlignmentToolbar } from './block-alignment-toolbar';
-export { default as BlockControls } from './block-controls';
-export { default as BlockFormatControls } from './block-format-controls';
-export { default as BlockEdit } from './block-edit';
-export { default as BlockIcon } from './block-icon';
-export { default as ColorPalette } from './color-palette';
-export { default as ContrastChecker } from './contrast-checker';
-export { default as ImagePlaceholder } from './image-placeholder';
-export { default as InnerBlocks } from './inner-blocks';
-export { default as InspectorControls } from './inspector-controls';
-export { default as InspectorAdvancedControls } from './inspector-advanced-controls';
-export { default as PlainText } from './plain-text';
-export { default as MediaUpload } from './media-upload';
-export { default as RichText } from './rich-text';
-export { default as RichTextProvider } from './rich-text/provider';
-export { default as UrlInput } from './url-input';
-export { default as UrlInputButton } from './url-input/button';
 export { default as EditorSettings, withEditorSettings } from './editor-settings';
-export { default as PanelColor } from './panel-color';
-export { default as withColorContext } from './with-color-context';
diff --git a/blocks/index.native.js b/blocks/index.native.js
index c949cf17d0a2a..2219a7dcfd3a9 100644
--- a/blocks/index.native.js
+++ b/blocks/index.native.js
@@ -9,4 +9,3 @@
 // and then stored as objects in state, from which it is then rendered for editing.
 export * from './api';
 
-export { default as PlainText } from './plain-text';
diff --git a/core-blocks/audio/index.js b/core-blocks/audio/index.js
index 6f0f47fe37110..955a72ae528c8 100644
--- a/core-blocks/audio/index.js
+++ b/core-blocks/audio/index.js
@@ -10,12 +10,12 @@ import {
 	Toolbar,
 } from '@wordpress/components';
 import { Component, Fragment } from '@wordpress/element';
+import { editorMediaUpload } from '@wordpress/blocks';
 import {
-	editorMediaUpload,
 	MediaUpload,
 	RichText,
 	BlockControls,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/block/index.js b/core-blocks/block/index.js
index 971ee4e3cd4d4..1ae8a3c345cbd 100644
--- a/core-blocks/block/index.js
+++ b/core-blocks/block/index.js
@@ -10,7 +10,7 @@ import { Component, Fragment, compose } from '@wordpress/element';
 import { Placeholder, Spinner, Disabled } from '@wordpress/components';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { BlockEdit } from '@wordpress/blocks';
+import { BlockEdit } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/button/editor.scss b/core-blocks/button/editor.scss
index 2522496515dc5..a899a488b36f6 100644
--- a/core-blocks/button/editor.scss
+++ b/core-blocks/button/editor.scss
@@ -13,7 +13,7 @@
 	margin-bottom: 0;
 	position: relative;
 
-	.blocks-rich-text__tinymce {
+	.editor-rich-text__tinymce {
 		cursor: text;
 	}
 }
@@ -30,13 +30,13 @@
 	$blocks-button__link-input-width: 280px;
 	width: $blocks-button__link-input-width;
 
-	.blocks-url-input {
+	.editor-url-input {
 		width: auto;
 	}
 
-	.blocks-url-input__suggestions {
+	.editor-url-input__suggestions {
 		width: $blocks-button__link-input-width - $icon-button-size - $icon-button-size;
-		z-index: z-index( '.blocks-button__inline-link .blocks-url-input__suggestions' );
+		z-index: z-index( '.blocks-button__inline-link .editor-url-input__suggestions' );
 	}
 
 	> .dashicon {
@@ -47,7 +47,7 @@
 		color: $dark-gray-100;
 	}
 
-	.blocks-url-input input[type=text]::placeholder {
+	.editor-url-input input[type=text]::placeholder {
 		color: $dark-gray-100;
 	}
 
diff --git a/core-blocks/button/index.js b/core-blocks/button/index.js
index 8a710ef4c0cd8..e9fb9fbd9218f 100644
--- a/core-blocks/button/index.js
+++ b/core-blocks/button/index.js
@@ -26,7 +26,7 @@ import {
 	getColorClass,
 	withColors,
 	PanelColor,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/button/test/__snapshots__/index.js.snap b/core-blocks/button/test/__snapshots__/index.js.snap
index 05d5185451e85..08b41dc9bc20a 100644
--- a/core-blocks/button/test/__snapshots__/index.js.snap
+++ b/core-blocks/button/test/__snapshots__/index.js.snap
@@ -5,7 +5,7 @@ exports[`core/button block edit matches snapshot 1`] = `
   class="wp-block-button"
 >
   <div
-    class="blocks-rich-text"
+    class="editor-rich-text"
   >
     <div>
       <div>
@@ -17,13 +17,13 @@ exports[`core/button block edit matches snapshot 1`] = `
             aria-expanded="false"
             aria-label="Add text…"
             aria-multiline="false"
-            class="wp-block-button__link blocks-rich-text__tinymce"
+            class="wp-block-button__link editor-rich-text__tinymce"
             contenteditable="true"
             data-is-placeholder-visible="true"
             role="textbox"
           />
           <span
-            class="blocks-rich-text__tinymce wp-block-button__link"
+            class="editor-rich-text__tinymce wp-block-button__link"
           >
             Add text…
           </span>
diff --git a/core-blocks/categories/block.js b/core-blocks/categories/block.js
index 21e940834bb14..c3152e3406a2f 100644
--- a/core-blocks/categories/block.js
+++ b/core-blocks/categories/block.js
@@ -10,7 +10,7 @@ import {
 	InspectorControls,
 	BlockControls,
 	BlockAlignmentToolbar,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/code/edit.js b/core-blocks/code/edit.js
index 71414afaa6c00..8dd4f95078632 100644
--- a/core-blocks/code/edit.js
+++ b/core-blocks/code/edit.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { PlainText } from '@wordpress/blocks';
+import { PlainText } from '@wordpress/editor';
 
 export default function edit( { attributes, setAttributes, className } ) {
 	return (
diff --git a/core-blocks/code/edit.native.js b/core-blocks/code/edit.native.js
index bde686ed7f700..f9e745e75a260 100644
--- a/core-blocks/code/edit.native.js
+++ b/core-blocks/code/edit.native.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { PlainText } from '@wordpress/blocks';
+import { PlainText } from '@wordpress/editor';
 
 // Note: styling is applied directly to the (nested) PlainText component. Web-side components
 // apply it to the container 'div' but we don't have a proper proposal for cascading styling yet.
diff --git a/core-blocks/code/editor.scss b/core-blocks/code/editor.scss
index d354bdb7e2912..f5d46e8c4e845 100644
--- a/core-blocks/code/editor.scss
+++ b/core-blocks/code/editor.scss
@@ -1,4 +1,4 @@
-.wp-block-code .blocks-plain-text {
+.wp-block-code .editor-plain-text {
 	font-family: $editor-html-font;
 	font-size: $text-editor-font-size;
 	color: $dark-gray-800;
diff --git a/core-blocks/code/index.js b/core-blocks/code/index.js
index 0b26512d61865..270ccb40aca46 100644
--- a/core-blocks/code/index.js
+++ b/core-blocks/code/index.js
@@ -2,9 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import {
-	createBlock,
-} from '@wordpress/blocks';
+import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/code/test/__snapshots__/index.js.snap b/core-blocks/code/test/__snapshots__/index.js.snap
index b5453f0faa1d4..4d44efaa90a74 100644
--- a/core-blocks/code/test/__snapshots__/index.js.snap
+++ b/core-blocks/code/test/__snapshots__/index.js.snap
@@ -6,7 +6,7 @@ exports[`core/code block edit matches snapshot 1`] = `
 >
   <textarea
     aria-label="Code"
-    class="blocks-plain-text"
+    class="editor-plain-text"
     placeholder="Write code…"
     rows="1"
   />
diff --git a/core-blocks/columns/index.js b/core-blocks/columns/index.js
index a21bd2683581d..9d8919d450a0b 100644
--- a/core-blocks/columns/index.js
+++ b/core-blocks/columns/index.js
@@ -14,7 +14,7 @@ import { Fragment } from '@wordpress/element';
 import {
 	InspectorControls,
 	InnerBlocks,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/cover-image/editor.scss b/core-blocks/cover-image/editor.scss
index 29db22108e5d9..0fb1490a55502 100644
--- a/core-blocks/cover-image/editor.scss
+++ b/core-blocks/cover-image/editor.scss
@@ -1,11 +1,11 @@
 .wp-block-cover-image {
 	margin: 0;
 
-	.blocks-rich-text__tinymce[data-is-empty="true"]:before {
+	.editor-rich-text__tinymce[data-is-empty="true"]:before {
 		position: inherit;
 	}
 
-	.blocks-rich-text__tinymce:focus a[data-mce-selected] {
+	.editor-rich-text__tinymce:focus a[data-mce-selected] {
 		padding: 0 2px;
 		margin: 0 -2px;
 		border-radius: 2px;
@@ -13,7 +13,7 @@
 		background: rgba( 255, 255, 255, 0.3 );
 	}
 
-	.blocks-rich-text strong {
+	.editor-rich-text strong {
 		font-weight: 300;
 	}
 
diff --git a/core-blocks/cover-image/index.js b/core-blocks/cover-image/index.js
index eb06175ee138f..dcd8e1f5ed954 100644
--- a/core-blocks/cover-image/index.js
+++ b/core-blocks/cover-image/index.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { isEmpty } from 'lodash';
+import classnames from 'classnames';
 
 /**
  * WordPress dependencies
@@ -9,9 +10,8 @@ import { isEmpty } from 'lodash';
 import { IconButton, PanelBody, RangeControl, ToggleControl, Toolbar } from '@wordpress/components';
 import { Fragment } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import classnames from 'classnames';
+import { createBlock } from '@wordpress/blocks';
 import {
-	createBlock,
 	BlockControls,
 	InspectorControls,
 	BlockAlignmentToolbar,
@@ -19,7 +19,7 @@ import {
 	MediaUpload,
 	AlignmentToolbar,
 	RichText,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/embed/index.js b/core-blocks/embed/index.js
index f9c6565cc326e..fda3b29fefc0f 100644
--- a/core-blocks/embed/index.js
+++ b/core-blocks/embed/index.js
@@ -4,6 +4,7 @@
 import { parse } from 'url';
 import { includes, kebabCase, toLower } from 'lodash';
 import { stringify } from 'querystring';
+import classnames from 'classnames';
 
 /**
  * WordPress dependencies
@@ -11,13 +12,12 @@ import { stringify } from 'querystring';
 import { __, sprintf } from '@wordpress/i18n';
 import { Component, Fragment, renderToString } from '@wordpress/element';
 import { Button, Placeholder, Spinner, SandBox } from '@wordpress/components';
-import classnames from 'classnames';
+import { createBlock } from '@wordpress/blocks';
 import {
-	createBlock,
 	BlockControls,
 	BlockAlignmentToolbar,
 	RichText,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/freeform/editor.scss b/core-blocks/freeform/editor.scss
index cba0ec09fbb67..2a3a35ffecc51 100644
--- a/core-blocks/freeform/editor.scss
+++ b/core-blocks/freeform/editor.scss
@@ -1,4 +1,4 @@
-.wp-block-freeform.blocks-rich-text__tinymce {
+.wp-block-freeform.editor-rich-text__tinymce {
 	overflow: hidden;
 	margin: -4px;
 	padding: 4px;
diff --git a/core-blocks/gallery/block.js b/core-blocks/gallery/block.js
index 3a7b50319ecde..e07ef3d186f15 100644
--- a/core-blocks/gallery/block.js
+++ b/core-blocks/gallery/block.js
@@ -18,14 +18,14 @@ import {
 	ToggleControl,
 	Toolbar,
 } from '@wordpress/components';
+import { editorMediaUpload } from '@wordpress/blocks';
 import {
-	editorMediaUpload,
 	BlockControls,
 	BlockAlignmentToolbar,
 	MediaUpload,
 	ImagePlaceholder,
 	InspectorControls,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/gallery/editor.scss b/core-blocks/gallery/editor.scss
index 50eb1c425136b..462e68af8a79d 100644
--- a/core-blocks/gallery/editor.scss
+++ b/core-blocks/gallery/editor.scss
@@ -15,19 +15,19 @@
 		@include loading_fade;
 	}
 
-	.blocks-rich-text {
+	.editor-rich-text {
 		position: absolute;
 		width: 100%;
 		max-height: 100%;
 		overflow-y: auto;
 	}
 
-	.blocks-rich-text figcaption:not( [data-is-placeholder-visible="true"] ) {
+	.editor-rich-text figcaption:not( [data-is-placeholder-visible="true"] ) {
 		position: relative;
 		overflow: hidden;
 	}
 
-	.is-selected .blocks-rich-text {
+	.is-selected .editor-rich-text {
 		width: calc( 100% - 8px );
 		left: 4px;
 		margin-top: -4px;
diff --git a/core-blocks/gallery/gallery-image.js b/core-blocks/gallery/gallery-image.js
index f76f9dd458d99..e8891f5ccd622 100644
--- a/core-blocks/gallery/gallery-image.js
+++ b/core-blocks/gallery/gallery-image.js
@@ -11,7 +11,7 @@ import { IconButton, Spinner } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { keycodes } from '@wordpress/utils';
 import { withSelect } from '@wordpress/data';
-import { RichText } from '@wordpress/blocks';
+import { RichText } from '@wordpress/editor';
 
 /**
  * Module constants
diff --git a/core-blocks/gallery/index.js b/core-blocks/gallery/index.js
index ea6cac77ebf1f..696f758200717 100644
--- a/core-blocks/gallery/index.js
+++ b/core-blocks/gallery/index.js
@@ -10,8 +10,8 @@ import { __ } from '@wordpress/i18n';
 import {
 	createBlock,
 	editorMediaUpload,
-	RichText,
 } from '@wordpress/blocks';
+import { RichText } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/heading/index.js b/core-blocks/heading/index.js
index 6684ef62071a3..84e656b957ddc 100644
--- a/core-blocks/heading/index.js
+++ b/core-blocks/heading/index.js
@@ -4,14 +4,13 @@
 import { __, sprintf } from '@wordpress/i18n';
 import { concatChildren, Fragment } from '@wordpress/element';
 import { PanelBody, Toolbar } from '@wordpress/components';
+import { createBlock, getPhrasingContentSchema } from '@wordpress/blocks';
 import {
-	createBlock,
 	RichText,
 	BlockControls,
 	InspectorControls,
 	AlignmentToolbar,
-	getPhrasingContentSchema,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/heading/test/__snapshots__/index.js.snap b/core-blocks/heading/test/__snapshots__/index.js.snap
index 3da981c56f1bd..6a817645c35e2 100644
--- a/core-blocks/heading/test/__snapshots__/index.js.snap
+++ b/core-blocks/heading/test/__snapshots__/index.js.snap
@@ -2,7 +2,7 @@
 
 exports[`core/heading block edit matches snapshot 1`] = `
 <div
-  class="wp-block-heading blocks-rich-text"
+  class="wp-block-heading editor-rich-text"
 >
   <div>
     <div>
@@ -14,13 +14,13 @@ exports[`core/heading block edit matches snapshot 1`] = `
           aria-expanded="false"
           aria-label="Write heading…"
           aria-multiline="false"
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
           role="textbox"
         />
         <h2
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
         >
           Write heading…
         </h2>
diff --git a/core-blocks/html/index.js b/core-blocks/html/index.js
index 7a7eb822fe715..16816eefe3380 100644
--- a/core-blocks/html/index.js
+++ b/core-blocks/html/index.js
@@ -4,7 +4,8 @@
 import { RawHTML } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { withState, SandBox, CodeEditor } from '@wordpress/components';
-import { BlockControls, getPhrasingContentSchema } from '@wordpress/blocks';
+import { getPhrasingContentSchema } from '@wordpress/blocks';
+import { BlockControls } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/image/block.js b/core-blocks/image/block.js
index 22556c27535ae..f52e1984d7120 100644
--- a/core-blocks/image/block.js
+++ b/core-blocks/image/block.js
@@ -30,6 +30,9 @@ import {
 import { withSelect } from '@wordpress/data';
 import {
 	editorMediaUpload,
+	withEditorSettings,
+} from '@wordpress/blocks';
+import {
 	RichText,
 	BlockControls,
 	InspectorControls,
@@ -37,8 +40,7 @@ import {
 	MediaUpload,
 	BlockAlignmentToolbar,
 	UrlInputButton,
-	withEditorSettings,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/image/editor.scss b/core-blocks/image/editor.scss
index 6236b7b54320b..edf2a48fb5e85 100644
--- a/core-blocks/image/editor.scss
+++ b/core-blocks/image/editor.scss
@@ -114,7 +114,7 @@
 	}
 }
 
-.editor-block-list__block[data-type="core/image"] .editor-block-toolbar .blocks-format-toolbar__link-modal {
+.editor-block-list__block[data-type="core/image"] .editor-block-toolbar .editor-format-toolbar__link-modal {
 	position: absolute;
 	left: 0;
 	right: 0;
@@ -123,4 +123,4 @@
 	@include break-small() {
 		margin: -1px;
 	}
-}
\ No newline at end of file
+}
diff --git a/core-blocks/image/index.js b/core-blocks/image/index.js
index bad314b5cb4eb..e50e468f0af0b 100644
--- a/core-blocks/image/index.js
+++ b/core-blocks/image/index.js
@@ -6,9 +6,9 @@ import {
 	createBlock,
 	getBlockAttributes,
 	getBlockType,
-	RichText,
 	getPhrasingContentSchema,
 } from '@wordpress/blocks';
+import { RichText } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/latest-posts/block.js b/core-blocks/latest-posts/block.js
index dd40606eec68d..04bd9330df79f 100644
--- a/core-blocks/latest-posts/block.js
+++ b/core-blocks/latest-posts/block.js
@@ -26,7 +26,7 @@ import {
 	InspectorControls,
 	BlockAlignmentToolbar,
 	BlockControls,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/list/editor.scss b/core-blocks/list/editor.scss
index cae73bd5c1658..902c3ea86af98 100644
--- a/core-blocks/list/editor.scss
+++ b/core-blocks/list/editor.scss
@@ -1,6 +1,6 @@
-.blocks-list .blocks-rich-text__tinymce,
-.blocks-list .blocks-rich-text__tinymce ul,
-.blocks-list .blocks-rich-text__tinymce ol {
+.blocks-list .editor-rich-text__tinymce,
+.blocks-list .editor-rich-text__tinymce ul,
+.blocks-list .editor-rich-text__tinymce ol {
 	padding-left: 1.3em;
 	margin-left: 1.3em;
 }
diff --git a/core-blocks/list/index.js b/core-blocks/list/index.js
index 5adaee2e7cc78..b579f4e3f8d52 100644
--- a/core-blocks/list/index.js
+++ b/core-blocks/list/index.js
@@ -8,12 +8,11 @@ import { find, compact, get, initial, last, isEmpty } from 'lodash';
  */
 import { Component, Fragment } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
+import { createBlock, getPhrasingContentSchema } from '@wordpress/blocks';
 import {
-	createBlock,
 	BlockControls,
 	RichText,
-	getPhrasingContentSchema,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/list/test/__snapshots__/index.js.snap b/core-blocks/list/test/__snapshots__/index.js.snap
index 0dfeabf5c9554..86d020fb14cc6 100644
--- a/core-blocks/list/test/__snapshots__/index.js.snap
+++ b/core-blocks/list/test/__snapshots__/index.js.snap
@@ -2,7 +2,7 @@
 
 exports[`core/list block edit matches snapshot 1`] = `
 <div
-  class="blocks-list blocks-rich-text"
+  class="blocks-list editor-rich-text"
 >
   <div>
     <div>
@@ -14,12 +14,12 @@ exports[`core/list block edit matches snapshot 1`] = `
           aria-expanded="false"
           aria-label="Write list…"
           aria-multiline="true"
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
         />
         <ul
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
         >
           <li>
             Write list…
diff --git a/core-blocks/more/index.js b/core-blocks/more/index.js
index 9b31308e2eac3..9d8e1b9c617a6 100644
--- a/core-blocks/more/index.js
+++ b/core-blocks/more/index.js
@@ -9,10 +9,8 @@ import { compact } from 'lodash';
 import { __ } from '@wordpress/i18n';
 import { PanelBody, ToggleControl } from '@wordpress/components';
 import { Component, Fragment, RawHTML } from '@wordpress/element';
-import {
-	createBlock,
-	InspectorControls,
-} from '@wordpress/blocks';
+import { createBlock } from '@wordpress/blocks';
+import { InspectorControls } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/paragraph/index.js b/core-blocks/paragraph/index.js
index d1e194f800e19..05e8f4ed345be 100644
--- a/core-blocks/paragraph/index.js
+++ b/core-blocks/paragraph/index.js
@@ -24,7 +24,6 @@ import {
 	withFallbackStyles,
 } from '@wordpress/components';
 import {
-	createBlock,
 	getColorClass,
 	withColors,
 	AlignmentToolbar,
@@ -33,8 +32,8 @@ import {
 	InspectorControls,
 	PanelColor,
 	RichText,
-	getPhrasingContentSchema,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
+import { createBlock, getPhrasingContentSchema } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/paragraph/test/__snapshots__/index.js.snap b/core-blocks/paragraph/test/__snapshots__/index.js.snap
index 0369b0add114d..95143b5865588 100644
--- a/core-blocks/paragraph/test/__snapshots__/index.js.snap
+++ b/core-blocks/paragraph/test/__snapshots__/index.js.snap
@@ -5,7 +5,7 @@ exports[`core/paragraph block edit matches snapshot 1`] = `
    
   <div>
     <div
-      class="blocks-rich-text"
+      class="editor-rich-text"
     >
       <div>
         <div>
@@ -17,13 +17,13 @@ exports[`core/paragraph block edit matches snapshot 1`] = `
               aria-expanded="false"
               aria-label="Add text or type / to add content"
               aria-multiline="false"
-              class="wp-block-paragraph blocks-rich-text__tinymce"
+              class="wp-block-paragraph editor-rich-text__tinymce"
               contenteditable="true"
               data-is-placeholder-visible="true"
               role="textbox"
             />
             <p
-              class="blocks-rich-text__tinymce wp-block-paragraph"
+              class="editor-rich-text__tinymce wp-block-paragraph"
             >
               Add text or type / to add content
             </p>
diff --git a/core-blocks/preformatted/index.js b/core-blocks/preformatted/index.js
index 6e094ced7b8a0..3e682a0280101 100644
--- a/core-blocks/preformatted/index.js
+++ b/core-blocks/preformatted/index.js
@@ -2,11 +2,8 @@
  * WordPress
  */
 import { __ } from '@wordpress/i18n';
-import {
-	createBlock,
-	RichText,
-	getPhrasingContentSchema,
-} from '@wordpress/blocks';
+import { createBlock, getPhrasingContentSchema } from '@wordpress/blocks';
+import { RichText } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/preformatted/test/__snapshots__/index.js.snap b/core-blocks/preformatted/test/__snapshots__/index.js.snap
index 89317044d5b73..ff76887661dcf 100644
--- a/core-blocks/preformatted/test/__snapshots__/index.js.snap
+++ b/core-blocks/preformatted/test/__snapshots__/index.js.snap
@@ -2,7 +2,7 @@
 
 exports[`core/preformatted block edit matches snapshot 1`] = `
 <div
-  class="wp-block-preformatted blocks-rich-text"
+  class="wp-block-preformatted editor-rich-text"
 >
   <div>
     <div>
@@ -14,13 +14,13 @@ exports[`core/preformatted block edit matches snapshot 1`] = `
           aria-expanded="false"
           aria-label="Write preformatted text…"
           aria-multiline="false"
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
           role="textbox"
         />
         <pre
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
         >
           Write preformatted text…
         </pre>
diff --git a/core-blocks/pullquote/editor.scss b/core-blocks/pullquote/editor.scss
index 974861f8f6c54..b52db1b10d61e 100644
--- a/core-blocks/pullquote/editor.scss
+++ b/core-blocks/pullquote/editor.scss
@@ -1,8 +1,8 @@
 .editor-block-list__block[data-type="core/pullquote"] {
 	&[data-align="left"],
 	&[data-align="right"] {
-		& .blocks-pullquote__content .blocks-rich-text__tinymce[data-is-empty="true"]:before,
-		& .blocks-rich-text p {
+		& .blocks-pullquote__content .editor-rich-text__tinymce[data-is-empty="true"]:before,
+		& .editor-rich-text p {
 			font-size: 20px;
 		}
 	}
@@ -13,19 +13,19 @@
 		display: block;
 	}
 
-	cite .blocks-rich-text__tinymce[data-is-empty="true"]:before {
+	cite .editor-rich-text__tinymce[data-is-empty="true"]:before {
 		font-size: 14px;
 		font-family: $default-font;
 	}
 
-	.blocks-rich-text__tinymce[data-is-empty="true"]:before {
+	.editor-rich-text__tinymce[data-is-empty="true"]:before {
 		width: 100%;
 		left: 50%;
 		transform: translateX( -50% );
 	}
 
-	& > .blocks-pullquote__content .blocks-rich-text__tinymce[data-is-empty="true"]:before,
-	& > .blocks-rich-text p {
+	& > .blocks-pullquote__content .editor-rich-text__tinymce[data-is-empty="true"]:before,
+	& > .editor-rich-text p {
 		font-size: 24px;
 		line-height: 1.6;
 	}
diff --git a/core-blocks/pullquote/index.js b/core-blocks/pullquote/index.js
index 3bf06e27557d9..cb93daa9ebf68 100644
--- a/core-blocks/pullquote/index.js
+++ b/core-blocks/pullquote/index.js
@@ -12,7 +12,7 @@ import {
 	BlockControls,
 	BlockAlignmentToolbar,
 	RichText,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/pullquote/test/__snapshots__/index.js.snap b/core-blocks/pullquote/test/__snapshots__/index.js.snap
index f8bdb27de8f50..3844d8a78013e 100644
--- a/core-blocks/pullquote/test/__snapshots__/index.js.snap
+++ b/core-blocks/pullquote/test/__snapshots__/index.js.snap
@@ -5,7 +5,7 @@ exports[`core/pullquote block edit matches snapshot 1`] = `
   class="wp-block-pullquote"
 >
   <div
-    class="blocks-pullquote__content blocks-rich-text"
+    class="blocks-pullquote__content editor-rich-text"
   >
     <div>
       <div>
@@ -17,13 +17,13 @@ exports[`core/pullquote block edit matches snapshot 1`] = `
             aria-expanded="false"
             aria-label="Write quote…"
             aria-multiline="true"
-            class="blocks-rich-text__tinymce"
+            class="editor-rich-text__tinymce"
             contenteditable="true"
             data-is-placeholder-visible="true"
             role="textbox"
           />
           <div
-            class="blocks-rich-text__tinymce"
+            class="editor-rich-text__tinymce"
           >
             <p>
               Write quote…
diff --git a/core-blocks/quote/index.js b/core-blocks/quote/index.js
index 7205bcefb69fb..b9d1b5a1ad1e4 100644
--- a/core-blocks/quote/index.js
+++ b/core-blocks/quote/index.js
@@ -10,13 +10,12 @@ import classnames from 'classnames';
 import { __, sprintf } from '@wordpress/i18n';
 import { Toolbar } from '@wordpress/components';
 import { Fragment } from '@wordpress/element';
+import { createBlock, getPhrasingContentSchema } from '@wordpress/blocks';
 import {
-	createBlock,
 	BlockControls,
 	AlignmentToolbar,
 	RichText,
-	getPhrasingContentSchema,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/quote/test/__snapshots__/index.js.snap b/core-blocks/quote/test/__snapshots__/index.js.snap
index 010e122e054ab..813b6d8417cb6 100644
--- a/core-blocks/quote/test/__snapshots__/index.js.snap
+++ b/core-blocks/quote/test/__snapshots__/index.js.snap
@@ -5,7 +5,7 @@ exports[`core/quote block edit matches snapshot 1`] = `
   class="wp-block-quote"
 >
   <div
-    class="blocks-rich-text"
+    class="editor-rich-text"
   >
     <div>
       <div>
@@ -17,13 +17,13 @@ exports[`core/quote block edit matches snapshot 1`] = `
             aria-expanded="false"
             aria-label="Write quote…"
             aria-multiline="true"
-            class="blocks-rich-text__tinymce"
+            class="editor-rich-text__tinymce"
             contenteditable="true"
             data-is-placeholder-visible="true"
             role="textbox"
           />
           <div
-            class="blocks-rich-text__tinymce"
+            class="editor-rich-text__tinymce"
           >
             <p>
               Write quote…
diff --git a/core-blocks/shortcode/editor.scss b/core-blocks/shortcode/editor.scss
index 864856a84ccb1..9eac821b9d656 100644
--- a/core-blocks/shortcode/editor.scss
+++ b/core-blocks/shortcode/editor.scss
@@ -15,7 +15,7 @@
 		font-weight: 600;
 	}
 
-	.blocks-plain-text {
+	.editor-plain-text {
 		/*
 		 * Unit required on zero value to work around IE bug.
 		 * https://github.com/philipwalton/flexbugs#flexbug-4
diff --git a/core-blocks/shortcode/index.js b/core-blocks/shortcode/index.js
index a0fe03a30ddf0..ada305a89db6b 100644
--- a/core-blocks/shortcode/index.js
+++ b/core-blocks/shortcode/index.js
@@ -4,7 +4,7 @@
 import { RawHTML } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { withInstanceId, Dashicon } from '@wordpress/components';
-import { PlainText } from '@wordpress/blocks';
+import { PlainText } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/shortcode/test/__snapshots__/index.js.snap b/core-blocks/shortcode/test/__snapshots__/index.js.snap
index f45b727243d03..5ef96b79116b0 100644
--- a/core-blocks/shortcode/test/__snapshots__/index.js.snap
+++ b/core-blocks/shortcode/test/__snapshots__/index.js.snap
@@ -24,7 +24,7 @@ exports[`core/shortcode block edit matches snapshot 1`] = `
     Shortcode
   </label>
   <textarea
-    class="blocks-plain-text input-control"
+    class="editor-plain-text input-control"
     id="blocks-shortcode-input-0"
     placeholder="Write shortcode here…"
     rows="1"
diff --git a/core-blocks/subhead/index.js b/core-blocks/subhead/index.js
index 12ca9a99d358c..3a3a64f25097b 100644
--- a/core-blocks/subhead/index.js
+++ b/core-blocks/subhead/index.js
@@ -2,10 +2,8 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import {
-	createBlock,
-	RichText,
-} from '@wordpress/blocks';
+import { createBlock } from '@wordpress/blocks';
+import { RichText } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/table/index.js b/core-blocks/table/index.js
index b8aa6429824f3..562be766e8963 100644
--- a/core-blocks/table/index.js
+++ b/core-blocks/table/index.js
@@ -7,12 +7,12 @@ import { __ } from '@wordpress/i18n';
  * WordPress dependencies
  */
 import { Fragment } from '@wordpress/element';
+import { getPhrasingContentSchema } from '@wordpress/blocks';
 import {
 	BlockControls,
 	BlockAlignmentToolbar,
 	RichText,
-	getPhrasingContentSchema,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/table/table-block.js b/core-blocks/table/table-block.js
index eb866e58f96dd..642db9fbccdbd 100644
--- a/core-blocks/table/table-block.js
+++ b/core-blocks/table/table-block.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
 import {
 	BlockControls,
 	RichText,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 function isTableSelected( editor ) {
 	return editor.dom.getParent(
diff --git a/core-blocks/table/test/__snapshots__/index.js.snap b/core-blocks/table/test/__snapshots__/index.js.snap
index 77337c6c8b1fb..8214a201bb281 100644
--- a/core-blocks/table/test/__snapshots__/index.js.snap
+++ b/core-blocks/table/test/__snapshots__/index.js.snap
@@ -2,7 +2,7 @@
 
 exports[`core/embed block edit matches snapshot 1`] = `
 <div
-  class="wp-block-table blocks-rich-text"
+  class="wp-block-table editor-rich-text"
 >
   <div>
     <div>
@@ -13,7 +13,7 @@ exports[`core/embed block edit matches snapshot 1`] = `
           aria-autocomplete="list"
           aria-expanded="false"
           aria-multiline="false"
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
           contenteditable="true"
         >
           <tbody>
diff --git a/core-blocks/test/full-content.js b/core-blocks/test/full-content.js
index ab0154941d923..4e9fa45cdf168 100644
--- a/core-blocks/test/full-content.js
+++ b/core-blocks/test/full-content.js
@@ -101,7 +101,7 @@ describe( 'full post content fixture', () => {
 		window._wpBlocks = require( './server-registered.json' );
 
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 		registerCoreBlocks();
 	} );
 
diff --git a/core-blocks/test/helpers/index.js b/core-blocks/test/helpers/index.js
index 6c46e31e213d5..a2d4042e5c47d 100644
--- a/core-blocks/test/helpers/index.js
+++ b/core-blocks/test/helpers/index.js
@@ -14,7 +14,7 @@ import {
 } from '@wordpress/blocks';
 
 // Hack to avoid the wrapping HoCs.
-import { BlockEdit } from '../../../blocks/block-edit';
+import { BlockEdit } from '../../../editor/components/block-edit';
 
 export const blockEditRender = ( name, settings ) => {
 	if ( ! getBlockType( name ) ) {
diff --git a/core-blocks/text-columns/editor.scss b/core-blocks/text-columns/editor.scss
index 440d2736412b4..b60228bb8fff3 100644
--- a/core-blocks/text-columns/editor.scss
+++ b/core-blocks/text-columns/editor.scss
@@ -1,5 +1,5 @@
 .wp-block-text-columns {
-	.blocks-rich-text__tinymce:focus {
+	.editor-rich-text__tinymce:focus {
 		outline: 1px solid $light-gray-500;
 	}
 }
diff --git a/core-blocks/text-columns/index.js b/core-blocks/text-columns/index.js
index 38dcfb5df5dec..77dc685a7f1c4 100644
--- a/core-blocks/text-columns/index.js
+++ b/core-blocks/text-columns/index.js
@@ -14,7 +14,7 @@ import {
 	BlockAlignmentToolbar,
 	InspectorControls,
 	RichText,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/text-columns/test/__snapshots__/index.js.snap b/core-blocks/text-columns/test/__snapshots__/index.js.snap
index c1572062af8c0..439500fc13b23 100644
--- a/core-blocks/text-columns/test/__snapshots__/index.js.snap
+++ b/core-blocks/text-columns/test/__snapshots__/index.js.snap
@@ -8,7 +8,7 @@ exports[`core/text-columns block edit matches snapshot 1`] = `
     class="wp-block-column"
   >
     <div
-      class="blocks-rich-text"
+      class="editor-rich-text"
     >
       <div>
         <div>
@@ -20,13 +20,13 @@ exports[`core/text-columns block edit matches snapshot 1`] = `
               aria-expanded="false"
               aria-label="New Column"
               aria-multiline="false"
-              class="blocks-rich-text__tinymce"
+              class="editor-rich-text__tinymce"
               contenteditable="true"
               data-is-placeholder-visible="true"
               role="textbox"
             />
             <p
-              class="blocks-rich-text__tinymce"
+              class="editor-rich-text__tinymce"
             >
               New Column
             </p>
@@ -39,7 +39,7 @@ exports[`core/text-columns block edit matches snapshot 1`] = `
     class="wp-block-column"
   >
     <div
-      class="blocks-rich-text"
+      class="editor-rich-text"
     >
       <div>
         <div>
@@ -51,13 +51,13 @@ exports[`core/text-columns block edit matches snapshot 1`] = `
               aria-expanded="false"
               aria-label="New Column"
               aria-multiline="false"
-              class="blocks-rich-text__tinymce"
+              class="editor-rich-text__tinymce"
               contenteditable="true"
               data-is-placeholder-visible="true"
               role="textbox"
             />
             <p
-              class="blocks-rich-text__tinymce"
+              class="editor-rich-text__tinymce"
             >
               New Column
             </p>
diff --git a/core-blocks/verse/index.js b/core-blocks/verse/index.js
index f520e72f12636..528e856e427cb 100644
--- a/core-blocks/verse/index.js
+++ b/core-blocks/verse/index.js
@@ -2,10 +2,8 @@
  * WordPress
  */
 import { __ } from '@wordpress/i18n';
-import {
-	createBlock,
-	RichText,
-} from '@wordpress/blocks';
+import { createBlock } from '@wordpress/blocks';
+import { RichText } from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/core-blocks/verse/test/__snapshots__/index.js.snap b/core-blocks/verse/test/__snapshots__/index.js.snap
index 7e514a4fb36fd..b33b596d591bc 100644
--- a/core-blocks/verse/test/__snapshots__/index.js.snap
+++ b/core-blocks/verse/test/__snapshots__/index.js.snap
@@ -2,7 +2,7 @@
 
 exports[`core/verse block edit matches snapshot 1`] = `
 <div
-  class="wp-block-verse blocks-rich-text"
+  class="wp-block-verse editor-rich-text"
 >
   <div>
     <div>
@@ -14,13 +14,13 @@ exports[`core/verse block edit matches snapshot 1`] = `
           aria-expanded="false"
           aria-label="Write…"
           aria-multiline="false"
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
           contenteditable="true"
           data-is-placeholder-visible="true"
           role="textbox"
         />
         <pre
-          class="blocks-rich-text__tinymce"
+          class="editor-rich-text__tinymce"
         >
           Write…
         </pre>
diff --git a/core-blocks/video/index.js b/core-blocks/video/index.js
index ce88df821c538..30d9da2770067 100644
--- a/core-blocks/video/index.js
+++ b/core-blocks/video/index.js
@@ -14,13 +14,13 @@ import {
 	Toolbar,
 } from '@wordpress/components';
 import { Component, Fragment } from '@wordpress/element';
+import { editorMediaUpload } from '@wordpress/blocks';
 import {
-	editorMediaUpload,
 	BlockAlignmentToolbar,
 	BlockControls,
 	MediaUpload,
 	RichText,
-} from '@wordpress/blocks';
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/docs/extensibility/autocomplete.md b/docs/extensibility/autocomplete.md
index 7d7c9d506ce7e..914c35af5c229 100644
--- a/docs/extensibility/autocomplete.md
+++ b/docs/extensibility/autocomplete.md
@@ -3,7 +3,7 @@ Autocomplete
 
 Gutenberg provides a `blocks.Autocomplete.completers` filter for extending and overriding the list of autocompleters used by blocks.
 
-The `Autocomplete` component found in `@wordpress/blocks` applies this filter. The `@wordpress/components` package provides the foundational `Autocomplete` component that does not apply such a filter, but blocks should generally use the component provided by `@wordpress/blocks`.
+The `Autocomplete` component found in `@wordpress/editor` applies this filter. The `@wordpress/components` package provides the foundational `Autocomplete` component that does not apply such a filter, but blocks should generally use the component provided by `@wordpress/editor`.
 
 ### Example
 
diff --git a/edit-post/assets/stylesheets/_admin-schemes.scss b/edit-post/assets/stylesheets/_admin-schemes.scss
index bd4d52a0cf43f..7c440d96d6da4 100644
--- a/edit-post/assets/stylesheets/_admin-schemes.scss
+++ b/edit-post/assets/stylesheets/_admin-schemes.scss
@@ -87,8 +87,8 @@ $scheme-sunrise__spot-color-2: #c8b03c;
 		}
 
 		// URL suggestions
-		.blocks-url-input__suggestion:focus,
-		.blocks-url-input__suggestion.is-selected {
+		.editor-url-input__suggestion:focus,
+		.editor-url-input__suggestion.is-selected {
 			background: darken( $spot-color, 15 );
 		}
 	}
diff --git a/edit-post/assets/stylesheets/_z-index.scss b/edit-post/assets/stylesheets/_z-index.scss
index dd99e2b0b8fc3..f19ab8b2e9531 100644
--- a/edit-post/assets/stylesheets/_z-index.scss
+++ b/edit-post/assets/stylesheets/_z-index.scss
@@ -11,7 +11,6 @@ $z-layers: (
 	'.freeform-toolbar': 10,
 	'.editor-warning': 1,
 	'.components-form-toggle__input': 1,
-	'.editor-format-list__menu': 1,
 	'.editor-inserter__tabs': 1,
 	'.editor-inserter__tab.is-active': 1,
 	'.components-panel__header': 1,
@@ -21,13 +20,13 @@ $z-layers: (
 	'.editor-block-switcher__menu': 5,
 	'.components-popover__close': 5,
 	'.editor-block-list__insertion-point': 5,
-	'.blocks-format-toolbar__link-modal': 81, // should appear above block controls
-	'.blocks-format-toolbar__link-container': 81, // link suggestions should also
+	'.editor-format-toolbar__link-modal': 81, // should appear above block controls
+	'.editor-format-toolbar__link-container': 81, // link suggestions should also
 	'.blocks-gallery-item__inline-menu': 20,
 	'.editor-block-settings-menu__popover': 21, // Below the header, but above the block toolbar
-	'.blocks-url-input__suggestions': 30,
+	'.editor-url-input__suggestions': 30,
 	'.edit-post-header': 30,
-	'.blocks-button__inline-link .blocks-url-input__suggestions': 6, // URL suggestions for button block above sibling inserter
+	'.blocks-button__inline-link .editor-url-input__suggestions': 6, // URL suggestions for button block above sibling inserter
 	'.wp-block-image__resize-handlers': 1, // Resize handlers above sibling inserter
 
 	// Should have lower index than anything else positioned inside the block containers
diff --git a/editor/README.md b/editor/README.md
index 78d89e24a60ab..8e271dcc80fc0 100644
--- a/editor/README.md
+++ b/editor/README.md
@@ -12,3 +12,114 @@ Such a crucial step is handled by the grammar parsing which takes the serialized
 The *visual editor* is thus a component that contains and renders the list of block nodes from the internal state into the page. This removes any trace of imperative handling when it comes to finding a block and manipulating a block. As a matter of fact, the visual editor or the text editor are just two different—equally valid—views of the same representation of state. The internal representation of the post content is updated as blocks are updated and it is serialized back to be saved in `post_content`.
 
 Individual blocks are handled by the `VisualBlock` component, which attaches event handlers and renders the `edit` function of a block definition to the document with the corresponding attributes and local state. The `edit` function is the markup shape of a component while in editing mode.
+
+## Components
+
+Because many blocks share the same complex behaviors, reusable components
+are made available to simplify implementations of your block's `edit` function.
+
+### `BlockControls`
+
+When returned by your block's `edit` implementation, renders a toolbar of icon
+buttons. This is useful for block-level modifications to be made available when
+a block is selected. For example, if your block supports alignment, you may
+want to display alignment options in the selected block's toolbar.
+
+Example:
+
+```js
+( function( editor, element ) {
+	var el = element.createElement,
+		BlockControls = editor.BlockControls,
+		AlignmentToolbar = editor.AlignmentToolbar;
+
+	function edit( props ) {
+		return [
+			// Controls: (only visible when block is selected)
+			el( BlockControls, { key: 'controls' },
+				el( AlignmentToolbar, {
+					value: props.align,
+					onChange: function( nextAlign ) {
+						props.setAttributes( { align: nextAlign } )
+					}
+				} )
+			),
+
+			// Block content: (with alignment as attribute)
+			el( 'p', { key: 'text', style: { textAlign: props.align } },
+				'Hello World!'
+			),
+		];
+	}
+} )(
+	window.wp.editor,
+	window.wp.element
+);
+```
+
+Note in this example that we render `AlignmentToolbar` as a child of the
+`BlockControls` element. This is another pre-configured component you can use
+to simplify block text alignment.
+
+Alternatively, you can create your own toolbar controls by passing an array of
+`controls` as a prop to the `BlockControls` component. Each control should be
+an object with the following properties:
+
+- `icon: string` - Slug of the Dashicon to be shown in the control's toolbar button
+- `title: string` - A human-readable localized text to be shown as the tooltip label of the control's button
+- `subscript: ?string` - Optional text to be shown adjacent the button icon as subscript (for example, heading levels)
+- `isActive: ?boolean` - Whether the control should be considered active / selected. Defaults to `false`.
+
+To create divisions between sets of controls within the same `BlockControls`
+element, passing `controls` instead as a nested array (array of arrays of
+objects). A divider will be shown between each set of controls.
+
+### `RichText`
+
+Render a rich
+[`contenteditable` input](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Editable_content),
+providing users the option to add emphasis to content or links to content. It
+behaves similarly to a
+[controlled component](https://facebook.github.io/react/docs/forms.html#controlled-components),
+except that `onChange` is triggered less frequently than would be expected from
+a traditional `input` field, usually when the user exits the field.
+
+The following properties (non-exhaustive list) are made available:
+
+- `value: string` - Markup value of the field. Only valid markup is
+  allowed, as determined by `inline` value and available controls.
+- `onChange: Function` - Callback handler when the value of the field changes,
+  passing the new value as its only argument.
+- `placeholder: string` - A text hint to be shown to the user when the field
+  value is empty, similar to the
+  [`input` and `textarea` attribute of the same name](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms/HTML5_updates#The_placeholder_attribute).
+- `multiline: String` - A tag name to use for the tag that should be inserted
+  when Enter is pressed.  For example: `li` in a list block, and `p` for a
+	block that can contain multiple paragraphs.  The default is that only inline
+	elements are allowed to be used in inserted into the text, effectively
+  disabling the behavior of the "Enter" key.
+
+Example:
+
+```js
+( function( editor, element ) {
+	var el = element.createElement,
+		RichText = editor.RichText;
+
+	function edit( props ) {
+		function onChange( value ) {
+			props.setAttributes( { text: value } );
+		}
+
+		return el( RichText, {
+			value: props.attributes.text,
+			onChange: onChange
+		} );
+	}
+
+	// blocks.registerBlockType( ..., { edit: edit, ... } );
+} )(
+	window.wp.editor,
+	window.wp.element
+);
+```
\ No newline at end of file
diff --git a/blocks/alignment-toolbar/index.js b/editor/components/alignment-toolbar/index.js
similarity index 100%
rename from blocks/alignment-toolbar/index.js
rename to editor/components/alignment-toolbar/index.js
diff --git a/blocks/alignment-toolbar/test/__snapshots__/index.js.snap b/editor/components/alignment-toolbar/test/__snapshots__/index.js.snap
similarity index 100%
rename from blocks/alignment-toolbar/test/__snapshots__/index.js.snap
rename to editor/components/alignment-toolbar/test/__snapshots__/index.js.snap
diff --git a/blocks/alignment-toolbar/test/index.js b/editor/components/alignment-toolbar/test/index.js
similarity index 100%
rename from blocks/alignment-toolbar/test/index.js
rename to editor/components/alignment-toolbar/test/index.js
diff --git a/blocks/autocomplete/README.md b/editor/components/autocomplete/README.md
similarity index 100%
rename from blocks/autocomplete/README.md
rename to editor/components/autocomplete/README.md
diff --git a/blocks/autocomplete/index.js b/editor/components/autocomplete/index.js
similarity index 99%
rename from blocks/autocomplete/index.js
rename to editor/components/autocomplete/index.js
index 6f60381874190..ea9f37ea63938 100644
--- a/blocks/autocomplete/index.js
+++ b/editor/components/autocomplete/index.js
@@ -78,6 +78,7 @@ export function withFilteredAutocompleters( Autocomplete ) {
 			let nextCompleters = completers;
 			const lastFilteredCompletersProp = nextCompleters;
 
+			// Todo: Rename filter
 			if ( hasFilter( 'blocks.Autocomplete.completers' ) ) {
 				nextCompleters = applyFilters(
 					'blocks.Autocomplete.completers',
diff --git a/blocks/autocomplete/test/index.js b/editor/components/autocomplete/test/index.js
similarity index 100%
rename from blocks/autocomplete/test/index.js
rename to editor/components/autocomplete/test/index.js
diff --git a/blocks/autocompleters/README.md b/editor/components/autocompleters/README.md
similarity index 100%
rename from blocks/autocompleters/README.md
rename to editor/components/autocompleters/README.md
diff --git a/blocks/autocompleters/block.js b/editor/components/autocompleters/block.js
similarity index 88%
rename from blocks/autocompleters/block.js
rename to editor/components/autocompleters/block.js
index 67bbd72f93057..33d37aab7903d 100644
--- a/blocks/autocompleters/block.js
+++ b/editor/components/autocompleters/block.js
@@ -3,11 +3,15 @@
  */
 import { sortBy, once } from 'lodash';
 
+/**
+ * WordPress dependencies
+ */
+import { createBlock, getBlockTypes } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
 import './style.scss';
-import { createBlock, getBlockTypes } from '../api';
 import BlockIcon from '../block-icon';
 
 /**
@@ -17,7 +21,7 @@ import BlockIcon from '../block-icon';
  */
 export default {
 	name: 'blocks',
-	className: 'blocks-autocompleters__block',
+	className: 'editor-autocompleters__block',
 	triggerPrefix: '/',
 	options: once( function options() {
 		return Promise.resolve(
diff --git a/blocks/autocompleters/index.js b/editor/components/autocompleters/index.js
similarity index 100%
rename from blocks/autocompleters/index.js
rename to editor/components/autocompleters/index.js
diff --git a/blocks/autocompleters/style.scss b/editor/components/autocompleters/style.scss
similarity index 70%
rename from blocks/autocompleters/style.scss
rename to editor/components/autocompleters/style.scss
index 422d4f00169c0..d145e3aae4e56 100644
--- a/blocks/autocompleters/style.scss
+++ b/editor/components/autocompleters/style.scss
@@ -1,9 +1,9 @@
-.blocks-autocompleters__block .dashicon {
+.editor-autocompleters__block .dashicon {
 	margin-right: 8px;
 }
 
-.blocks-autocompleters__user {
-	.blocks-autocompleters__user-avatar {
+.editor-autocompleters__user {
+	.editor-autocompleters__user-avatar {
 		margin-right: 8px;
 		flex-grow: 0;
 		flex-shrink: 0;
@@ -11,7 +11,7 @@
 		width: 24px; // avoid jarring resize by seting the size upfront
 		height: 24px;
 	}
-	.blocks-autocompleters__user-name {
+	.editor-autocompleters__user-name {
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		overflow: hidden;
@@ -19,7 +19,7 @@
 		flex-shrink: 0;
 		flex-grow: 1;
 	}
-	.blocks-autocompleters__user-slug {
+	.editor-autocompleters__user-slug {
 		margin-left: 8px;
 		color: $dark-gray-100;
 		white-space: nowrap;
@@ -29,7 +29,7 @@
 		flex-grow: 0;
 		flex-shrink: 0;
 	}
-	&:hover .blocks-autocompleters__user-slug {
+	&:hover .editor-autocompleters__user-slug {
 		color: $blue-medium-300;
 	}
-} 
+}
diff --git a/blocks/autocompleters/test/block.js b/editor/components/autocompleters/test/block.js
similarity index 97%
rename from blocks/autocompleters/test/block.js
rename to editor/components/autocompleters/test/block.js
index e8b2441a602cb..9453c066edfad 100644
--- a/blocks/autocompleters/test/block.js
+++ b/editor/components/autocompleters/test/block.js
@@ -3,10 +3,14 @@
  */
 import { noop } from 'lodash';
 
+/**
+ * WordPress dependencies
+ */
+import { registerBlockType, unregisterBlockType, getBlockTypes } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
-import { registerBlockType, unregisterBlockType, getBlockTypes } from '../../api';
 import { blockAutocompleter } from '../';
 
 describe( 'block', () => {
diff --git a/blocks/autocompleters/user.js b/editor/components/autocompleters/user.js
similarity index 72%
rename from blocks/autocompleters/user.js
rename to editor/components/autocompleters/user.js
index 0532472e82b51..36a89249b6b6e 100644
--- a/blocks/autocompleters/user.js
+++ b/editor/components/autocompleters/user.js
@@ -5,7 +5,7 @@
 */
 export default {
 	name: 'users',
-	className: 'blocks-autocompleters__user',
+	className: 'editor-autocompleters__user',
 	triggerPrefix: '@',
 	options( search ) {
 		let payload = '';
@@ -20,9 +20,9 @@ export default {
 	},
 	getOptionLabel( user ) {
 		return [
-			<img key="avatar" className="blocks-autocompleters__user-avatar" alt="" src={ user.avatar_urls[ 24 ] } />,
-			<span key="name" className="blocks-autocompleters__user-name">{ user.name }</span>,
-			<span key="slug" className="blocks-autocompleters__user-slug">{ user.slug }</span>,
+			<img key="avatar" className="editor-autocompleters__user-avatar" alt="" src={ user.avatar_urls[ 24 ] } />,
+			<span key="name" className="editor-autocompleters__user-name">{ user.name }</span>,
+			<span key="slug" className="editor-autocompleters__user-slug">{ user.slug }</span>,
 		];
 	},
 	allowNode() {
diff --git a/blocks/block-alignment-toolbar/index.js b/editor/components/block-alignment-toolbar/index.js
similarity index 93%
rename from blocks/block-alignment-toolbar/index.js
rename to editor/components/block-alignment-toolbar/index.js
index 53e27107e72fb..029504a7334c5 100644
--- a/blocks/block-alignment-toolbar/index.js
+++ b/editor/components/block-alignment-toolbar/index.js
@@ -3,11 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Toolbar } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { withEditorSettings } from '../editor-settings';
+import { withEditorSettings } from '@wordpress/blocks';
 
 const BLOCK_ALIGNMENTS_CONTROLS = {
 	left: {
diff --git a/blocks/block-alignment-toolbar/test/__snapshots__/index.js.snap b/editor/components/block-alignment-toolbar/test/__snapshots__/index.js.snap
similarity index 100%
rename from blocks/block-alignment-toolbar/test/__snapshots__/index.js.snap
rename to editor/components/block-alignment-toolbar/test/__snapshots__/index.js.snap
diff --git a/blocks/block-alignment-toolbar/test/index.js b/editor/components/block-alignment-toolbar/test/index.js
similarity index 100%
rename from blocks/block-alignment-toolbar/test/index.js
rename to editor/components/block-alignment-toolbar/test/index.js
diff --git a/blocks/block-controls/index.js b/editor/components/block-controls/index.js
similarity index 100%
rename from blocks/block-controls/index.js
rename to editor/components/block-controls/index.js
diff --git a/blocks/block-controls/test/__snapshots__/index.js.snap b/editor/components/block-controls/test/__snapshots__/index.js.snap
similarity index 100%
rename from blocks/block-controls/test/__snapshots__/index.js.snap
rename to editor/components/block-controls/test/__snapshots__/index.js.snap
diff --git a/blocks/block-controls/test/index.js b/editor/components/block-controls/test/index.js
similarity index 100%
rename from blocks/block-controls/test/index.js
rename to editor/components/block-controls/test/index.js
diff --git a/blocks/block-edit/context.js b/editor/components/block-edit/context.js
similarity index 100%
rename from blocks/block-edit/context.js
rename to editor/components/block-edit/context.js
diff --git a/blocks/block-edit/edit.js b/editor/components/block-edit/edit.js
similarity index 88%
rename from blocks/block-edit/edit.js
rename to editor/components/block-edit/edit.js
index 7a460c2c57510..9b20a0d286b88 100644
--- a/blocks/block-edit/edit.js
+++ b/editor/components/block-edit/edit.js
@@ -7,15 +7,7 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { withFilters } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import {
-	getBlockType,
-	getBlockDefaultClassName,
-	hasBlockSupport,
-} from '../api';
+import { getBlockDefaultClassName, hasBlockSupport, getBlockType } from '@wordpress/blocks';
 
 export const Edit = ( props ) => {
 	const { attributes = {}, name } = props;
diff --git a/blocks/block-edit/index.js b/editor/components/block-edit/index.js
similarity index 100%
rename from blocks/block-edit/index.js
rename to editor/components/block-edit/index.js
diff --git a/blocks/block-edit/test/edit.js b/editor/components/block-edit/test/edit.js
similarity index 96%
rename from blocks/block-edit/test/edit.js
rename to editor/components/block-edit/test/edit.js
index 572630ca0aae1..944831652e6b0 100644
--- a/blocks/block-edit/test/edit.js
+++ b/editor/components/block-edit/test/edit.js
@@ -5,14 +5,18 @@ import { shallow } from 'enzyme';
 import { noop } from 'lodash';
 
 /**
- * Internal dependencies
+ * WordPress dependencies
  */
-import { Edit } from '../edit';
 import {
 	registerBlockType,
 	unregisterBlockType,
 	getBlockTypes,
-} from '../../api';
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { Edit } from '../edit';
 
 describe( 'Edit', () => {
 	afterEach( () => {
diff --git a/blocks/block-format-controls/index.js b/editor/components/block-format-controls/index.js
similarity index 100%
rename from blocks/block-format-controls/index.js
rename to editor/components/block-format-controls/index.js
diff --git a/blocks/block-icon/index.js b/editor/components/block-icon/index.js
similarity index 100%
rename from blocks/block-icon/index.js
rename to editor/components/block-icon/index.js
diff --git a/blocks/block-icon/test/index.js b/editor/components/block-icon/test/index.js
similarity index 100%
rename from blocks/block-icon/test/index.js
rename to editor/components/block-icon/test/index.js
diff --git a/editor/components/block-inspector/index.js b/editor/components/block-inspector/index.js
index 928b980905d15..bf8786d9d7e22 100644
--- a/editor/components/block-inspector/index.js
+++ b/editor/components/block-inspector/index.js
@@ -7,12 +7,7 @@ import { isEmpty } from 'lodash';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import {
-	BlockIcon,
-	getBlockType,
-	InspectorControls,
-	InspectorAdvancedControls,
-} from '@wordpress/blocks';
+import { getBlockType } from '@wordpress/blocks';
 import { PanelBody } from '@wordpress/components';
 import { withSelect } from '@wordpress/data';
 
@@ -21,6 +16,9 @@ import { withSelect } from '@wordpress/data';
  */
 import './style.scss';
 import SkipToSelectedBlock from '../skip-to-selected-block';
+import BlockIcon from '../block-icon';
+import InspectorControls from '../inspector-controls';
+import InspectorAdvancedControls from '../inspector-advanced-controls';
 
 const BlockInspector = ( { selectedBlock, count } ) => {
 	if ( count > 1 ) {
diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
index 5c958a64c8e16..9be2486c75598 100644
--- a/editor/components/block-list/block.js
+++ b/editor/components/block-list/block.js
@@ -17,7 +17,6 @@ import {
 	placeCaretAtVerticalEdge,
 } from '@wordpress/utils';
 import {
-	BlockEdit,
 	createBlock,
 	cloneBlock,
 	getBlockType,
@@ -34,6 +33,7 @@ import { withViewportMatch } from '@wordpress/viewport';
 /**
  * Internal dependencies
  */
+import BlockEdit from '../block-edit';
 import BlockMover from '../block-mover';
 import BlockDropZone from '../block-drop-zone';
 import BlockSettingsMenu from '../block-settings-menu';
diff --git a/editor/components/block-preview/index.js b/editor/components/block-preview/index.js
index 6da252d95dbaa..104e885ce6744 100644
--- a/editor/components/block-preview/index.js
+++ b/editor/components/block-preview/index.js
@@ -8,11 +8,12 @@ import { noop } from 'lodash';
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
-import { createBlock, BlockEdit } from '@wordpress/blocks';
+import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
+import BlockEdit from '../block-edit';
 import { createInnerBlockList } from '../../utils/block-list';
 import './style.scss';
 
diff --git a/editor/components/block-switcher/index.js b/editor/components/block-switcher/index.js
index 0cd9392bf05c3..071e37307f0d7 100644
--- a/editor/components/block-switcher/index.js
+++ b/editor/components/block-switcher/index.js
@@ -3,7 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Dropdown, Dashicon, IconButton, Toolbar, NavigableMenu } from '@wordpress/components';
-import { getBlockType, getPossibleBlockTransformations, switchToBlockType, BlockIcon, withEditorSettings } from '@wordpress/blocks';
+import { getBlockType, getPossibleBlockTransformations, switchToBlockType, withEditorSettings } from '@wordpress/blocks';
 import { compose } from '@wordpress/element';
 import { keycodes } from '@wordpress/utils';
 import { withSelect, withDispatch } from '@wordpress/data';
@@ -12,6 +12,7 @@ import { withSelect, withDispatch } from '@wordpress/data';
  * Internal dependencies
  */
 import './style.scss';
+import BlockIcon from '../block-icon';
 
 /**
  * Module Constants
diff --git a/editor/components/block-toolbar/index.js b/editor/components/block-toolbar/index.js
index 75826e7cd5dc1..d6d4bb3035af8 100644
--- a/editor/components/block-toolbar/index.js
+++ b/editor/components/block-toolbar/index.js
@@ -1,7 +1,6 @@
 /**
  * WordPress Dependencies
  */
-import { BlockControls, BlockFormatControls } from '@wordpress/blocks';
 import { withSelect } from '@wordpress/data';
 
 /**
@@ -9,6 +8,8 @@ import { withSelect } from '@wordpress/data';
  */
 import './style.scss';
 import BlockSwitcher from '../block-switcher';
+import BlockControls from '../block-controls';
+import BlockFormatControls from '../block-format-controls';
 
 function BlockToolbar( { block, mode } ) {
 	if ( ! block || ! block.isValid || mode !== 'visual' ) {
diff --git a/blocks/color-palette/index.js b/editor/components/color-palette/index.js
similarity index 76%
rename from blocks/color-palette/index.js
rename to editor/components/color-palette/index.js
index 0192c93fe266d..1601ea4f08ec3 100644
--- a/blocks/color-palette/index.js
+++ b/editor/components/color-palette/index.js
@@ -6,6 +6,6 @@ import { ColorPalette } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import withColorContext from '../with-color-context';
+import withColorContext from './with-color-context';
 
 export default withColorContext( ColorPalette );
diff --git a/blocks/with-color-context/index.js b/editor/components/color-palette/with-color-context.js
similarity index 86%
rename from blocks/with-color-context/index.js
rename to editor/components/color-palette/with-color-context.js
index a867ab3c12cc8..154136be50e15 100644
--- a/blocks/with-color-context/index.js
+++ b/editor/components/color-palette/with-color-context.js
@@ -1,3 +1,4 @@
+
 /**
  * External dependencies
  */
@@ -8,17 +9,13 @@ import { isEmpty } from 'lodash';
  */
 import { deprecated } from '@wordpress/utils';
 import { createHigherOrderComponent } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { withEditorSettings } from '../editor-settings';
+import { withEditorSettings } from '@wordpress/blocks';
 
 export default createHigherOrderComponent(
 	withEditorSettings(
 		( settings, ownProps ) => {
 			if ( ownProps.colors || ownProps.disableCustomColors ) {
-				deprecated( 'Passing props "colors" or "disableCustomColors" to @blocks/PanelColor or @blocks/ColorPalette', {
+				deprecated( 'Passing props "colors" or "disableCustomColors" to @editor/PanelColor or @editor/ColorPalette', {
 					version: '2.9',
 					alternative: 'remove the props and rely on the editor settings or use @wordpress/PanelColor and @wordpress/ColorPalette',
 				} );
diff --git a/blocks/colors/index.js b/editor/components/colors/index.js
similarity index 100%
rename from blocks/colors/index.js
rename to editor/components/colors/index.js
diff --git a/blocks/colors/utils.js b/editor/components/colors/utils.js
similarity index 100%
rename from blocks/colors/utils.js
rename to editor/components/colors/utils.js
diff --git a/blocks/colors/with-colors.js b/editor/components/colors/with-colors.js
similarity index 95%
rename from blocks/colors/with-colors.js
rename to editor/components/colors/with-colors.js
index 906ed4d5d68cc..c522d9b01cf81 100644
--- a/blocks/colors/with-colors.js
+++ b/editor/components/colors/with-colors.js
@@ -7,12 +7,12 @@ import { get } from 'lodash';
  * WordPress dependencies
  */
 import { createHigherOrderComponent } from '@wordpress/element';
+import { withEditorSettings } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import { getColorValue, getColorClass, setColorValue } from './utils';
-import { withEditorSettings } from '../editor-settings';
 
 /**
  * Higher-order component, which handles color logic for class generation
diff --git a/blocks/contrast-checker/index.js b/editor/components/contrast-checker/index.js
similarity index 96%
rename from blocks/contrast-checker/index.js
rename to editor/components/contrast-checker/index.js
index db973045eb2ef..8f37b816f5601 100644
--- a/blocks/contrast-checker/index.js
+++ b/editor/components/contrast-checker/index.js
@@ -33,7 +33,7 @@ function ContrastChecker( { backgroundColor, textColor, isLargeText, fallbackBac
 		__( 'This color combination may be hard for people to read. Try using a darker background color and/or a brighter text color.' ) :
 		__( 'This color combination may be hard for people to read. Try using a brighter background color and/or a darker text color.' );
 	return (
-		<div className="blocks-contrast-checker">
+		<div className="editor-contrast-checker">
 			<Notice status="warning" isDismissible={ false }>
 				{ msg }
 			</Notice>
diff --git a/editor/components/contrast-checker/style.scss b/editor/components/contrast-checker/style.scss
new file mode 100644
index 0000000000000..7d2f3ddc1e029
--- /dev/null
+++ b/editor/components/contrast-checker/style.scss
@@ -0,0 +1,3 @@
+.editor-contrast-checker > .notice {
+	margin: 0;
+}
diff --git a/blocks/contrast-checker/test/__snapshots__/index.js.snap b/editor/components/contrast-checker/test/__snapshots__/index.js.snap
similarity index 94%
rename from blocks/contrast-checker/test/__snapshots__/index.js.snap
rename to editor/components/contrast-checker/test/__snapshots__/index.js.snap
index 0e158f162dffd..18e13975a560c 100644
--- a/blocks/contrast-checker/test/__snapshots__/index.js.snap
+++ b/editor/components/contrast-checker/test/__snapshots__/index.js.snap
@@ -9,7 +9,7 @@ exports[`ContrastChecker should render component when the colors do not meet AA
   textColor="#666"
 >
   <div
-    className="blocks-contrast-checker"
+    className="editor-contrast-checker"
   >
     <Notice
       isDismissible={false}
@@ -36,7 +36,7 @@ exports[`ContrastChecker should render different message matching snapshot when
   textColor="#666"
 >
   <div
-    className="blocks-contrast-checker"
+    className="editor-contrast-checker"
   >
     <Notice
       isDismissible={false}
@@ -60,7 +60,7 @@ exports[`ContrastChecker should render messages when the textColor is valid, but
   textColor="#000000"
 >
   <div
-    className="blocks-contrast-checker"
+    className="editor-contrast-checker"
   >
     <Notice
       isDismissible={false}
diff --git a/blocks/contrast-checker/test/index.js b/editor/components/contrast-checker/test/index.js
similarity index 100%
rename from blocks/contrast-checker/test/index.js
rename to editor/components/contrast-checker/test/index.js
diff --git a/blocks/image-placeholder/index.js b/editor/components/image-placeholder/index.js
similarity index 95%
rename from blocks/image-placeholder/index.js
rename to editor/components/image-placeholder/index.js
index 523aeeaeb65e3..e7b33dfb65e48 100644
--- a/blocks/image-placeholder/index.js
+++ b/editor/components/image-placeholder/index.js
@@ -8,13 +8,12 @@ import { map } from 'lodash';
  */
 import { DropZone, FormFileUpload, Placeholder, Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { editorMediaUpload, rawHandler } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import editorMediaUpload from '../editor-media-upload';
 import MediaUpload from '../media-upload';
-import { rawHandler } from '../api';
 
 /**
  *  ImagePlaceholder is a react component used by blocks containing user configurable images e.g: image and cover image.
diff --git a/editor/components/index.js b/editor/components/index.js
index 57bb528463ca8..4339dc2d2aa1b 100644
--- a/editor/components/index.js
+++ b/editor/components/index.js
@@ -1,3 +1,28 @@
+// Block Creation Component
+export { default as Autocomplete } from './autocomplete';
+export * from './autocompleters';
+export { default as AlignmentToolbar } from './alignment-toolbar';
+export { default as BlockAlignmentToolbar } from './block-alignment-toolbar';
+export { default as BlockControls } from './block-controls';
+export { default as BlockEdit } from './block-edit';
+export { default as BlockFormatControls } from './block-format-controls';
+export { default as BlockIcon } from './block-icon';
+export { default as ColorPalette } from './color-palette';
+export { default as withColorContext } from './color-palette/with-color-context';
+export * from './colors';
+export { default as ContrastChecker } from './contrast-checker';
+export { default as ImagePlaceholder } from './image-placeholder';
+export { default as InnerBlocks } from './inner-blocks';
+export { default as InspectorAdvancedControls } from './inspector-advanced-controls';
+export { default as InspectorControls } from './inspector-controls';
+export { default as PanelColor } from './panel-color';
+export { default as PlainText } from './plain-text';
+export { default as RichText } from './rich-text';
+export { default as RichTextProvider } from './rich-text/provider';
+export { default as MediaUpload } from './media-upload';
+export { default as UrlInput } from './url-input';
+export { default as UrlInputButton } from './url-input/button';
+
 // Post Related Components
 export { default as AutosaveMonitor } from './autosave-monitor';
 export { default as DocumentOutline } from './document-outline';
diff --git a/blocks/inner-blocks/README.md b/editor/components/inner-blocks/README.md
similarity index 100%
rename from blocks/inner-blocks/README.md
rename to editor/components/inner-blocks/README.md
diff --git a/blocks/inner-blocks/index.js b/editor/components/inner-blocks/index.js
similarity index 100%
rename from blocks/inner-blocks/index.js
rename to editor/components/inner-blocks/index.js
diff --git a/editor/components/inserter-with-shortcuts/index.js b/editor/components/inserter-with-shortcuts/index.js
index 2bbea70352c90..6827203ac0bc0 100644
--- a/editor/components/inserter-with-shortcuts/index.js
+++ b/editor/components/inserter-with-shortcuts/index.js
@@ -6,7 +6,7 @@ import { filter, isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { BlockIcon, createBlock, getDefaultBlockName, withEditorSettings } from '@wordpress/blocks';
+import { createBlock, getDefaultBlockName, withEditorSettings } from '@wordpress/blocks';
 import { compose } from '@wordpress/element';
 import { IconButton } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
@@ -15,6 +15,7 @@ import { withDispatch, withSelect } from '@wordpress/data';
 /**
  * Internal dependencies
  */
+import BlockIcon from '../block-icon';
 import './style.scss';
 
 function InserterWithShortcuts( { items, isLocked, onInsert } ) {
diff --git a/editor/components/inserter/group.js b/editor/components/inserter/group.js
index cdbe9a9c2f684..d36db856441d4 100644
--- a/editor/components/inserter/group.js
+++ b/editor/components/inserter/group.js
@@ -8,7 +8,11 @@ import { isEqual } from 'lodash';
  */
 import { Component } from '@wordpress/element';
 import { NavigableMenu } from '@wordpress/components';
-import { BlockIcon } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import BlockIcon from '../block-icon';
 
 function deriveActiveItems( items ) {
 	return items.filter( ( item ) => ! item.isDisabled );
diff --git a/blocks/inspector-advanced-controls/index.js b/editor/components/inspector-advanced-controls/index.js
similarity index 100%
rename from blocks/inspector-advanced-controls/index.js
rename to editor/components/inspector-advanced-controls/index.js
diff --git a/blocks/inspector-controls/index.js b/editor/components/inspector-controls/index.js
similarity index 100%
rename from blocks/inspector-controls/index.js
rename to editor/components/inspector-controls/index.js
diff --git a/blocks/media-upload/README.md b/editor/components/media-upload/README.md
similarity index 97%
rename from blocks/media-upload/README.md
rename to editor/components/media-upload/README.md
index 7aae4792a8dfe..ce9a748535446 100644
--- a/blocks/media-upload/README.md
+++ b/editor/components/media-upload/README.md
@@ -27,7 +27,7 @@ You can check how this component is implemented for the edit post page using `wp
 
 ```jsx
 import { Button } from '@wordpress/components';
-import { MediaUpload } from '@wordpress/blocks';
+import { MediaUpload } from '@wordpress/editor';
 
 function MyMediaUploader() {
 	return (
diff --git a/blocks/media-upload/index.js b/editor/components/media-upload/index.js
similarity index 95%
rename from blocks/media-upload/index.js
rename to editor/components/media-upload/index.js
index 1a6e1e46657c9..9485a0c856618 100644
--- a/blocks/media-upload/index.js
+++ b/editor/components/media-upload/index.js
@@ -12,4 +12,5 @@ import { withFilters } from '@wordpress/components';
  */
 const MediaUpload = () => null;
 
+// Todo: rename the filter
 export default withFilters( 'blocks.MediaUpload' )( MediaUpload );
diff --git a/blocks/panel-color/index.js b/editor/components/panel-color/index.js
similarity index 92%
rename from blocks/panel-color/index.js
rename to editor/components/panel-color/index.js
index c873c51c2d575..316cd7826ef5c 100644
--- a/blocks/panel-color/index.js
+++ b/editor/components/panel-color/index.js
@@ -13,7 +13,7 @@ import { compose } from '@wordpress/element';
  * Internal dependencies
  */
 import ColorPalette from '../color-palette';
-import withColorContext from '../with-color-context';
+import withColorContext from '../color-palette/with-color-context';
 import { getColorName } from '../colors';
 
 function PanelColor( { colors, title, colorValue, initialOpen, ...props } ) {
diff --git a/blocks/plain-text/README.md b/editor/components/plain-text/README.md
similarity index 100%
rename from blocks/plain-text/README.md
rename to editor/components/plain-text/README.md
diff --git a/blocks/plain-text/index.js b/editor/components/plain-text/index.js
similarity index 86%
rename from blocks/plain-text/index.js
rename to editor/components/plain-text/index.js
index e7b665e0ff4e6..13da032771715 100644
--- a/blocks/plain-text/index.js
+++ b/editor/components/plain-text/index.js
@@ -12,7 +12,7 @@ import './style.scss';
 function PlainText( { onChange, className, ...props } ) {
 	return (
 		<TextareaAutosize
-			className={ classnames( 'blocks-plain-text', className ) }
+			className={ classnames( 'editor-plain-text', className ) }
 			onChange={ ( event ) => onChange( event.target.value ) }
 			{ ...props }
 		/>
diff --git a/blocks/plain-text/index.native.js b/editor/components/plain-text/index.native.js
similarity index 100%
rename from blocks/plain-text/index.native.js
rename to editor/components/plain-text/index.native.js
diff --git a/blocks/plain-text/style.native.scss b/editor/components/plain-text/style.native.scss
similarity index 100%
rename from blocks/plain-text/style.native.scss
rename to editor/components/plain-text/style.native.scss
diff --git a/blocks/plain-text/style.scss b/editor/components/plain-text/style.scss
similarity index 83%
rename from blocks/plain-text/style.scss
rename to editor/components/plain-text/style.scss
index 32187f45b9faf..ef8e884b6e844 100644
--- a/blocks/plain-text/style.scss
+++ b/editor/components/plain-text/style.scss
@@ -1,4 +1,4 @@
-.gutenberg .blocks-plain-text {
+.gutenberg .editor-plain-text {
 	box-shadow: none;
 	font-family: inherit;
 	font-size: inherit;
diff --git a/editor/components/post-featured-image/index.js b/editor/components/post-featured-image/index.js
index b078b84f07a85..d24c4385bf26d 100644
--- a/editor/components/post-featured-image/index.js
+++ b/editor/components/post-featured-image/index.js
@@ -8,7 +8,6 @@ import { get } from 'lodash';
  */
 import { __ } from '@wordpress/i18n';
 import { Button, Spinner, ResponsiveWrapper } from '@wordpress/components';
-import { MediaUpload } from '@wordpress/blocks';
 import { compose } from '@wordpress/element';
 import { withSelect, withDispatch } from '@wordpress/data';
 
@@ -17,6 +16,7 @@ import { withSelect, withDispatch } from '@wordpress/data';
  */
 import './style.scss';
 import PostFeaturedImageCheck from './check';
+import MediaUpload from '../media-upload';
 
 // Used when labels from post type were not yet loaded or when they are not present.
 const DEFAULT_SET_FEATURE_IMAGE_LABEL = __( 'Set featured image' );
diff --git a/editor/components/provider/index.js b/editor/components/provider/index.js
index 37dd459c721a3..512b18cac625d 100644
--- a/editor/components/provider/index.js
+++ b/editor/components/provider/index.js
@@ -7,7 +7,7 @@ import { flow, pick } from 'lodash';
  * WordPress Dependencies
  */
 import { createElement, Component } from '@wordpress/element';
-import { RichTextProvider, EditorSettings } from '@wordpress/blocks';
+import { EditorSettings } from '@wordpress/blocks';
 import {
 	APIProvider,
 	DropZoneProvider,
@@ -15,6 +15,11 @@ import {
 } from '@wordpress/components';
 import { withDispatch } from '@wordpress/data';
 
+/**
+ * Internal dependencies
+ */
+import RichTextProvider from '../rich-text/provider';
+
 class EditorProvider extends Component {
 	constructor( props ) {
 		super( ...arguments );
diff --git a/blocks/rich-text/README.md b/editor/components/rich-text/README.md
similarity index 100%
rename from blocks/rich-text/README.md
rename to editor/components/rich-text/README.md
diff --git a/blocks/rich-text/aria.js b/editor/components/rich-text/aria.js
similarity index 100%
rename from blocks/rich-text/aria.js
rename to editor/components/rich-text/aria.js
diff --git a/blocks/rich-text/constants.js b/editor/components/rich-text/constants.js
similarity index 100%
rename from blocks/rich-text/constants.js
rename to editor/components/rich-text/constants.js
diff --git a/blocks/rich-text/format-toolbar/index.js b/editor/components/rich-text/format-toolbar/index.js
similarity index 92%
rename from blocks/rich-text/format-toolbar/index.js
rename to editor/components/rich-text/format-toolbar/index.js
index a987d203606f4..925ba0efa8894 100644
--- a/blocks/rich-text/format-toolbar/index.js
+++ b/editor/components/rich-text/format-toolbar/index.js
@@ -18,7 +18,7 @@ import { prependHTTP } from '@wordpress/url';
  */
 import './style.scss';
 import UrlInput from '../../url-input';
-import { filterURLForDisplay } from '../../../editor/utils/url';
+import { filterURLForDisplay } from '../../../utils/url';
 
 const { ESCAPE, LEFT, RIGHT, UP, DOWN, BACKSPACE, ENTER, displayShortcut } = keycodes;
 
@@ -188,7 +188,7 @@ class FormatToolbar extends Component {
 			} );
 
 		const linkSettings = settingsVisible && (
-			<div className="blocks-format-toolbar__link-modal-line blocks-format-toolbar__link-settings">
+			<div className="editor-format-toolbar__link-modal-line editor-format-toolbar__link-settings">
 				<ToggleControl
 					label={ __( 'Open in new window' ) }
 					checked={ opensInNewWindow }
@@ -197,25 +197,25 @@ class FormatToolbar extends Component {
 		);
 
 		return (
-			<div className="blocks-format-toolbar">
+			<div className="editor-format-toolbar">
 				<Toolbar controls={ toolbarControls } />
 
 				{ ( isAddingLink || isEditingLink || formats.link ) && (
 					<Fill name="RichText.Siblings">
-						<div className="blocks-format-toolbar__link-container" style={ { ...focusPosition } }>
+						<div className="editor-format-toolbar__link-container" style={ { ...focusPosition } }>
 							{ ( isAddingLink || isEditingLink ) && (
 								// Disable reason: KeyPress must be suppressed so the block doesn't hide the toolbar
 								/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
 								<form
-									className="blocks-format-toolbar__link-modal"
+									className="editor-format-toolbar__link-modal"
 									onKeyPress={ stopKeyPropagation }
 									onKeyDown={ this.onKeyDown }
 									onSubmit={ this.submitLink }>
-									<div className="blocks-format-toolbar__link-modal-line">
+									<div className="editor-format-toolbar__link-modal-line">
 										<UrlInput value={ newLinkValue } onChange={ this.onChangeLinkValue } />
 										<IconButton icon="editor-break" label={ __( 'Apply' ) } type="submit" />
 										<IconButton
-											className="blocks-format-toolbar__link-settings-toggle"
+											className="editor-format-toolbar__link-settings-toggle"
 											icon="ellipsis"
 											label={ __( 'Link Settings' ) }
 											onClick={ this.toggleLinkSettingsVisibility }
@@ -231,12 +231,12 @@ class FormatToolbar extends Component {
 								// Disable reason: KeyPress must be suppressed so the block doesn't hide the toolbar
 								/* eslint-disable jsx-a11y/no-static-element-interactions */
 								<div
-									className="blocks-format-toolbar__link-modal"
+									className="editor-format-toolbar__link-modal"
 									onKeyPress={ stopKeyPropagation }
 								>
-									<div className="blocks-format-toolbar__link-modal-line">
+									<div className="editor-format-toolbar__link-modal-line">
 										<a
-											className="blocks-format-toolbar__link-value"
+											className="editor-format-toolbar__link-value"
 											href={ formats.link.value }
 											target="_blank"
 										>
@@ -244,7 +244,7 @@ class FormatToolbar extends Component {
 										</a>
 										<IconButton icon="edit" label={ __( 'Edit' ) } onClick={ this.editLink } />
 										<IconButton
-											className="blocks-format-toolbar__link-settings-toggle"
+											className="editor-format-toolbar__link-settings-toggle"
 											icon="ellipsis"
 											label={ __( 'Link Settings' ) }
 											onClick={ this.toggleLinkSettingsVisibility }
diff --git a/blocks/rich-text/format-toolbar/style.scss b/editor/components/rich-text/format-toolbar/style.scss
similarity index 72%
rename from blocks/rich-text/format-toolbar/style.scss
rename to editor/components/rich-text/format-toolbar/style.scss
index 4ac059e2e2805..13f20e839f222 100644
--- a/blocks/rich-text/format-toolbar/style.scss
+++ b/editor/components/rich-text/format-toolbar/style.scss
@@ -1,8 +1,8 @@
-.blocks-format-toolbar {
+.editor-format-toolbar {
 	display: inline-flex;
 }
 
-.blocks-format-toolbar__link-modal {
+.editor-format-toolbar__link-modal {
 	position: relative;
 	box-shadow: $shadow-popover;
 	border: 1px solid $light-gray-500;
@@ -12,7 +12,7 @@
 	font-family: $default-font;
 	font-size: $default-font-size;
 	line-height: $default-line-height;
-	z-index: z-index( '.blocks-format-toolbar__link-modal' );
+	z-index: z-index( '.editor-format-toolbar__link-modal' );
 
 	.edit-post-header-toolbar__block-toolbar & {
 		position: absolute;
@@ -21,13 +21,13 @@
 	}
 }
 
-.blocks-format-toolbar__link-container {
+.editor-format-toolbar__link-container {
 	position: absolute;
 	transform: translateX( -50% );
-	z-index: z-index( '.blocks-format-toolbar__link-container' );
+	z-index: z-index( '.editor-format-toolbar__link-container' );
 }
 
-.blocks-format-toolbar__link-modal-line {
+.editor-format-toolbar__link-modal-line {
 	display: flex;
 	flex-direction: row;
 	flex-grow: 1;
@@ -42,11 +42,11 @@
 	}
 }
 
-.blocks-format-toolbar__link-settings-toggle .dashicon {
+.editor-format-toolbar__link-settings-toggle .dashicon {
 	transform: rotate(90deg);
 }
 
-.blocks-format-toolbar__link-value {
+.editor-format-toolbar__link-value {
 	margin: $item-spacing - 1px; // subtract border
 	flex-grow: 1;
 	flex-shrink: 1;
@@ -58,7 +58,7 @@
 	max-width: 500px;
 }
 
-.blocks-format-toolbar__link-settings {
+.editor-format-toolbar__link-settings {
 	padding: 7px 8px;
 	border-top: 1px solid $light-gray-500;
 	padding-top: 8px; // add 1px for the border
diff --git a/blocks/rich-text/format.js b/editor/components/rich-text/format.js
similarity index 100%
rename from blocks/rich-text/format.js
rename to editor/components/rich-text/format.js
diff --git a/blocks/rich-text/index.js b/editor/components/rich-text/index.js
similarity index 99%
rename from blocks/rich-text/index.js
rename to editor/components/rich-text/index.js
index 69fb0d1044385..200c34eacd354 100644
--- a/blocks/rich-text/index.js
+++ b/editor/components/rich-text/index.js
@@ -29,12 +29,12 @@ import {
 } from '@wordpress/utils';
 import { withInstanceId, withSafeTimeout, Slot } from '@wordpress/components';
 import { withSelect } from '@wordpress/data';
+import { rawHandler } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
-import { rawHandler } from '../api';
 import Autocomplete from '../autocomplete';
 import BlockFormatControls from '../block-format-controls';
 import FormatToolbar from './format-toolbar';
@@ -843,7 +843,7 @@ export class RichText extends Component {
 		// mount and initialize a new child element in its place.
 		const key = [ 'editor', Tagname ].join();
 		const isPlaceholderVisible = placeholder && ( ! isSelected || keepPlaceholderOnFocus ) && this.isEmpty();
-		const classes = classnames( wrapperClassName, 'blocks-rich-text' );
+		const classes = classnames( wrapperClassName, 'editor-rich-text' );
 
 		const formatToolbar = (
 			<FormatToolbar
@@ -893,7 +893,7 @@ export class RichText extends Component {
 							/>
 							{ isPlaceholderVisible &&
 								<Tagname
-									className={ classnames( 'blocks-rich-text__tinymce', className ) }
+									className={ classnames( 'editor-rich-text__tinymce', className ) }
 									style={ style }
 								>
 									{ MultilineTag ? <MultilineTag>{ placeholder }</MultilineTag> : placeholder }
diff --git a/blocks/rich-text/patterns.js b/editor/components/rich-text/patterns.js
similarity index 98%
rename from blocks/rich-text/patterns.js
rename to editor/components/rich-text/patterns.js
index 5277e3531d876..e7e4ae0d4addc 100644
--- a/blocks/rich-text/patterns.js
+++ b/editor/components/rich-text/patterns.js
@@ -8,11 +8,11 @@ import { filter, escapeRegExp, groupBy, drop } from 'lodash';
  * WordPress dependencies
  */
 import { keycodes } from '@wordpress/utils';
+import { getBlockTransforms, findTransform } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import { getBlockTransforms, findTransform } from '../api/factory';
 
 const { ESCAPE, ENTER, SPACE, BACKSPACE } = keycodes;
 
diff --git a/blocks/rich-text/provider.js b/editor/components/rich-text/provider.js
similarity index 100%
rename from blocks/rich-text/provider.js
rename to editor/components/rich-text/provider.js
diff --git a/blocks/rich-text/style.scss b/editor/components/rich-text/style.scss
similarity index 94%
rename from blocks/rich-text/style.scss
rename to editor/components/rich-text/style.scss
index fbde5aa8c143a..0e749d976865c 100644
--- a/blocks/rich-text/style.scss
+++ b/editor/components/rich-text/style.scss
@@ -1,9 +1,10 @@
-.blocks-rich-text {
+
+.editor-rich-text {
 	// This is needed to position the formatting toolbar.
 	position: relative;
 }
 
-.blocks-rich-text__tinymce {
+.editor-rich-text__tinymce {
 	margin: 0;
 	position: relative;
 
@@ -71,7 +72,7 @@
 		}
 	}
 
-	& + .blocks-rich-text__tinymce {
+	& + .editor-rich-text__tinymce {
 		opacity: 0.5;
 		pointer-events: none;
 	}
diff --git a/blocks/rich-text/test/__snapshots__/format.js.snap b/editor/components/rich-text/test/__snapshots__/format.js.snap
similarity index 100%
rename from blocks/rich-text/test/__snapshots__/format.js.snap
rename to editor/components/rich-text/test/__snapshots__/format.js.snap
diff --git a/blocks/rich-text/test/format.js b/editor/components/rich-text/test/format.js
similarity index 100%
rename from blocks/rich-text/test/format.js
rename to editor/components/rich-text/test/format.js
diff --git a/blocks/rich-text/test/index.js b/editor/components/rich-text/test/index.js
similarity index 100%
rename from blocks/rich-text/test/index.js
rename to editor/components/rich-text/test/index.js
diff --git a/blocks/rich-text/tinymce.js b/editor/components/rich-text/tinymce.js
similarity index 97%
rename from blocks/rich-text/tinymce.js
rename to editor/components/rich-text/tinymce.js
index 986040ea8006e..c88044cf12e4c 100644
--- a/blocks/rich-text/tinymce.js
+++ b/editor/components/rich-text/tinymce.js
@@ -46,7 +46,7 @@ export default class TinyMCE extends Component {
 		}
 
 		if ( ! isEqual( this.props.className, nextProps.className ) ) {
-			this.editorNode.className = classnames( nextProps.className, 'blocks-rich-text__tinymce' );
+			this.editorNode.className = classnames( nextProps.className, 'editor-rich-text__tinymce' );
 		}
 
 		const { removedKeys, updatedKeys } = diffAriaProps( this.props, nextProps );
@@ -109,7 +109,7 @@ export default class TinyMCE extends Component {
 
 		return createElement( tagName, {
 			...ariaProps,
-			className: classnames( className, 'blocks-rich-text__tinymce' ),
+			className: classnames( className, 'editor-rich-text__tinymce' ),
 			contentEditable: true,
 			[ IS_PLACEHOLDER_VISIBLE_ATTR_NAME ]: isPlaceholderVisible,
 			ref: ( node ) => this.editorNode = node,
diff --git a/blocks/url-input/button.js b/editor/components/url-input/button.js
similarity index 88%
rename from blocks/url-input/button.js
rename to editor/components/url-input/button.js
index cad6ee2ed8a74..0ebd3b835f867 100644
--- a/blocks/url-input/button.js
+++ b/editor/components/url-input/button.js
@@ -41,7 +41,7 @@ class UrlInputButton extends Component {
 		const buttonLabel = url ? __( 'Edit Link' ) : __( 'Insert Link' );
 
 		return (
-			<div className="blocks-url-input__button">
+			<div className="editor-url-input__button">
 				<IconButton
 					icon="admin-links"
 					label={ buttonLabel }
@@ -52,11 +52,11 @@ class UrlInputButton extends Component {
 				/>
 				{ expanded &&
 					<form
-						className="blocks-format-toolbar__link-modal"
+						className="editor-format-toolbar__link-modal"
 						onSubmit={ this.submitLink }>
-						<div className="blocks-format-toolbar__link-modal-line">
+						<div className="editor-format-toolbar__link-modal-line">
 							<IconButton
-								className="blocks-url-input__back"
+								className="editor-url-input__back"
 								icon="arrow-left-alt"
 								label={ __( 'Close' ) }
 								onClick={ this.toggle }
diff --git a/blocks/url-input/index.js b/editor/components/url-input/index.js
similarity index 92%
rename from blocks/url-input/index.js
rename to editor/components/url-input/index.js
index ce6a6fd597c91..294076f7990bc 100644
--- a/blocks/url-input/index.js
+++ b/editor/components/url-input/index.js
@@ -183,7 +183,7 @@ class UrlInput extends Component {
 		const { showSuggestions, posts, selectedSuggestion, loading } = this.state;
 		/* eslint-disable jsx-a11y/no-autofocus */
 		return (
-			<div className="blocks-url-input">
+			<div className="editor-url-input">
 				<input
 					autoFocus
 					type="text"
@@ -197,17 +197,17 @@ class UrlInput extends Component {
 					role="combobox"
 					aria-expanded={ showSuggestions }
 					aria-autocomplete="list"
-					aria-owns={ `blocks-url-input-suggestions-${ instanceId }` }
-					aria-activedescendant={ selectedSuggestion !== null ? `blocks-url-input-suggestion-${ instanceId }-${ selectedSuggestion }` : undefined }
+					aria-owns={ `editor-url-input-suggestions-${ instanceId }` }
+					aria-activedescendant={ selectedSuggestion !== null ? `editor-url-input-suggestion-${ instanceId }-${ selectedSuggestion }` : undefined }
 				/>
 
 				{ ( loading ) && <Spinner /> }
 
 				{ showSuggestions && !! posts.length &&
 					<div
-						id={ `blocks-url-input-suggestions-${ instanceId }` }
+						id={ `editor-url-input-suggestions-${ instanceId }` }
 						tabIndex="-1"
-						className="blocks-url-input__suggestions"
+						className="editor-url-input__suggestions"
 						ref={ this.bindListNode }
 						role="listbox"
 					>
@@ -216,9 +216,9 @@ class UrlInput extends Component {
 								key={ post.id }
 								role="option"
 								tabIndex="-1"
-								id={ `blocks-url-input-suggestion-${ instanceId }-${ index }` }
+								id={ `editor-url-input-suggestion-${ instanceId }-${ index }` }
 								ref={ this.bindSuggestionNode( index ) }
-								className={ classnames( 'blocks-url-input__suggestion', {
+								className={ classnames( 'editor-url-input__suggestion', {
 									'is-selected': index === selectedSuggestion,
 								} ) }
 								onClick={ () => this.selectLink( post.link ) }
diff --git a/blocks/url-input/style.scss b/editor/components/url-input/style.scss
similarity index 81%
rename from blocks/url-input/style.scss
rename to editor/components/url-input/style.scss
index 50b60bc9d3267..4f82c594047ad 100644
--- a/blocks/url-input/style.scss
+++ b/editor/components/url-input/style.scss
@@ -2,8 +2,8 @@
 $input-padding: 10px;
 $input-size: 230px;
 
-.editor-block-list__block .blocks-url-input,
-.editor-block-toolbar .blocks-url-input {
+.editor-block-list__block .editor-url-input,
+.editor-block-toolbar .editor-url-input {
 	width: 100%;
 	flex-grow: 1;
 	position: relative;
@@ -29,7 +29,7 @@ $input-size: 230px;
 }
 
 // Suggestions
-.blocks-url-input__suggestions {
+.editor-url-input__suggestions {
 	position: absolute;
 	background: $white;
 	box-shadow: $shadow-popover;
@@ -44,15 +44,15 @@ $input-size: 230px;
 }
 
 // Hide suggestions on mobile until we @todo find a better way to show them
-.blocks-url-input__suggestions,
-.blocks-url-input .spinner {
+.editor-url-input__suggestions,
+.editor-url-input .spinner {
 	display: none;
 	@include break-small() {
 		display: inherit;
 	}
 }
 
-.blocks-url-input__suggestion {
+.editor-url-input__suggestion {
 	padding: 4px #{ $icon-button-size + $input-padding } 4px $input-padding;
 	color: $dark-gray-300; // lightest we can use for contrast
 	display: block;
@@ -77,11 +77,11 @@ $input-size: 230px;
 }
 
 // Toolbar button
-.components-toolbar > .blocks-url-input__button {
+.components-toolbar > .editor-url-input__button {
 	position: inherit;	// let the dialog position according to parent
 }
 
-.blocks-url-input__button .blocks-url-input__back {
+.editor-url-input__button .editor-url-input__back {
 	margin-right: 4px;
 	overflow: visible;
 
@@ -96,7 +96,7 @@ $input-size: 230px;
 	}
 }
 
-.blocks-url-input__button .blocks-url-input__suggestions {
+.editor-url-input__button .editor-url-input__suggestions {
 	left: -40px;
 	right: -32px;
 }
diff --git a/blocks/url-input/test/button.js b/editor/components/url-input/test/button.js
similarity index 95%
rename from blocks/url-input/test/button.js
rename to editor/components/url-input/test/button.js
index 09c3898634a7f..19bfc72c36b9c 100644
--- a/blocks/url-input/test/button.js
+++ b/editor/components/url-input/test/button.js
@@ -13,7 +13,7 @@ describe( 'UrlInputButton', () => {
 
 	it( 'should have a valid class name in the wrapper tag', () => {
 		const wrapper = shallow( <UrlInputButton /> );
-		expect( wrapper.hasClass( 'blocks-url-input__button' ) ).toBe( true );
+		expect( wrapper.hasClass( 'editor-url-input__button' ) ).toBe( true );
 	} );
 	it( 'should not have is-active class when url prop not defined', () => {
 		const wrapper = shallow( <UrlInputButton /> );
@@ -53,7 +53,7 @@ describe( 'UrlInputButton', () => {
 		const wrapper = shallow( <UrlInputButton /> );
 		clickEditLink( wrapper );
 		expect( wrapper.state().expanded ).toBe( true );
-		wrapper.find( '.blocks-url-input__back' ).simulate( 'click' );
+		wrapper.find( '.editor-url-input__back' ).simulate( 'click' );
 		expect( wrapper.state().expanded ).toBe( false );
 	} );
 	it( 'should close the form when user submits it', () => {
diff --git a/blocks/hooks/align.js b/editor/hooks/align.js
similarity index 95%
rename from blocks/hooks/align.js
rename to editor/hooks/align.js
index b724a6ef4f45d..4341d5a9299ea 100644
--- a/blocks/hooks/align.js
+++ b/editor/hooks/align.js
@@ -9,13 +9,12 @@ import { assign, includes } from 'lodash';
  */
 import { createHigherOrderComponent } from '@wordpress/element';
 import { addFilter } from '@wordpress/hooks';
-import BlockControls from '../block-controls';
-import BlockAlignmentToolbar from '../block-alignment-toolbar';
+import { hasBlockSupport, getBlockSupport } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import { getBlockSupport, hasBlockSupport } from '../api';
+import { BlockControls, BlockAlignmentToolbar } from '../components';
 
 /**
  * Filters registered block settings, extending attributes to include `align`.
diff --git a/blocks/hooks/anchor.js b/editor/hooks/anchor.js
similarity index 96%
rename from blocks/hooks/anchor.js
rename to editor/hooks/anchor.js
index a61b194f144a6..2eb54e44aeb9d 100644
--- a/blocks/hooks/anchor.js
+++ b/editor/hooks/anchor.js
@@ -10,12 +10,12 @@ import { createHigherOrderComponent, Fragment } from '@wordpress/element';
 import { addFilter } from '@wordpress/hooks';
 import { TextControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { hasBlockSupport } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import { hasBlockSupport } from '../api';
-import InspectorAdvancedControls from '../inspector-advanced-controls';
+import { InspectorAdvancedControls } from '../components';
 
 /**
  * Regular expression matching invalid anchor characters for replacement.
diff --git a/blocks/hooks/custom-class-name.js b/editor/hooks/custom-class-name.js
similarity index 96%
rename from blocks/hooks/custom-class-name.js
rename to editor/hooks/custom-class-name.js
index bd58312857fcb..86bf4e45a3918 100644
--- a/blocks/hooks/custom-class-name.js
+++ b/editor/hooks/custom-class-name.js
@@ -11,12 +11,12 @@ import { createHigherOrderComponent, Fragment } from '@wordpress/element';
 import { addFilter } from '@wordpress/hooks';
 import { TextControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { hasBlockSupport } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import { hasBlockSupport } from '../api';
-import InspectorAdvancedControls from '../inspector-advanced-controls';
+import { InspectorAdvancedControls } from '../components';
 
 /**
  * Filters registered block settings, extending attributes with anchor using ID
diff --git a/blocks/hooks/default-autocompleters.js b/editor/hooks/default-autocompleters.js
similarity index 84%
rename from blocks/hooks/default-autocompleters.js
rename to editor/hooks/default-autocompleters.js
index 706816b0a26e7..8e132e417bfa8 100644
--- a/blocks/hooks/default-autocompleters.js
+++ b/editor/hooks/default-autocompleters.js
@@ -7,12 +7,12 @@ import { clone } from 'lodash';
  * WordPress dependencies
  */
 import { addFilter } from '@wordpress/hooks';
+import { getDefaultBlockName } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import { blockAutocompleter, userAutocompleter } from '../autocompleters';
-import { getDefaultBlockName } from '../api/registration';
+import { blockAutocompleter, userAutocompleter } from '../components';
 
 const defaultAutocompleters = [ userAutocompleter ];
 
diff --git a/blocks/hooks/generated-class-name.js b/editor/hooks/generated-class-name.js
similarity index 92%
rename from blocks/hooks/generated-class-name.js
rename to editor/hooks/generated-class-name.js
index 4c7b723d7b296..c5f7d1b49502c 100644
--- a/blocks/hooks/generated-class-name.js
+++ b/editor/hooks/generated-class-name.js
@@ -7,11 +7,7 @@ import { uniq } from 'lodash';
  * WordPress dependencies
  */
 import { addFilter } from '@wordpress/hooks';
-
-/**
- * Internal dependencies
- */
-import { hasBlockSupport, getBlockDefaultClassName } from '../api';
+import { hasBlockSupport, getBlockDefaultClassName } from '@wordpress/blocks';
 
 /**
  * Override props assigned to save component to inject generated className if
diff --git a/blocks/hooks/index.js b/editor/hooks/index.js
similarity index 100%
rename from blocks/hooks/index.js
rename to editor/hooks/index.js
diff --git a/blocks/hooks/layout.js b/editor/hooks/layout.js
similarity index 100%
rename from blocks/hooks/layout.js
rename to editor/hooks/layout.js
diff --git a/blocks/hooks/test/align.js b/editor/hooks/test/align.js
similarity index 99%
rename from blocks/hooks/test/align.js
rename to editor/hooks/test/align.js
index 2deb57197b52d..ea4c491d98c1d 100644
--- a/blocks/hooks/test/align.js
+++ b/editor/hooks/test/align.js
@@ -8,15 +8,15 @@ import { noop } from 'lodash';
  * WordPress dependencies
  */
 import { applyFilters } from '@wordpress/hooks';
-
-/**
- * Internal dependencies
- */
 import {
 	getBlockTypes,
 	registerBlockType,
 	unregisterBlockType,
-} from '../../api';
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
 import {
 	getBlockValidAlignments,
 	withToolbarControls,
diff --git a/blocks/hooks/test/anchor.js b/editor/hooks/test/anchor.js
similarity index 100%
rename from blocks/hooks/test/anchor.js
rename to editor/hooks/test/anchor.js
diff --git a/blocks/hooks/test/custom-class-name.js b/editor/hooks/test/custom-class-name.js
similarity index 100%
rename from blocks/hooks/test/custom-class-name.js
rename to editor/hooks/test/custom-class-name.js
diff --git a/blocks/hooks/test/default-autocompleters.js b/editor/hooks/test/default-autocompleters.js
similarity index 96%
rename from blocks/hooks/test/default-autocompleters.js
rename to editor/hooks/test/default-autocompleters.js
index 08b0412f24bd8..8afe8c43a6c4b 100644
--- a/blocks/hooks/test/default-autocompleters.js
+++ b/editor/hooks/test/default-autocompleters.js
@@ -7,7 +7,7 @@ import { applyFilters } from '@wordpress/hooks';
  * Internal dependencies
  */
 import '../default-autocompleters';
-import { userAutocompleter } from '../../autocompleters';
+import { userAutocompleter } from '../../components';
 
 describe( 'default-autocompleters', () => {
 	const BLOCK_NAME = 'core/foo';
diff --git a/blocks/hooks/test/generated-class-name.js b/editor/hooks/test/generated-class-name.js
similarity index 100%
rename from blocks/hooks/test/generated-class-name.js
rename to editor/hooks/test/generated-class-name.js
diff --git a/blocks/hooks/test/layout.js b/editor/hooks/test/layout.js
similarity index 100%
rename from blocks/hooks/test/layout.js
rename to editor/hooks/test/layout.js
diff --git a/editor/index.js b/editor/index.js
index 58d40d036eb58..d1a2e31e28acd 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -1,3 +1,4 @@
 import './store';
+import './hooks';
 
 export * from './components';
diff --git a/editor/index.native.js b/editor/index.native.js
new file mode 100644
index 0000000000000..7c5e175f46249
--- /dev/null
+++ b/editor/index.native.js
@@ -0,0 +1 @@
+export { default as PlainText } from './components/plain-text';
diff --git a/lib/client-assets.php b/lib/client-assets.php
index 0ca8167bf5bdf..035ca9dec45d0 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -196,21 +196,7 @@ function gutenberg_register_scripts_and_styles() {
 	wp_register_script(
 		'wp-blocks',
 		gutenberg_url( 'build/blocks/index.js' ),
-		array(
-			'wp-element',
-			'wp-components',
-			'wp-utils',
-			'wp-hooks',
-			'wp-i18n',
-			'wp-is-shallow-equal',
-			'tinymce-latest',
-			'tinymce-latest-lists',
-			'tinymce-latest-paste',
-			'tinymce-latest-table',
-			'shortcode',
-			'wp-core-data',
-			'lodash',
-		),
+		array( 'wp-element', 'wp-utils', 'wp-hooks', 'wp-i18n', 'shortcode', 'wp-data', 'lodash' ),
 		filemtime( gutenberg_dir_path() . 'build/blocks/index.js' ),
 		true
 	);
@@ -232,7 +218,7 @@ function gutenberg_register_scripts_and_styles() {
 	wp_register_script(
 		'wp-core-blocks',
 		gutenberg_url( 'build/core-blocks/index.js' ),
-		array( 'wp-element', 'wp-components', 'wp-utils', 'wp-blocks', 'wp-i18n', 'editor', 'wp-core-data', 'lodash' ),
+		array( 'wp-element', 'wp-components', 'wp-utils', 'wp-blocks', 'wp-editor', 'wp-i18n', 'editor', 'wp-core-data', 'lodash' ),
 		filemtime( gutenberg_dir_path() . 'build/core-blocks/index.js' ),
 		true
 	);
@@ -325,6 +311,10 @@ function gutenberg_register_scripts_and_styles() {
 			'wp-plugins',
 			'wp-utils',
 			'wp-viewport',
+			'tinymce-latest',
+			'tinymce-latest-lists',
+			'tinymce-latest-paste',
+			'tinymce-latest-table',
 		),
 		filemtime( gutenberg_dir_path() . 'build/editor/index.js' ),
 		true
@@ -370,7 +360,7 @@ function gutenberg_register_scripts_and_styles() {
 	wp_register_style(
 		'wp-editor',
 		gutenberg_url( 'build/editor/style.css' ),
-		array( 'wp-components', 'wp-blocks', 'wp-editor-font' ),
+		array( 'wp-components', 'wp-editor-font' ),
 		filemtime( gutenberg_dir_path() . 'build/editor/style.css' )
 	);
 	wp_style_add_data( 'wp-editor', 'rtl', 'replace' );
@@ -391,14 +381,6 @@ function gutenberg_register_scripts_and_styles() {
 	);
 	wp_style_add_data( 'wp-components', 'rtl', 'replace' );
 
-	wp_register_style(
-		'wp-blocks',
-		gutenberg_url( 'build/blocks/style.css' ),
-		array(),
-		filemtime( gutenberg_dir_path() . 'build/blocks/style.css' )
-	);
-	wp_style_add_data( 'wp-blocks', 'rtl', 'replace' );
-
 	wp_register_style(
 		'wp-core-blocks',
 		gutenberg_url( 'build/core-blocks/style.css' ),
@@ -410,7 +392,7 @@ function gutenberg_register_scripts_and_styles() {
 	wp_register_style(
 		'wp-edit-blocks',
 		gutenberg_url( 'build/core-blocks/edit-blocks.css' ),
-		array( 'wp-components', 'wp-blocks' ),
+		array( 'wp-components', 'wp-editor' ),
 		filemtime( gutenberg_dir_path() . 'build/core-blocks/edit-blocks.css' )
 	);
 	wp_style_add_data( 'wp-edit-blocks', 'rtl', 'replace' );
@@ -471,10 +453,10 @@ function gutenberg_preload_api_request( $memo, $path ) {
  * @since 0.1.0
  */
 function gutenberg_register_vendor_scripts() {
-	$suffix = SCRIPT_DEBUG ? '' : '.min';
+	$suffix = SCRIPT_DEBUG || true ? '' : '.min';
 
 	// Vendor Scripts.
-	$react_suffix = ( SCRIPT_DEBUG ? '.development' : '.production' ) . $suffix;
+	$react_suffix = ( SCRIPT_DEBUG || true ? '.development' : '.production' ) . $suffix;
 
 	gutenberg_register_vendor_script(
 		'react',

From 4b3ec1b4b4c80e1ed5e1d785d8a6688af8f0981c Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 1 May 2018 13:31:16 +0100
Subject: [PATCH 02/12] Add deprecation message for wp.blocks.*

---
 editor/index.js | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/editor/index.js b/editor/index.js
index d1a2e31e28acd..4b7b862d1b9e3 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -1,4 +1,77 @@
+/**
+ * External dependencies
+ */
+import { forEach } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { Component } from '@wordpress/element';
+import { deprecated } from '@wordpress/utils';
+
 import './store';
 import './hooks';
 
 export * from './components';
+
+import {
+	Autocomplete,
+	AlignmentToolbar,
+	BlockAlignmentToolbar,
+	BlockControls,
+	BlockEdit,
+	BlockFormatControls,
+	BlockIcon,
+	ColorPalette,
+	ContrastChecker,
+	ImagePlaceholder,
+	InnerBlocks,
+	InspectorAdvancedControls,
+	InspectorControls,
+	PlainText,
+	RichText,
+	RichTextProvider,
+	MediaUpload,
+	UrlInput,
+	UrlInputButton,
+} from './components';
+
+const componentsToDepreacate = {
+	Autocomplete,
+	AlignmentToolbar,
+	BlockAlignmentToolbar,
+	BlockControls,
+	BlockEdit,
+	BlockFormatControls,
+	BlockIcon,
+	ColorPalette,
+	ContrastChecker,
+	ImagePlaceholder,
+	InnerBlocks,
+	InspectorAdvancedControls,
+	InspectorControls,
+	PlainText,
+	RichText,
+	RichTextProvider,
+	MediaUpload,
+	UrlInput,
+	UrlInputButton,
+};
+
+forEach( componentsToDepreacate, ( WrappedComponent, key ) => {
+	wp.blocks[ key ] = class extends Component {
+		constructor() {
+			super( ...arguments );
+
+			deprecated( 'wp.blocks.' + key, {
+				version: '3.1',
+				alternative: 'wp.editor.' + key,
+				plugin: 'Gutenberg',
+			} );
+		}
+
+		render() {
+			return <WrappedComponent { ...this.props } />;
+		}
+	};
+} );

From 4e5f804e6b9b584da986aa0f2be1fc859a4f7831 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 1 May 2018 13:38:04 +0100
Subject: [PATCH 03/12] Update documentation to match the code

---
 .../blocks/block-controls-toolbars-and-inspector.md | 13 ++++++-------
 .../introducing-attributes-and-editable-fields.md   |  5 +++--
 docs/reference/deprecated.md                        |  4 ++++
 editor/components/plain-text/README.md              |  5 +++--
 editor/components/rich-text/README.md               |  7 ++++---
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/docs/blocks/block-controls-toolbars-and-inspector.md b/docs/blocks/block-controls-toolbars-and-inspector.md
index af1eca93c115a..2ddc50c2e542f 100644
--- a/docs/blocks/block-controls-toolbars-and-inspector.md
+++ b/docs/blocks/block-controls-toolbars-and-inspector.md
@@ -1,6 +1,6 @@
 # Block Controls: Toolbars and Inspector
 
-To simplify block customization and ensure a consistent experience for users, there are a number of built-in UI patterns to help generate the editor preview. Like with the `RichText` component covered in the previous chapter, the `wp.blocks` global includes a few other common components to render editing interfaces. In this chapter, we'll explore toolbars and the block inspector.
+To simplify block customization and ensure a consistent experience for users, there are a number of built-in UI patterns to help generate the editor preview. Like with the `RichText` component covered in the previous chapter, the `wp.editor` global includes a few other common components to render editing interfaces. In this chapter, we'll explore toolbars and the block inspector.
 
 ## Toolbar
 
@@ -15,9 +15,9 @@ You can also customize the toolbar to include controls specific to your block ty
 ```js
 var el = wp.element.createElement,
 	registerBlockType = wp.blocks.registerBlockType,
-	RichText = wp.blocks.RichText,
-	BlockControls = wp.blocks.BlockControls,
-	AlignmentToolbar = wp.blocks.AlignmentToolbar;
+	RichText = wp.editor.RichText,
+	BlockControls = wp.editor.BlockControls,
+	AlignmentToolbar = wp.editor.AlignmentToolbar;
 
 registerBlockType( 'gutenberg-boilerplate-es5/hello-world-step-04', {
 	title: 'Hello World (Step 4)',
@@ -89,13 +89,12 @@ registerBlockType( 'gutenberg-boilerplate-es5/hello-world-step-04', {
 ```
 {% ESNext %}
 ```js
+const { registerBlockType } = wp.blocks;
 const {
-	registerBlockType,
 	RichText,
 	BlockControls,
 	AlignmentToolbar,
-	source
-} = wp.blocks;
+} = wp.editor;
 
 registerBlockType( 'gutenberg-boilerplate-esnext/hello-world-step-04', {
 	title: 'Hello World (Step 4)',
diff --git a/docs/blocks/introducing-attributes-and-editable-fields.md b/docs/blocks/introducing-attributes-and-editable-fields.md
index ca893b9fcab80..509593527acdc 100644
--- a/docs/blocks/introducing-attributes-and-editable-fields.md
+++ b/docs/blocks/introducing-attributes-and-editable-fields.md
@@ -13,7 +13,7 @@ One challenge of maintaining the representation of a block as a JavaScript objec
 ```js
 var el = wp.element.createElement,
 	registerBlockType = wp.blocks.registerBlockType,
-	RichText = wp.blocks.RichText;
+	RichText = wp.editor.RichText;
 
 registerBlockType( 'gutenberg-boilerplate-es5/hello-world-step-03', {
 	title: 'Hello World (Step 3)',
@@ -60,7 +60,8 @@ registerBlockType( 'gutenberg-boilerplate-es5/hello-world-step-03', {
 ```
 {% ESNext %}
 ```js
-const { registerBlockType, RichText, source } = wp.blocks;
+const { registerBlockType } = wp.blocks;
+const { RichText } = wp.editor;
 
 registerBlockType( 'gutenberg-boilerplate-esnext/hello-world-step-03', {
 	title: 'Hello World (Step 3)',
diff --git a/docs/reference/deprecated.md b/docs/reference/deprecated.md
index 6ac524ca48816..06bb8ee695fce 100644
--- a/docs/reference/deprecated.md
+++ b/docs/reference/deprecated.md
@@ -1,5 +1,9 @@
 Gutenberg's deprecation policy is intended to support backwards-compatibility for two minor releases, when possible. The current deprecations are listed below and are grouped by _the version at which they will be removed completely_. If your plugin depends on these behaviors, you must update to the recommended alternative before the noted version.
 
+## 3.1.0
+
+ - All components in `wp.blocks.*` are removed. Please use `wp.editor.*` instead.
+
 ## 3.0.0
 
 - `wp.blocks.registerCoreBlocks` function removed. Please use `wp.coreBlocks.registerCoreBlocks` instead.
diff --git a/editor/components/plain-text/README.md b/editor/components/plain-text/README.md
index 377e86b7caf39..36909597bc6aa 100644
--- a/editor/components/plain-text/README.md
+++ b/editor/components/plain-text/README.md
@@ -29,7 +29,7 @@ wp.blocks.registerBlockType( /* ... */, {
 	},
 
 	edit: function( props ) {
-		return wp.element.createElement( wp.blocks.PlainText, {
+		return wp.element.createElement( wp.editor.PlainText, {
 			className: props.className,
 			value: props.attributes.content,
 			onChange: function( content ) {
@@ -41,7 +41,8 @@ wp.blocks.registerBlockType( /* ... */, {
 ```
 {% ESNext %}
 ```js
-const { registerBlockType, PlainText } = wp.blocks;
+const { registerBlockType } = wp.blocks;
+const { PlainText } = wp.editor;
 
 registerBlockType( /* ... */, {
 	// ...
diff --git a/editor/components/rich-text/README.md b/editor/components/rich-text/README.md
index 88668093a53ec..302365b026cdf 100644
--- a/editor/components/rich-text/README.md
+++ b/editor/components/rich-text/README.md
@@ -91,7 +91,7 @@ wp.blocks.registerBlockType( /* ... */, {
 	},
 
 	edit: function( props ) {
-		return wp.element.createElement( wp.blocks.RichText, {
+		return wp.element.createElement( wp.editor.RichText, {
 			tagName: 'h2',
 			className: props.className,
 			value: props.attributes.content,
@@ -102,7 +102,7 @@ wp.blocks.registerBlockType( /* ... */, {
 	},
 
 	save: function() {
-		return wp.element.createElement( wp.blocks.RichText.Content, {
+		return wp.element.createElement( wp.editor.RichText.Content, {
 			tagName: 'h2', value: props.attributes.content
 		} );
 	}
@@ -110,7 +110,8 @@ wp.blocks.registerBlockType( /* ... */, {
 ```
 {% ESNext %}
 ```js
-const { registerBlockType, RichText } = wp.blocks;
+const { registerBlockType } = wp.blocks;
+const { RichText } = wp.editor;
 
 registerBlockType( /* ... */, {
 	// ...

From 2bec9f41b205d5114c58f9455e54761bc3288997 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 4 May 2018 10:11:49 +0100
Subject: [PATCH 04/12] Fix unit tests

---
 blocks/api/raw-handling/test/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocks/api/raw-handling/test/index.js b/blocks/api/raw-handling/test/index.js
index 5c68c2f31493c..49809d0ae394e 100644
--- a/blocks/api/raw-handling/test/index.js
+++ b/blocks/api/raw-handling/test/index.js
@@ -13,7 +13,7 @@ import { registerCoreBlocks } from '../../../../core-blocks';
 describe( 'rawHandler', () => {
 	beforeAll( () => {
 		// Load all hooks that modify blocks
-		require( 'blocks/hooks' );
+		require( 'editor/hooks' );
 		registerCoreBlocks();
 	} );
 

From 402c2202dfdb45c27a4593c8e579c3b48a1ead86 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 4 May 2018 10:20:54 +0100
Subject: [PATCH 05/12] More deprecations

---
 editor/deprecated.js | 95 ++++++++++++++++++++++++++++++++++++++++++++
 editor/index.js      | 74 +---------------------------------
 2 files changed, 96 insertions(+), 73 deletions(-)
 create mode 100644 editor/deprecated.js

diff --git a/editor/deprecated.js b/editor/deprecated.js
new file mode 100644
index 0000000000000..253cc9760f985
--- /dev/null
+++ b/editor/deprecated.js
@@ -0,0 +1,95 @@
+/**
+ * External dependencies
+ */
+import { forEach } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { Component } from '@wordpress/element';
+import { deprecated } from '@wordpress/utils';
+
+import {
+	Autocomplete,
+	AlignmentToolbar,
+	BlockAlignmentToolbar,
+	BlockControls,
+	BlockEdit,
+	BlockFormatControls,
+	BlockIcon,
+	ColorPalette,
+	ContrastChecker,
+	ImagePlaceholder,
+	InnerBlocks,
+	InspectorAdvancedControls,
+	InspectorControls,
+	PlainText,
+	RichText,
+	RichTextProvider,
+	MediaUpload,
+	UrlInput,
+	UrlInputButton,
+	withColorContext,
+	getColorClass,
+	getColorName,
+	withColor,
+} from './components';
+
+const componentsToDepreacate = {
+	Autocomplete,
+	AlignmentToolbar,
+	BlockAlignmentToolbar,
+	BlockControls,
+	BlockEdit,
+	BlockFormatControls,
+	BlockIcon,
+	ColorPalette,
+	ContrastChecker,
+	ImagePlaceholder,
+	InnerBlocks,
+	InspectorAdvancedControls,
+	InspectorControls,
+	PlainText,
+	RichText,
+	RichTextProvider,
+	MediaUpload,
+	UrlInput,
+	UrlInputButton,
+};
+
+const functionsToDeprecate = {
+	withColorContext,
+	getColorClass,
+	getColorName,
+	withColor,
+};
+
+forEach( componentsToDepreacate, ( WrappedComponent, key ) => {
+	wp.blocks[ key ] = class extends Component {
+		constructor() {
+			super( ...arguments );
+
+			deprecated( 'wp.blocks.' + key, {
+				version: '3.1',
+				alternative: 'wp.editor.' + key,
+				plugin: 'Gutenberg',
+			} );
+		}
+
+		render() {
+			return <WrappedComponent { ...this.props } />;
+		}
+	};
+} );
+
+forEach( functionsToDeprecate, ( wrappedFunction, key ) => {
+	wp.blocks[ key ] = ( ...args ) => {
+		deprecated( 'wp.blocks.' + key, {
+			version: '3.1',
+			alternative: 'wp.editor.' + key,
+			plugin: 'Gutenberg',
+		} );
+		wrappedFunction( ...args );
+	};
+} );
+
diff --git a/editor/index.js b/editor/index.js
index 4b7b862d1b9e3..ed8e1be7dd2ce 100644
--- a/editor/index.js
+++ b/editor/index.js
@@ -1,77 +1,5 @@
-/**
- * External dependencies
- */
-import { forEach } from 'lodash';
-
-/**
- * WordPress dependencies
- */
-import { Component } from '@wordpress/element';
-import { deprecated } from '@wordpress/utils';
-
+import './deprecated';
 import './store';
 import './hooks';
 
 export * from './components';
-
-import {
-	Autocomplete,
-	AlignmentToolbar,
-	BlockAlignmentToolbar,
-	BlockControls,
-	BlockEdit,
-	BlockFormatControls,
-	BlockIcon,
-	ColorPalette,
-	ContrastChecker,
-	ImagePlaceholder,
-	InnerBlocks,
-	InspectorAdvancedControls,
-	InspectorControls,
-	PlainText,
-	RichText,
-	RichTextProvider,
-	MediaUpload,
-	UrlInput,
-	UrlInputButton,
-} from './components';
-
-const componentsToDepreacate = {
-	Autocomplete,
-	AlignmentToolbar,
-	BlockAlignmentToolbar,
-	BlockControls,
-	BlockEdit,
-	BlockFormatControls,
-	BlockIcon,
-	ColorPalette,
-	ContrastChecker,
-	ImagePlaceholder,
-	InnerBlocks,
-	InspectorAdvancedControls,
-	InspectorControls,
-	PlainText,
-	RichText,
-	RichTextProvider,
-	MediaUpload,
-	UrlInput,
-	UrlInputButton,
-};
-
-forEach( componentsToDepreacate, ( WrappedComponent, key ) => {
-	wp.blocks[ key ] = class extends Component {
-		constructor() {
-			super( ...arguments );
-
-			deprecated( 'wp.blocks.' + key, {
-				version: '3.1',
-				alternative: 'wp.editor.' + key,
-				plugin: 'Gutenberg',
-			} );
-		}
-
-		render() {
-			return <WrappedComponent { ...this.props } />;
-		}
-	};
-} );

From ffe0b40e9067c8dc4ac422c5d9463afa7073f019 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 4 May 2018 10:47:42 +0100
Subject: [PATCH 06/12] Fix e2e tests

---
 test/e2e/specs/managing-links.test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/e2e/specs/managing-links.test.js b/test/e2e/specs/managing-links.test.js
index a88766b3b528f..e1c8672a45be8 100644
--- a/test/e2e/specs/managing-links.test.js
+++ b/test/e2e/specs/managing-links.test.js
@@ -32,12 +32,12 @@ describe( 'Managing links', () => {
 
 		// Typing "left" should not close the dialog
 		await page.keyboard.press( 'ArrowLeft' );
-		let modal = await page.$( '.blocks-format-toolbar__link-modal' );
+		let modal = await page.$( '.editor-format-toolbar__link-modal' );
 		expect( modal ).not.toBeNull();
 
 		// Escape should close the dialog still.
 		await page.keyboard.press( 'Escape' );
-		modal = await page.$( '.blocks-format-toolbar__link-modal' );
+		modal = await page.$( '.editor-format-toolbar__link-modal' );
 		expect( modal ).toBeNull();
 	} );
 
@@ -55,12 +55,12 @@ describe( 'Managing links', () => {
 
 		// Typing "left" should not close the dialog
 		await page.keyboard.press( 'ArrowLeft' );
-		let modal = await page.$( '.blocks-format-toolbar__link-modal' );
+		let modal = await page.$( '.editor-format-toolbar__link-modal' );
 		expect( modal ).not.toBeNull();
 
 		// Escape should close the dialog still.
 		await page.keyboard.press( 'Escape' );
-		modal = await page.$( '.blocks-format-toolbar__link-modal' );
+		modal = await page.$( '.editor-format-toolbar__link-modal' );
 		expect( modal ).toBeNull();
 	} );
 } );

From d09fb7f5cc37318da70b8be312c6cc772f42a650 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 4 May 2018 14:02:50 +0100
Subject: [PATCH 07/12] Fix deprecated functions

---
 editor/components/index.js | 2 +-
 editor/deprecated.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/components/index.js b/editor/components/index.js
index 4339dc2d2aa1b..c85751f725373 100644
--- a/editor/components/index.js
+++ b/editor/components/index.js
@@ -1,4 +1,4 @@
-// Block Creation Component
+// Block Creation Components
 export { default as Autocomplete } from './autocomplete';
 export * from './autocompleters';
 export { default as AlignmentToolbar } from './alignment-toolbar';
diff --git a/editor/deprecated.js b/editor/deprecated.js
index 253cc9760f985..d44472b7604f7 100644
--- a/editor/deprecated.js
+++ b/editor/deprecated.js
@@ -89,7 +89,7 @@ forEach( functionsToDeprecate, ( wrappedFunction, key ) => {
 			alternative: 'wp.editor.' + key,
 			plugin: 'Gutenberg',
 		} );
-		wrappedFunction( ...args );
+		return wrappedFunction( ...args );
 	};
 } );
 

From 387edcc8399a7bd729d298dfa069cd97ba75bf69 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Fri, 4 May 2018 15:50:50 +0200
Subject: [PATCH 08/12] Editor: Update class name for RN files

---
 editor/components/plain-text/index.native.js   | 2 +-
 editor/components/plain-text/style.native.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/components/plain-text/index.native.js b/editor/components/plain-text/index.native.js
index 78f60593a6bfc..c9ee8c6978071 100644
--- a/editor/components/plain-text/index.native.js
+++ b/editor/components/plain-text/index.native.js
@@ -11,7 +11,7 @@ import styles from './style.scss';
 function PlainText( { onChange, className, ...props } ) {
 	return (
 		<TextInput
-			className={ [ styles[ 'blocks-plain-text' ], className ] }
+			className={ [ styles[ 'editor-plain-text' ], className ] }
 			onChangeText={ ( text ) => onChange( text ) }
 			{ ...props }
 		/>
diff --git a/editor/components/plain-text/style.native.scss b/editor/components/plain-text/style.native.scss
index c1b9d5fe674d9..89c33a45d4704 100644
--- a/editor/components/plain-text/style.native.scss
+++ b/editor/components/plain-text/style.native.scss
@@ -1,4 +1,4 @@
-.blocks-plain-text {
+.editor-plain-text {
 	box-shadow: none;
 
 	border-width: 0;

From 50ab6ca123ba0df1ade82401aa9592e2dce0daef Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Fri, 4 May 2018 16:00:43 +0200
Subject: [PATCH 09/12] Use proper import statements for deprecated block
 components

---
 core-blocks/spacer/index.js | 2 +-
 editor/deprecated.js        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core-blocks/spacer/index.js b/core-blocks/spacer/index.js
index a4398489a913e..055fba1f1dac1 100644
--- a/core-blocks/spacer/index.js
+++ b/core-blocks/spacer/index.js
@@ -8,7 +8,7 @@ import ResizableBox from 're-resizable';
  */
 import { Fragment } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { InspectorControls } from '@wordpress/blocks';
+import { InspectorControls } from '@wordpress/editor';
 import { BaseControl, PanelBody } from '@wordpress/components';
 
 /**
diff --git a/editor/deprecated.js b/editor/deprecated.js
index d44472b7604f7..1db630e393996 100644
--- a/editor/deprecated.js
+++ b/editor/deprecated.js
@@ -32,7 +32,7 @@ import {
 	withColorContext,
 	getColorClass,
 	getColorName,
-	withColor,
+	withColors,
 } from './components';
 
 const componentsToDepreacate = {
@@ -61,7 +61,7 @@ const functionsToDeprecate = {
 	withColorContext,
 	getColorClass,
 	getColorName,
-	withColor,
+	withColors,
 };
 
 forEach( componentsToDepreacate, ( WrappedComponent, key ) => {

From 5bc3a72e01618e1f7adc2811ae203df5f9db1a28 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 4 May 2018 15:33:03 +0100
Subject: [PATCH 10/12] Ensure the editor module is loaded before third party
 plugins

---
 lib/client-assets.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/client-assets.php b/lib/client-assets.php
index 035ca9dec45d0..04c05ceb3c6bf 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -316,8 +316,7 @@ function gutenberg_register_scripts_and_styles() {
 			'tinymce-latest-paste',
 			'tinymce-latest-table',
 		),
-		filemtime( gutenberg_dir_path() . 'build/editor/index.js' ),
-		true
+		filemtime( gutenberg_dir_path() . 'build/editor/index.js' )
 	);
 
 	wp_register_script(
@@ -1064,3 +1063,14 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
 	 */
 	do_action( 'enqueue_block_editor_assets' );
 }
+
+/**
+ * Ensure the editor module is loaded before third party plugins.
+ *
+ * Remove this in Gutenberg 3.1
+ */
+function polyfill_blocks_module_in_scripts() {
+	wp_enqueue_script( 'wp-editor' );
+}
+
+add_action( 'enqueue_block_editor_assets', 'polyfill_blocks_module_in_scripts', 9 );

From d12ff98b205ba0cd5fc6431b2c3d730a4b7f337e Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 7 May 2018 09:24:30 +0100
Subject: [PATCH 11/12] Tweak editor/components react-native version

---
 editor/components/index.native.js | 1 +
 editor/index.native.js            | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 editor/components/index.native.js
 delete mode 100644 editor/index.native.js

diff --git a/editor/components/index.native.js b/editor/components/index.native.js
new file mode 100644
index 0000000000000..2c2b5eaf2957a
--- /dev/null
+++ b/editor/components/index.native.js
@@ -0,0 +1 @@
+export { default as PlainText } from './plain-text';
diff --git a/editor/index.native.js b/editor/index.native.js
deleted file mode 100644
index 7c5e175f46249..0000000000000
--- a/editor/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as PlainText } from './components/plain-text';

From b4c737d6d9414310030dfb0d65b703d977832f0b Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 7 May 2018 11:41:30 +0100
Subject: [PATCH 12/12] Removing debugging code

---
 lib/client-assets.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/client-assets.php b/lib/client-assets.php
index 04c05ceb3c6bf..fd8eab145b69b 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -452,10 +452,10 @@ function gutenberg_preload_api_request( $memo, $path ) {
  * @since 0.1.0
  */
 function gutenberg_register_vendor_scripts() {
-	$suffix = SCRIPT_DEBUG || true ? '' : '.min';
+	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
 	// Vendor Scripts.
-	$react_suffix = ( SCRIPT_DEBUG || true ? '.development' : '.production' ) . $suffix;
+	$react_suffix = ( SCRIPT_DEBUG ? '.development' : '.production' ) . $suffix;
 
 	gutenberg_register_vendor_script(
 		'react',