Framework: rename editor/api to editor/block-api and `editor/libr…

…ary` to `editor/blocks`
WordPress · Oct 4, 2017 · c2683df · c2683df
1 parent 66b1264
commit c2683df
Show file tree

Hide file tree

Showing 152 changed files with 64 additions and 64 deletions.
diff --git a/bin/build-plugin-zip.sh b/bin/build-plugin-zip.sh
@@ -94,7 +94,7 @@ status "Creating archive..."
 zip -r gutenberg.zip \
 	gutenberg.php \
 	lib/*.php \
-	editor/library/*/*.php \
+	editor/blocks/*/*.php \
 	post-content.js \
 	$vendor_scripts \
 	components/build/*.{js,map} \

diff --git a/bin/create-php-parser.js b/bin/create-php-parser.js
@@ -5,7 +5,7 @@ const phpegjs = require( 'phpegjs' );
 const fs = require( 'fs' );
 const path = require( 'path' );
 
-const peg = fs.readFileSync( 'editor/api/post.pegjs', 'utf8' );
+const peg = fs.readFileSync( 'editor/block-api/post.pegjs', 'utf8' );
 
 const parser = pegjs.generate(
 	peg,

diff --git a/bin/get-server-block-attributes.php b/bin/get-server-block-attributes.php
@@ -31,7 +31,7 @@ function register_block_type( $name, $args = array() ) {
 }
 
 // Register server-side code for individual blocks.
-foreach ( glob( dirname( dirname( __FILE__ ) ) . '/editor/library/*/index.php' ) as $block_logic ) {
+foreach ( glob( dirname( dirname( __FILE__ ) ) . '/editor/blocks/*/index.php' ) as $block_logic ) {
 	require_once $block_logic;
 }
 

diff --git a/editor/api/categories.js → editor/block-api/categories.js b/editor/api/categories.js → editor/block-api/categories.js
diff --git a/editor/api/factory.js → editor/block-api/factory.js b/editor/api/factory.js → editor/block-api/factory.js
diff --git a/editor/api/index.js → editor/block-api/index.js b/editor/api/index.js → editor/block-api/index.js
diff --git a/editor/api/parser.js → editor/block-api/parser.js b/editor/api/parser.js → editor/block-api/parser.js
diff --git a/editor/api/paste/blockquote-normaliser.js → .../block-api/paste/blockquote-normaliser.js b/editor/api/paste/blockquote-normaliser.js → .../block-api/paste/blockquote-normaliser.js
diff --git a/editor/api/paste/comment-remover.js → editor/block-api/paste/comment-remover.js b/editor/api/paste/comment-remover.js → editor/block-api/paste/comment-remover.js
diff --git a/editor/api/paste/create-unwrapper.js → editor/block-api/paste/create-unwrapper.js b/editor/api/paste/create-unwrapper.js → editor/block-api/paste/create-unwrapper.js
diff --git a/editor/api/paste/formatting-transformer.js → ...block-api/paste/formatting-transformer.js b/editor/api/paste/formatting-transformer.js → ...block-api/paste/formatting-transformer.js
diff --git a/editor/api/paste/image-corrector.js → editor/block-api/paste/image-corrector.js b/editor/api/paste/image-corrector.js → editor/block-api/paste/image-corrector.js
diff --git a/editor/api/paste/index.js → editor/block-api/paste/index.js b/editor/api/paste/index.js → editor/block-api/paste/index.js
diff --git a/editor/api/paste/is-inline-content.js → editor/block-api/paste/is-inline-content.js b/editor/api/paste/is-inline-content.js → editor/block-api/paste/is-inline-content.js
diff --git a/editor/api/paste/list-merger.js → editor/block-api/paste/list-merger.js b/editor/api/paste/list-merger.js → editor/block-api/paste/list-merger.js
diff --git a/editor/api/paste/ms-list-converter.js → editor/block-api/paste/ms-list-converter.js b/editor/api/paste/ms-list-converter.js → editor/block-api/paste/ms-list-converter.js
diff --git a/editor/api/paste/normalise-blocks.js → editor/block-api/paste/normalise-blocks.js b/editor/api/paste/normalise-blocks.js → editor/block-api/paste/normalise-blocks.js
diff --git a/editor/api/paste/strip-attributes.js → editor/block-api/paste/strip-attributes.js b/editor/api/paste/strip-attributes.js → editor/block-api/paste/strip-attributes.js
diff --git a/...r/api/paste/test/blockquote-normaliser.js → ...k-api/paste/test/blockquote-normaliser.js b/...r/api/paste/test/blockquote-normaliser.js → ...k-api/paste/test/blockquote-normaliser.js
diff --git a/editor/api/paste/test/comment-remover.js → ...r/block-api/paste/test/comment-remover.js b/editor/api/paste/test/comment-remover.js → ...r/block-api/paste/test/comment-remover.js
diff --git a/editor/api/paste/test/create-unwrapper.js → .../block-api/paste/test/create-unwrapper.js b/editor/api/paste/test/create-unwrapper.js → .../block-api/paste/test/create-unwrapper.js
diff --git a/.../api/paste/test/formatting-transformer.js → ...-api/paste/test/formatting-transformer.js b/.../api/paste/test/formatting-transformer.js → ...-api/paste/test/formatting-transformer.js
diff --git a/editor/api/paste/test/image-corrector.js → ...r/block-api/paste/test/image-corrector.js b/editor/api/paste/test/image-corrector.js → ...r/block-api/paste/test/image-corrector.js
diff --git a/editor/api/paste/test/index.js → editor/block-api/paste/test/index.js b/editor/api/paste/test/index.js → editor/block-api/paste/test/index.js
diff --git a/.../api/paste/test/integration/apple-in.html → ...-api/paste/test/integration/apple-in.html b/.../api/paste/test/integration/apple-in.html → ...-api/paste/test/integration/apple-in.html
diff --git a/...api/paste/test/integration/apple-out.html → ...api/paste/test/integration/apple-out.html b/...api/paste/test/integration/apple-out.html → ...api/paste/test/integration/apple-out.html
diff --git a/...aste/test/integration/google-docs-in.html → ...aste/test/integration/google-docs-in.html b/...aste/test/integration/google-docs-in.html → ...aste/test/integration/google-docs-in.html
diff --git a/...ste/test/integration/google-docs-out.html → ...ste/test/integration/google-docs-out.html b/...ste/test/integration/google-docs-out.html → ...ste/test/integration/google-docs-out.html
diff --git a/editor/api/paste/test/integration/index.js → ...block-api/paste/test/integration/index.js b/editor/api/paste/test/integration/index.js → ...block-api/paste/test/integration/index.js
@@ -8,7 +8,7 @@ import path from 'path';
 /**
  * Internal dependencies
  */
