diff --git a/js/src/common/compat.js b/js/src/common/compat.js
index 6811fa07d..f4fbe04e5 100644
--- a/js/src/common/compat.js
+++ b/js/src/common/compat.js
@@ -1,6 +1,7 @@
 import * as extend from './extend';
 import Session from './Session';
 import Store from './Store';
+import BasicEditorDriver from './utils/BasicEditorDriver';
 import evented from './utils/evented';
 import liveHumanTimes from './utils/liveHumanTimes';
 import ItemList from './utils/ItemList';
@@ -56,6 +57,8 @@ import ModalManager from './components/ModalManager';
 import Button from './components/Button';
 import Modal from './components/Modal';
 import GroupBadge from './components/GroupBadge';
+import TextEditor from './components/TextEditor';
+import TextEditorButton from './components/TextEditorButton';
 import Model from './Model';
 import Application from './Application';
 import fullTime from './helpers/fullTime';
@@ -74,6 +77,7 @@ export default {
   extend: extend,
   Session: Session,
   Store: Store,
+  'utils/BasicEditorDriver': BasicEditorDriver,
   'utils/evented': evented,
   'utils/liveHumanTimes': liveHumanTimes,
   'utils/ItemList': ItemList,
@@ -130,6 +134,8 @@ export default {
   'components/Button': Button,
   'components/Modal': Modal,
   'components/GroupBadge': GroupBadge,
+  'components/TextEditor': TextEditor,
+  'components/TextEditorButton': TextEditorButton,
   Model: Model,
   Application: Application,
   'helpers/fullTime': fullTime,
diff --git a/js/src/forum/components/TextEditor.js b/js/src/common/components/TextEditor.js
similarity index 93%
rename from js/src/forum/components/TextEditor.js
rename to js/src/common/components/TextEditor.js
index 5ee970d1c..445cead31 100644
--- a/js/src/forum/components/TextEditor.js
+++ b/js/src/common/components/TextEditor.js
@@ -1,7 +1,7 @@
-import Component from '../../common/Component';
-import ItemList from '../../common/utils/ItemList';
-import listItems from '../../common/helpers/listItems';
-import Button from '../../common/components/Button';
+import Component from '../Component';
+import ItemList from '../utils/ItemList';
+import listItems from '../helpers/listItems';
+import Button from './Button';
 
 import BasicEditorDriver from '../utils/BasicEditorDriver';
 
diff --git a/js/src/forum/components/TextEditorButton.js b/js/src/common/components/TextEditorButton.js
similarity index 87%
rename from js/src/forum/components/TextEditorButton.js
rename to js/src/common/components/TextEditorButton.js
index eb0b66167..8e54feafb 100644
--- a/js/src/forum/components/TextEditorButton.js
+++ b/js/src/common/components/TextEditorButton.js
@@ -1,4 +1,4 @@
-import Button from '../../common/components/Button';
+import Button from './Button';
 
 /**
  * The `TextEditorButton` component displays a button suitable for the text
diff --git a/js/src/forum/utils/BasicEditorDriver.ts b/js/src/common/utils/BasicEditorDriver.ts
similarity index 100%
rename from js/src/forum/utils/BasicEditorDriver.ts
rename to js/src/common/utils/BasicEditorDriver.ts
diff --git a/js/src/forum/utils/EditorDriverInterface.ts b/js/src/common/utils/EditorDriverInterface.ts
similarity index 100%
rename from js/src/forum/utils/EditorDriverInterface.ts
rename to js/src/common/utils/EditorDriverInterface.ts
diff --git a/js/src/forum/compat.js b/js/src/forum/compat.js
index 73a645a63..368d12970 100644
--- a/js/src/forum/compat.js
+++ b/js/src/forum/compat.js
@@ -36,8 +36,8 @@ import HeaderSecondary from './components/HeaderSecondary';
 import ComposerButton from './components/ComposerButton';
 import DiscussionList from './components/DiscussionList';
 import ReplyPlaceholder from './components/ReplyPlaceholder';
-import TextEditor from './components/TextEditor';
-import TextEditorButton from './components/TextEditorButton';
+import TextEditor from '../common/components/TextEditor'; // @deprecated beta 16, remove beta 17. Moved to common.
+import TextEditorButton from '../common/components/TextEditorButton'; // @deprecated beta 16, remove beta 17. Moved to common.
 import AvatarEditor from './components/AvatarEditor';
 import Post from './components/Post';
 import SettingsPage from './components/SettingsPage';
@@ -73,7 +73,7 @@ import DiscussionListItem from './components/DiscussionListItem';
 import LoadingPost from './components/LoadingPost';
 import PostsUserPage from './components/PostsUserPage';
 import DiscussionPageResolver from './resolvers/DiscussionPageResolver';
-import BasicEditorDriver from './utils/BasicEditorDriver';
+import BasicEditorDriver from '../common/utils/BasicEditorDriver';
 import routes from './routes';
 import ForumApplication from './ForumApplication';
 
@@ -116,8 +116,8 @@ export default Object.assign(compat, {
   'components/ComposerButton': ComposerButton,
   'components/DiscussionList': DiscussionList,
   'components/ReplyPlaceholder': ReplyPlaceholder,
-  'components/TextEditor': TextEditor,
-  'components/TextEditorButton': TextEditorButton,
+  'components/TextEditor': TextEditor, // @deprecated beta 16, remove beta 17. Moved to common.
+  'components/TextEditorButton': TextEditorButton, // @deprecated beta 16, remove beta 17. Moved to common.
   'components/AvatarEditor': AvatarEditor,
   'components/Post': Post,
   'components/SettingsPage': SettingsPage,
diff --git a/js/src/forum/components/ComposerBody.js b/js/src/forum/components/ComposerBody.js
index d81a2c87a..c5bcb1547 100644
--- a/js/src/forum/components/ComposerBody.js
+++ b/js/src/forum/components/ComposerBody.js
@@ -1,7 +1,7 @@
 import Component from '../../common/Component';
 import LoadingIndicator from '../../common/components/LoadingIndicator';
 import ConfirmDocumentUnload from '../../common/components/ConfirmDocumentUnload';
-import TextEditor from './TextEditor';
+import TextEditor from '../../common/components/TextEditor';
 import avatar from '../../common/helpers/avatar';
 import listItems from '../../common/helpers/listItems';
 import ItemList from '../../common/utils/ItemList';
diff --git a/js/src/forum/states/ComposerState.js b/js/src/forum/states/ComposerState.js
index 34b3956f4..cf24c4974 100644
--- a/js/src/forum/states/ComposerState.js
+++ b/js/src/forum/states/ComposerState.js
@@ -1,7 +1,7 @@
 import subclassOf from '../../common/utils/subclassOf';
 import Stream from '../../common/utils/Stream';
 import ReplyComposer from '../components/ReplyComposer';
-import EditorDriverInterface from '../utils/EditorDriverInterface';
+import EditorDriverInterface from '../../common/utils/EditorDriverInterface';
 
 class ComposerState {
   constructor() {