diff --git a/src/components/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css
similarity index 100%
rename from src/components/EntryEditor.css
rename to src/components/EntryEditor/EntryEditor.css
diff --git a/src/components/EntryEditor.js b/src/components/EntryEditor/EntryEditor.js
similarity index 93%
rename from src/components/EntryEditor.js
rename to src/components/EntryEditor/EntryEditor.js
index d3a07f2a..9095584c 100644
--- a/src/components/EntryEditor.js
+++ b/src/components/EntryEditor/EntryEditor.js
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ControlPane from './ControlPanel/ControlPane';
-import PreviewPane from './PreviewPane';
+import ControlPane from '../ControlPanel/ControlPane';
+import PreviewPane from '../PreviewPane';
 import styles from './EntryEditor.css';
 
 export default function EntryEditor(props) {
diff --git a/src/containers/EntryPage.js b/src/containers/EntryPage.js
index 36cfb71a..a5426951 100644
--- a/src/containers/EntryPage.js
+++ b/src/containers/EntryPage.js
@@ -11,7 +11,7 @@ import {
 } from '../actions/entries';
 import { addMedia, removeMedia } from '../actions/media';
 import { selectEntry, getMedia } from '../reducers';
-import EntryEditor from '../components/EntryEditor';
+import EntryEditor from '../components/EntryEditor/EntryEditor';
 import EntryPageHOC from './editorialWorkflow/EntryPageHOC';
 
 class EntryPage extends React.Component {
@@ -63,13 +63,13 @@ class EntryPage extends React.Component {
     }
     return (
       <EntryEditor
-          entry={entryDraft.get('entry')}
-          getMedia={boundGetMedia}
-          collection={collection}
-          onChange={changeDraft}
-          onAddMedia={addMedia}
-          onRemoveMedia={removeMedia}
-          onPersist={this.handlePersistEntry}
+        entry={entryDraft.get('entry')}
+        getMedia={boundGetMedia}
+        collection={collection}
+        onChange={changeDraft}
+        onAddMedia={addMedia}
+        onRemoveMedia={removeMedia}
+        onPersist={this.handlePersistEntry}
       />
     );
   }