-import '../../../../library';
+import '../../../../blocks';
 import paste from '../../index';
 import serialize from '../../../serializer';
 

diff --git a/...pi/paste/test/integration/ms-word-in.html → ...pi/paste/test/integration/ms-word-in.html b/...pi/paste/test/integration/ms-word-in.html → ...pi/paste/test/integration/ms-word-in.html
diff --git a/...e/test/integration/ms-word-online-in.html → ...e/test/integration/ms-word-online-in.html b/...e/test/integration/ms-word-online-in.html → ...e/test/integration/ms-word-online-in.html
diff --git a/.../test/integration/ms-word-online-out.html → .../test/integration/ms-word-online-out.html b/.../test/integration/ms-word-online-out.html → .../test/integration/ms-word-online-out.html
diff --git a/...i/paste/test/integration/ms-word-out.html → ...i/paste/test/integration/ms-word-out.html b/...i/paste/test/integration/ms-word-out.html → ...i/paste/test/integration/ms-word-out.html
diff --git a/.../api/paste/test/integration/plain-in.html → ...-api/paste/test/integration/plain-in.html b/.../api/paste/test/integration/plain-in.html → ...-api/paste/test/integration/plain-in.html
diff --git a/...api/paste/test/integration/plain-out.html → ...api/paste/test/integration/plain-out.html b/...api/paste/test/integration/plain-out.html → ...api/paste/test/integration/plain-out.html
diff --git a/editor/api/paste/test/is-inline-content.js → ...block-api/paste/test/is-inline-content.js b/editor/api/paste/test/is-inline-content.js → ...block-api/paste/test/is-inline-content.js
diff --git a/editor/api/paste/test/list-merger.js → editor/block-api/paste/test/list-merger.js b/editor/api/paste/test/list-merger.js → editor/block-api/paste/test/list-merger.js
diff --git a/editor/api/paste/test/ms-list-converter.js → ...block-api/paste/test/ms-list-converter.js b/editor/api/paste/test/ms-list-converter.js → ...block-api/paste/test/ms-list-converter.js
diff --git a/editor/api/paste/test/normalise-blocks.js → .../block-api/paste/test/normalise-blocks.js b/editor/api/paste/test/normalise-blocks.js → .../block-api/paste/test/normalise-blocks.js
diff --git a/editor/api/paste/test/strip-attributes.js → .../block-api/paste/test/strip-attributes.js b/editor/api/paste/test/strip-attributes.js → .../block-api/paste/test/strip-attributes.js
diff --git a/editor/api/paste/test/utils.js → editor/block-api/paste/test/utils.js b/editor/api/paste/test/utils.js → editor/block-api/paste/test/utils.js
diff --git a/editor/api/paste/utils.js → editor/block-api/paste/utils.js b/editor/api/paste/utils.js → editor/block-api/paste/utils.js
diff --git a/editor/api/post.pegjs → editor/block-api/post.pegjs b/editor/api/post.pegjs → editor/block-api/post.pegjs
diff --git a/editor/api/registration.js → editor/block-api/registration.js b/editor/api/registration.js → editor/block-api/registration.js
diff --git a/editor/api/serializer.js → editor/block-api/serializer.js b/editor/api/serializer.js → editor/block-api/serializer.js
diff --git a/editor/api/source.js → editor/block-api/source.js b/editor/api/source.js → editor/block-api/source.js
diff --git a/editor/api/test/factory.js → editor/block-api/test/factory.js b/editor/api/test/factory.js → editor/block-api/test/factory.js
diff --git a/editor/api/test/parser.js → editor/block-api/test/parser.js b/editor/api/test/parser.js → editor/block-api/test/parser.js
diff --git a/editor/api/test/registration.js → editor/block-api/test/registration.js b/editor/api/test/registration.js → editor/block-api/test/registration.js
diff --git a/editor/api/test/serializer.js → editor/block-api/test/serializer.js b/editor/api/test/serializer.js → editor/block-api/test/serializer.js
diff --git a/editor/api/test/source.js → editor/block-api/test/source.js b/editor/api/test/source.js → editor/block-api/test/source.js
diff --git a/editor/api/test/validation.js → editor/block-api/test/validation.js b/editor/api/test/validation.js → editor/block-api/test/validation.js
diff --git a/editor/api/validation.js → editor/block-api/validation.js b/editor/api/validation.js → editor/block-api/validation.js
diff --git a/editor/block-autocomplete/index.js b/editor/block-autocomplete/index.js
@@ -8,7 +8,7 @@ import { Autocomplete } from '@wordpress/components';
  * Internal dependencies
  */
 import './style.scss';
