diff --git a/edit-post/components/modes/keyboard-shortcuts/index.js b/edit-post/components/keyboard-shortcuts/index.js
similarity index 84%
rename from edit-post/components/modes/keyboard-shortcuts/index.js
rename to edit-post/components/keyboard-shortcuts/index.js
index 86e5a17682621c..9bc3a0a86c0058 100644
--- a/edit-post/components/modes/keyboard-shortcuts/index.js
+++ b/edit-post/components/keyboard-shortcuts/index.js
@@ -12,9 +12,9 @@ import { KeyboardShortcuts } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import shortcuts from '../../../keyboard-shortcuts';
-import { getEditorMode } from '../../../store/selectors';
-import { switchEditorMode } from '../../../store/actions';
+import shortcuts from '../../keyboard-shortcuts';
+import { getEditorMode } from '../../store/selectors';
+import { switchEditorMode } from '../../store/actions';
 
 class EditorModeKeyboardShortcuts extends Component {
 	constructor() {
diff --git a/edit-post/components/layout/index.js b/edit-post/components/layout/index.js
index 5ec118509484be..e1daf676225092 100644
--- a/edit-post/components/layout/index.js
+++ b/edit-post/components/layout/index.js
@@ -24,9 +24,9 @@ import {
 import './style.scss';
 import Header from '../header';
 import Sidebar from '../sidebar';
-import TextEditor from '../modes/text-editor';
-import VisualEditor from '../modes/visual-editor';
-import EditorModeKeyboardShortcuts from '../modes/keyboard-shortcuts';
+import TextEditor from '../text-editor';
+import VisualEditor from '../visual-editor';
+import EditorModeKeyboardShortcuts from '../keyboard-shortcuts';
 import MetaBoxes from '../meta-boxes';
 import { getMetaBoxContainer } from '../../utils/meta-boxes';
 import {
diff --git a/edit-post/components/modes/text-editor/index.js b/edit-post/components/text-editor/index.js
similarity index 100%
rename from edit-post/components/modes/text-editor/index.js
rename to edit-post/components/text-editor/index.js
diff --git a/edit-post/components/modes/text-editor/style.scss b/edit-post/components/text-editor/style.scss
similarity index 100%
rename from edit-post/components/modes/text-editor/style.scss
rename to edit-post/components/text-editor/style.scss
diff --git a/edit-post/components/modes/visual-editor/block-inspector-button.js b/edit-post/components/visual-editor/block-inspector-button.js
similarity index 94%
rename from edit-post/components/modes/visual-editor/block-inspector-button.js
rename to edit-post/components/visual-editor/block-inspector-button.js
index dd53a77622644e..35254c37a99994 100644
--- a/edit-post/components/modes/visual-editor/block-inspector-button.js
+++ b/edit-post/components/visual-editor/block-inspector-button.js
@@ -13,8 +13,8 @@ import { IconButton, withSpokenMessages } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { getActiveEditorPanel, isGeneralSidebarPanelOpened } from '../../../store/selectors';
-import { openGeneralSidebar } from '../../../store/actions';
+import { getActiveEditorPanel, isGeneralSidebarPanelOpened } from '../../store/selectors';
+import { openGeneralSidebar } from '../../store/actions';
 
 export function BlockInspectorButton( {
 	isGeneralSidebarEditorOpened,
diff --git a/edit-post/components/modes/visual-editor/index.js b/edit-post/components/visual-editor/index.js
similarity index 95%
rename from edit-post/components/modes/visual-editor/index.js
rename to edit-post/components/visual-editor/index.js
index fbf990e16e5e8a..2f5be08f023fbe 100644
--- a/edit-post/components/modes/visual-editor/index.js
+++ b/edit-post/components/visual-editor/index.js
@@ -22,7 +22,7 @@ import { Fragment } from '@wordpress/element';
  */
 import './style.scss';
 import BlockInspectorButton from './block-inspector-button';
-import { hasFixedToolbar } from '../../../store/selectors';
+import { hasFixedToolbar } from '../../store/selectors';
 
 function VisualEditor( props ) {
 	return (
diff --git a/edit-post/components/modes/visual-editor/style.scss b/edit-post/components/visual-editor/style.scss
similarity index 100%
rename from edit-post/components/modes/visual-editor/style.scss
rename to edit-post/components/visual-editor/style.scss