-import { createBlock, getBlockTypes } from '../api';
+import { createBlock, getBlockTypes } from '../block-api';
 import BlockIcon from '../block-icon';
 
 class BlockAutocomplete extends Component {

diff --git a/editor/block-autocomplete/test/index.js b/editor/block-autocomplete/test/index.js
@@ -10,7 +10,7 @@ import BlockIcon from '../../block-icon';
 import {
 	registerBlockType,
 	unregisterBlockType,
-} from '../../api';
+} from '../../block-api';
 import BlockAutocomplete from '../';
 
 describe( 'BlockAutocomplete', () => {

diff --git a/editor/block-mover/index.js b/editor/block-mover/index.js
@@ -14,7 +14,7 @@ import { IconButton } from '@wordpress/components';
  * Internal dependencies
  */
 import './style.scss';
-import { getBlockType } from '../api';
+import { getBlockType } from '../block-api';
 import { isFirstBlock, isLastBlock, getBlockIndex, getBlock } from '../selectors';
 import { getBlockMoverLabel } from './mover-label';
 

diff --git a/editor/block-switcher/index.js b/editor/block-switcher/index.js
@@ -16,7 +16,7 @@ import { Dashicon, IconButton } from '@wordpress/components';
  * Internal dependencies
  */
 import './style.scss';
-import { getBlockType, getBlockTypes, switchToBlockType } from '../api';
+import { getBlockType, getBlockTypes, switchToBlockType } from '../block-api';
 import { replaceBlocks } from '../actions';
 import { getBlock } from '../selectors';
 

diff --git a/editor/library/audio/index.js → editor/blocks/audio/index.js b/editor/library/audio/index.js → editor/blocks/audio/index.js
@@ -13,7 +13,7 @@ import { Component } from '@wordpress/element';
  * Internal dependencies
  */
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import MediaUploadButton from '../../media-upload-button';
 import BlockControls from '../../block-controls';
 import BlockAlignmentToolbar from '../../block-alignment-toolbar';

diff --git a/editor/library/audio/style.scss → editor/blocks/audio/style.scss b/editor/library/audio/style.scss → editor/blocks/audio/style.scss
diff --git a/editor/library/button/editor.scss → editor/blocks/button/editor.scss b/editor/library/button/editor.scss → editor/blocks/button/editor.scss
diff --git a/editor/library/button/index.js → editor/blocks/button/index.js b/editor/library/button/index.js → editor/blocks/button/index.js
@@ -9,7 +9,7 @@ import { IconButton } from '@wordpress/components';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import Editable from '../../editable';
 import UrlInput from '../../url-input';
 import BlockControls from '../../block-controls';

diff --git a/editor/library/button/style.scss → editor/blocks/button/style.scss b/editor/library/button/style.scss → editor/blocks/button/style.scss
diff --git a/editor/library/categories/data.js → editor/blocks/categories/data.js b/editor/library/categories/data.js → editor/blocks/categories/data.js
diff --git a/editor/library/categories/editor.scss → editor/blocks/categories/editor.scss b/editor/library/categories/editor.scss → editor/blocks/categories/editor.scss
diff --git a/editor/library/categories/index.js → editor/blocks/categories/index.js b/editor/library/categories/index.js → editor/blocks/categories/index.js
@@ -11,7 +11,7 @@ import { times, unescape } from 'lodash';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType } from '../../api';
+import { registerBlockType } from '../../block-api';
 import { getCategories } from './data.js';
 import InspectorControls from '../../inspector-controls';
 import ToggleControl from '../../inspector-controls/toggle-control';

diff --git a/editor/library/categories/index.php → editor/blocks/categories/index.php b/editor/library/categories/index.php → editor/blocks/categories/index.php
diff --git a/editor/library/categories/style.scss → editor/blocks/categories/style.scss b/editor/library/categories/style.scss → editor/blocks/categories/style.scss
diff --git a/editor/library/code/editor.scss → editor/blocks/code/editor.scss b/editor/library/code/editor.scss → editor/blocks/code/editor.scss
diff --git a/editor/library/code/index.js → editor/blocks/code/index.js b/editor/library/code/index.js → editor/blocks/code/index.js
@@ -12,7 +12,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, source, createBlock } from '../../api';
+import { registerBlockType, source, createBlock } from '../../block-api';
 import InspectorControls from '../../inspector-controls';
 import BlockDescription from '../../block-description';
 

diff --git a/editor/library/cover-image/editor.scss → editor/blocks/cover-image/editor.scss b/editor/library/cover-image/editor.scss → editor/blocks/cover-image/editor.scss
diff --git a/editor/library/cover-image/index.js → editor/blocks/cover-image/index.js b/editor/library/cover-image/index.js → editor/blocks/cover-image/index.js
@@ -10,7 +10,7 @@ import classnames from 'classnames';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import Editable from '../../editable';
 import MediaUploadButton from '../../media-upload-button';
 import BlockControls from '../../block-controls';

diff --git a/editor/library/cover-image/style.scss → editor/blocks/cover-image/style.scss b/editor/library/cover-image/style.scss → editor/blocks/cover-image/style.scss
diff --git a/editor/library/embed/editor.scss → editor/blocks/embed/editor.scss b/editor/library/embed/editor.scss → editor/blocks/embed/editor.scss
diff --git a/editor/library/embed/index.js → editor/blocks/embed/index.js b/editor/library/embed/index.js → editor/blocks/embed/index.js
@@ -17,7 +17,7 @@ import { addQueryArgs } from '@wordpress/url';
  */
 import './style.scss';
 import './editor.scss';
-import { registerBlockType, source, createBlock } from '../../api';
+import { registerBlockType, source, createBlock } from '../../block-api';
 import Editable from '../../editable';
 import BlockControls from '../../block-controls';
 import BlockAlignmentToolbar from '../../block-alignment-toolbar';

diff --git a/editor/library/embed/style.scss → editor/blocks/embed/style.scss b/editor/library/embed/style.scss → editor/blocks/embed/style.scss
diff --git a/editor/library/freeform/editor.scss → editor/blocks/freeform/editor.scss b/editor/library/freeform/editor.scss → editor/blocks/freeform/editor.scss
diff --git a/editor/library/freeform/index.js → editor/blocks/freeform/index.js b/editor/library/freeform/index.js → editor/blocks/freeform/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, source, setUnknownTypeHandlerName } from '../../api';
+import { registerBlockType, source, setUnknownTypeHandlerName } from '../../block-api';
 import OldEditor from './old-editor';
 
 const { prop } = source;

diff --git a/editor/library/freeform/old-editor.js → editor/blocks/freeform/old-editor.js b/editor/library/freeform/old-editor.js → editor/blocks/freeform/old-editor.js
diff --git a/editor/library/gallery/block.js → editor/blocks/gallery/block.js b/editor/library/gallery/block.js → editor/blocks/gallery/block.js
diff --git a/editor/library/gallery/editor.scss → editor/blocks/gallery/editor.scss b/editor/library/gallery/editor.scss → editor/blocks/gallery/editor.scss
diff --git a/editor/library/gallery/gallery-image.js → editor/blocks/gallery/gallery-image.js b/editor/library/gallery/gallery-image.js → editor/blocks/gallery/gallery-image.js
diff --git a/editor/library/gallery/index.js → editor/blocks/gallery/index.js b/editor/library/gallery/index.js → editor/blocks/gallery/index.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import GalleryImage from './gallery-image';
 import { default as GalleryBlock, defaultColumnsNumber } from './block';
 

diff --git a/editor/library/gallery/style.scss → editor/blocks/gallery/style.scss b/editor/library/gallery/style.scss → editor/blocks/gallery/style.scss
diff --git a/editor/library/heading/editor.scss → editor/blocks/heading/editor.scss b/editor/library/heading/editor.scss → editor/blocks/heading/editor.scss
diff --git a/editor/library/heading/index.js → editor/blocks/heading/index.js b/editor/library/heading/index.js → editor/blocks/heading/index.js
@@ -9,7 +9,7 @@ import { Toolbar } from '@wordpress/components';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, createBlock, source } from '../../api';
+import { registerBlockType, createBlock, source } from '../../block-api';
 import Editable from '../../editable';
 import BlockControls from '../../block-controls';
 import InspectorControls from '../../inspector-controls';

diff --git a/editor/library/html/editor.scss → editor/blocks/html/editor.scss b/editor/library/html/editor.scss → editor/blocks/html/editor.scss
diff --git a/editor/library/html/index.js → editor/blocks/html/index.js b/editor/library/html/index.js → editor/blocks/html/index.js
@@ -13,7 +13,7 @@ import { Component } from '@wordpress/element';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import BlockControls from '../../block-controls';
 
 const { html } = source;

diff --git a/editor/library/image/block.js → editor/blocks/image/block.js b/editor/library/image/block.js → editor/blocks/image/block.js
diff --git a/editor/library/image/editor.scss → editor/blocks/image/editor.scss b/editor/library/image/editor.scss → editor/blocks/image/editor.scss
diff --git a/editor/library/image/image-size.js → editor/blocks/image/image-size.js b/editor/library/image/image-size.js → editor/blocks/image/image-size.js
diff --git a/editor/library/image/index.js → editor/blocks/image/index.js b/editor/library/image/index.js → editor/blocks/image/index.js
@@ -9,7 +9,7 @@ import { createMediaFromFile } from '@wordpress/utils';
  */
 import './style.scss';
 import './editor.scss';
-import { registerBlockType, source, createBlock } from '../../api';
+import { registerBlockType, source, createBlock } from '../../block-api';
 import ImageBlock from './block';
 
 const { attr, children } = source;

diff --git a/editor/library/image/style.scss → editor/blocks/image/style.scss b/editor/library/image/style.scss → editor/blocks/image/style.scss
diff --git a/editor/library/index.js → editor/blocks/index.js b/editor/library/index.js → editor/blocks/index.js
diff --git a/editor/library/latest-posts/data.js → editor/blocks/latest-posts/data.js b/editor/library/latest-posts/data.js → editor/blocks/latest-posts/data.js
diff --git a/editor/library/latest-posts/editor.scss → editor/blocks/latest-posts/editor.scss b/editor/library/latest-posts/editor.scss → editor/blocks/latest-posts/editor.scss
diff --git a/editor/library/latest-posts/index.js → editor/blocks/latest-posts/index.js b/editor/library/latest-posts/index.js → editor/blocks/latest-posts/index.js
@@ -13,7 +13,7 @@ import classnames from 'classnames';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType } from '../../api';
+import { registerBlockType } from '../../block-api';
 import { getLatestPosts } from './data.js';
 import InspectorControls from '../../inspector-controls';
 import TextControl from '../../inspector-controls/text-control';

diff --git a/editor/library/latest-posts/index.php → editor/blocks/latest-posts/index.php b/editor/library/latest-posts/index.php → editor/blocks/latest-posts/index.php
diff --git a/editor/library/latest-posts/style.scss → editor/blocks/latest-posts/style.scss b/editor/library/latest-posts/style.scss → editor/blocks/latest-posts/style.scss
diff --git a/editor/library/list/editor.scss → editor/blocks/list/editor.scss b/editor/library/list/editor.scss → editor/blocks/list/editor.scss
diff --git a/editor/library/list/index.js → editor/blocks/list/index.js b/editor/library/list/index.js → editor/blocks/list/index.js
@@ -13,7 +13,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, source, createBlock } from '../../api';
+import { registerBlockType, source, createBlock } from '../../block-api';
 import Editable from '../../editable';
 import BlockControls from '../../block-controls';
 import InspectorControls from '../../inspector-controls';

diff --git a/editor/library/more/editor.scss → editor/blocks/more/editor.scss b/editor/library/more/editor.scss → editor/blocks/more/editor.scss
diff --git a/editor/library/more/index.js → editor/blocks/more/index.js b/editor/library/more/index.js → editor/blocks/more/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType } from '../../api';
+import { registerBlockType } from '../../block-api';
 import InspectorControls from '../../inspector-controls';
 import BlockDescription from '../../block-description';
 import ToggleControl from '../../inspector-controls/toggle-control';

diff --git a/editor/library/paragraph/index.js → editor/blocks/paragraph/index.js b/editor/library/paragraph/index.js → editor/blocks/paragraph/index.js
@@ -14,7 +14,7 @@ import { PanelBody } from '@wordpress/components';
  * Internal dependencies
  */
 import './style.scss';
-import { registerBlockType, createBlock, source, setDefaultBlockName } from '../../api';
+import { registerBlockType, createBlock, source, setDefaultBlockName } from '../../block-api';
 import AlignmentToolbar from '../../alignment-toolbar';
 import BlockAlignmentToolbar from '../../block-alignment-toolbar';
 import BlockControls from '../../block-controls';

diff --git a/editor/library/paragraph/style.scss → editor/blocks/paragraph/style.scss b/editor/library/paragraph/style.scss → editor/blocks/paragraph/style.scss
diff --git a/editor/library/preformatted/editor.scss → editor/blocks/preformatted/editor.scss b/editor/library/preformatted/editor.scss → editor/blocks/preformatted/editor.scss
diff --git a/editor/library/preformatted/index.js → editor/blocks/preformatted/index.js b/editor/library/preformatted/index.js → editor/blocks/preformatted/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, createBlock, source } from '../../api';
+import { registerBlockType, createBlock, source } from '../../block-api';
 import Editable from '../../editable';
 import InspectorControls from '../../inspector-controls';
 import BlockDescription from '../../block-description';

diff --git a/editor/library/pullquote/editor.scss → editor/blocks/pullquote/editor.scss b/editor/library/pullquote/editor.scss → editor/blocks/pullquote/editor.scss
diff --git a/editor/library/pullquote/index.js → editor/blocks/pullquote/index.js b/editor/library/pullquote/index.js → editor/blocks/pullquote/index.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import Editable from '../../editable';
 import BlockControls from '../../block-controls';
 import BlockAlignmentToolbar from '../../block-alignment-toolbar';

diff --git a/editor/library/pullquote/style.scss → editor/blocks/pullquote/style.scss b/editor/library/pullquote/style.scss → editor/blocks/pullquote/style.scss
diff --git a/editor/library/quote/editor.scss → editor/blocks/quote/editor.scss b/editor/library/quote/editor.scss → editor/blocks/quote/editor.scss
diff --git a/editor/library/quote/index.js → editor/blocks/quote/index.js b/editor/library/quote/index.js → editor/blocks/quote/index.js
@@ -13,7 +13,7 @@ import { Toolbar } from '@wordpress/components';
  * Internal dependencies
  */
 import './style.scss';
-import { registerBlockType, createBlock, source } from '../../api';
+import { registerBlockType, createBlock, source } from '../../block-api';
 import AlignmentToolbar from '../../alignment-toolbar';
 import BlockControls from '../../block-controls';
 import Editable from '../../editable';

diff --git a/editor/library/quote/style.scss → editor/blocks/quote/style.scss b/editor/library/quote/style.scss → editor/blocks/quote/style.scss
diff --git a/editor/library/separator/index.js → editor/blocks/separator/index.js b/editor/library/separator/index.js → editor/blocks/separator/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './style.scss';
-import { registerBlockType, createBlock } from '../../api';
+import { registerBlockType, createBlock } from '../../block-api';
 import InspectorControls from '../../inspector-controls';
 import BlockDescription from '../../block-description';
 

diff --git a/editor/library/separator/style.scss → editor/blocks/separator/style.scss b/editor/library/separator/style.scss → editor/blocks/separator/style.scss
diff --git a/editor/library/shortcode/editor.scss → editor/blocks/shortcode/editor.scss b/editor/library/shortcode/editor.scss → editor/blocks/shortcode/editor.scss
diff --git a/editor/library/shortcode/index.js → editor/blocks/shortcode/index.js b/editor/library/shortcode/index.js → editor/blocks/shortcode/index.js
@@ -8,7 +8,7 @@ import { withInstanceId, Dashicon } from '@wordpress/components';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import InspectorControls from '../../inspector-controls';
 import BlockDescription from '../../block-description';
 

diff --git a/editor/library/table/editor.scss → editor/blocks/table/editor.scss b/editor/library/table/editor.scss → editor/blocks/table/editor.scss
diff --git a/editor/library/table/index.js → editor/blocks/table/index.js b/editor/library/table/index.js → editor/blocks/table/index.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  */
 import './editor.scss';
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import TableBlock from './table-block';
 import BlockControls from '../../block-controls';
 import BlockAlignmentToolbar from '../../block-alignment-toolbar';

diff --git a/editor/library/table/style.scss → editor/blocks/table/style.scss b/editor/library/table/style.scss → editor/blocks/table/style.scss
diff --git a/editor/library/table/table-block.js → editor/blocks/table/table-block.js b/editor/library/table/table-block.js → editor/blocks/table/table-block.js
diff --git a/editor/library/text-columns/editor.scss → editor/blocks/text-columns/editor.scss b/editor/library/text-columns/editor.scss → editor/blocks/text-columns/editor.scss
diff --git a/editor/library/text-columns/index.js → editor/blocks/text-columns/index.js b/editor/library/text-columns/index.js → editor/blocks/text-columns/index.js
@@ -13,7 +13,7 @@ import { __ } from '@wordpress/i18n';
  */
 import './style.scss';
 import './editor.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import BlockControls from '../../block-controls';
 import BlockAlignmentToolbar from '../../block-alignment-toolbar';
 import RangeControl from '../../inspector-controls/range-control';

diff --git a/editor/library/text-columns/style.scss → editor/blocks/text-columns/style.scss b/editor/library/text-columns/style.scss → editor/blocks/text-columns/style.scss
diff --git a/editor/library/verse/editor.scss → editor/blocks/verse/editor.scss b/editor/library/verse/editor.scss → editor/blocks/verse/editor.scss
diff --git a/editor/library/verse/index.js → editor/blocks/verse/index.js b/editor/library/verse/index.js → editor/blocks/verse/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import './editor.scss';
-import { registerBlockType, createBlock, source } from '../../api';
+import { registerBlockType, createBlock, source } from '../../block-api';
 import Editable from '../../editable';
 import InspectorControls from '../../inspector-controls';
 import BlockDescription from '../../block-description';

diff --git a/editor/library/video/index.js → editor/blocks/video/index.js b/editor/library/video/index.js → editor/blocks/video/index.js
@@ -12,7 +12,7 @@ import { Placeholder, Toolbar, Dashicon } from '@wordpress/components';
  * Internal dependencies
  */
 import './style.scss';
-import { registerBlockType, source } from '../../api';
+import { registerBlockType, source } from '../../block-api';
 import MediaUploadButton from '../../media-upload-button';
 import Editable from '../../editable';
 import BlockControls from '../../block-controls';

diff --git a/editor/library/video/style.scss → editor/blocks/video/style.scss b/editor/library/video/style.scss → editor/blocks/video/style.scss
diff --git a/editor/editable/index.js b/editor/editable/index.js
@@ -28,7 +28,7 @@ import { keycodes } from '@wordpress/utils';
  * Internal dependencies
  */
 import './style.scss';
-import { pasteHandler } from '../api';
+import { pasteHandler } from '../block-api';
 import FormatToolbar from './format-toolbar';
 import TinyMCE from './tinymce';
 import patterns from './patterns';

diff --git a/editor/editable/patterns.js b/editor/editable/patterns.js
@@ -12,7 +12,7 @@ import { keycodes } from '@wordpress/utils';
 /**
  * Internal dependencies
  */
-import { getBlockTypes } from '../api/registration';
+import { getBlockTypes } from '../block-api/registration';
 
 /**
  * Browser dependencies

diff --git a/editor/effects.js b/editor/effects.js
@@ -12,7 +12,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { parse, getBlockType, switchToBlockType } from './api';
+import { parse, getBlockType, switchToBlockType } from './block-api';
 import { getGutenbergURL, getWPAdminURL } from './utils/url';
 import {
 	resetPost,

diff --git a/editor/index.js b/editor/index.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import './library';
+import './blocks';
 
 // A "block" is the abstract term used to describe units of markup that,
 // when composed together, form the content or layout of a page.
@@ -12,7 +12,7 @@ import './library';
 //
 // Blocks are inferred from the HTML source of a post through a parsing mechanism
 // and then stored as objects in state, from which it is then rendered for editing.
-export * from './api';
+export * from './block-api';
 
 // Reusable Editor Components
 export { default as AlignmentToolbar } from './alignment-toolbar';

diff --git a/editor/inserter/index.js b/editor/inserter/index.js
@@ -14,7 +14,7 @@ import { Popover, IconButton } from '@wordpress/components';
  * Internal dependencies
  */
 import InserterMenu from './menu';
-import { createBlock } from '../api';
+import { createBlock } from '../block-api';
 import { getBlockInsertionPoint, getEditorMode } from '../selectors';
 import { insertBlock, hideInsertionPoint } from '../actions';
 

diff --git a/editor/inserter/menu.js b/editor/inserter/menu.js
@@ -16,7 +16,7 @@ import { keycodes } from '@wordpress/utils';
  * Internal dependencies
  */
 import './style.scss';
-import { getCategories, getBlockTypes } from '../api';
+import { getCategories, getBlockTypes } from '../block-api';
 import BlockIcon from '../block-icon';
 import { getBlocks, getRecentlyUsedBlocks } from '../selectors';
 import { showInsertionPoint, hideInsertionPoint } from '../actions';

diff --git a/editor/inserter/test/menu.js b/editor/inserter/test/menu.js
@@ -7,7 +7,7 @@ import { noop } from 'lodash';
 /**
  * Internal dependencies
  */
-import { registerBlockType, unregisterBlockType, getBlockTypes } from '../../api';
+import { registerBlockType, unregisterBlockType, getBlockTypes } from '../../block-api';
 import { InserterMenu, searchBlocks } from '../menu';
 
 const textBlock = {

diff --git a/editor/modes/text-editor/index.js b/editor/modes/text-editor/index.js
@@ -14,7 +14,7 @@ import { Component } from '@wordpress/element';
  * Internal dependencies
  */
 import './style.scss';
-import { parse } from '../../api';
+import { parse } from '../../block-api';
 import PostTitle from '../../post-title';
 import { getEditedPostContent } from '../../selectors';
 import { editPost, resetBlocks } from '../../actions';

diff --git a/editor/modes/visual-editor/block-drop-zone.js b/editor/modes/visual-editor/block-drop-zone.js
@@ -12,7 +12,7 @@ import { DropZone } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { getBlockTypes } from '../../api';
+import { getBlockTypes } from '../../block-api';
 import { insertBlocks } from '../../actions';
 
 function BlockDropZone( { index, ...props } ) {

diff --git a/editor/modes/visual-editor/block-list.js b/editor/modes/visual-editor/block-list.js
@@ -13,7 +13,7 @@ import { Component } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { serialize, getDefaultBlockName, createBlock } from '../../api';
+import { serialize, getDefaultBlockName, createBlock } from '../../block-api';
 import VisualEditorBlock from './block';
 import BlockDropZone from './block-drop-zone';
 import {

diff --git a/editor/modes/visual-editor/block.js b/editor/modes/visual-editor/block.js
@@ -18,7 +18,7 @@ import { __, sprintf } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { getBlockType, getBlockDefaultClassname, createBlock } from '../../api';
+import { getBlockType, getBlockDefaultClassname, createBlock } from '../../block-api';
 import InvalidBlockWarning from './invalid-block-warning';
 import BlockCrashWarning from './block-crash-warning';
 import BlockCrashBoundary from './block-crash-boundary';