diff --git a/client/talk-plugin-commentbox/actions.js b/client/coral-embed-stream/src/actions/commentBox.js
similarity index 100%
rename from client/talk-plugin-commentbox/actions.js
rename to client/coral-embed-stream/src/actions/commentBox.js
diff --git a/client/coral-embed-stream/src/constants/commentBox.js b/client/coral-embed-stream/src/constants/commentBox.js
new file mode 100644
index 000000000..51130d6c0
--- /dev/null
+++ b/client/coral-embed-stream/src/constants/commentBox.js
@@ -0,0 +1,5 @@
+const prefix = 'TALK_EMBED_STREAM_COMMENT_BOX';
+
+export const ADD_TAG = `${prefix}_ADD_TAG`;
+export const REMOVE_TAG = `${prefix}_REMOVE_TAG`;
+export const CLEAR_TAGS = `${prefix}_CLEAR_TAGS`;
diff --git a/client/talk-plugin-commentbox/reducer.js b/client/coral-embed-stream/src/reducers/commentBox.js
similarity index 87%
rename from client/talk-plugin-commentbox/reducer.js
rename to client/coral-embed-stream/src/reducers/commentBox.js
index 4c6e496ed..9621f1447 100644
--- a/client/talk-plugin-commentbox/reducer.js
+++ b/client/coral-embed-stream/src/reducers/commentBox.js
@@ -1,4 +1,4 @@
-import { ADD_TAG, REMOVE_TAG, CLEAR_TAGS } from './constants';
+import { ADD_TAG, REMOVE_TAG, CLEAR_TAGS } from '../constants/commentBox';
 
 const initialState = {
   tags: [],
diff --git a/client/coral-embed-stream/src/reducers/index.js b/client/coral-embed-stream/src/reducers/index.js
index e895a70df..0152c837d 100644
--- a/client/coral-embed-stream/src/reducers/index.js
+++ b/client/coral-embed-stream/src/reducers/index.js
@@ -4,7 +4,7 @@ import embed from './embed';
 import config from './config';
 import configure from './configure';
 import stream from './stream';
-import { reducer as commentBox } from '../../../talk-plugin-commentbox';
+import commentBox from './commentBox';
 
 export default {
   auth,
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index d285f9d83..68cba9bc9 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 
 import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
-import { ReplyBox, ReplyButton } from 'talk-plugin-replies';
+import { ReplyButton } from 'talk-plugin-replies';
+import ReplyBox from './ReplyBox';
 import { FlagComment } from 'talk-plugin-flags';
 import { can } from 'coral-framework/services/perms';
 import { TransitionGroup } from 'react-transition-group';
diff --git a/client/talk-plugin-commentbox/styles.css b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.css
similarity index 100%
rename from client/talk-plugin-commentbox/styles.css
rename to client/coral-embed-stream/src/tabs/stream/components/CommentForm.css
diff --git a/client/talk-plugin-commentbox/CommentForm.js b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
similarity index 97%
rename from client/talk-plugin-commentbox/CommentForm.js
rename to client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
index 62604d88f..ac9abc446 100644
--- a/client/talk-plugin-commentbox/CommentForm.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
@@ -4,8 +4,9 @@ import { Button } from 'coral-ui';
 import cn from 'classnames';
 import Slot from 'coral-framework/components/Slot';
 
-import { name } from './CommentBox';
-import styles from './styles.css';
+// TODO: need to change this.
+import { name } from '../containers/CommentBox';
+import styles from './CommentForm.css';
 
 import t from 'coral-framework/services/i18n';
 
diff --git a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
index f4cfc42e8..7d3ae6600 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
@@ -1,7 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { notifyForNewCommentStatus } from 'talk-plugin-commentbox/CommentBox';
-import { CommentForm } from 'talk-plugin-commentbox/CommentForm';
+
+// TODO: move this function.
+import { notifyForNewCommentStatus } from '../containers/CommentBox';
+import { CommentForm } from './CommentForm';
 import styles from './Comment.css';
 import { CountdownSeconds } from './CountdownSeconds';
 import { getEditableUntilDate } from './util';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
index 8577dbc9b..5e76c9911 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import Markdown from 'coral-framework/components/Markdown';
 
+// TODO: remove this.
 const packagename = 'talk-plugin-infobox';
 
 const InfoBox = ({ enable, content }) => (
diff --git a/client/talk-plugin-replies/ReplyBox.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
similarity index 94%
rename from client/talk-plugin-replies/ReplyBox.js
rename to client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
index 2a6bd017b..03b56d990 100644
--- a/client/talk-plugin-replies/ReplyBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import CommentBox from '../talk-plugin-commentbox/CommentBox';
+import CommentBox from '../containers/CommentBox';
 
+// TODO: remove this..
 const name = 'talk-plugin-replies';
 
 class ReplyBox extends Component {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index 4a6edbfe0..4492e7b53 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -10,7 +10,7 @@ import { can } from 'coral-framework/services/perms';
 import ModerationLink from './ModerationLink';
 import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox';
 import t, { timeago } from 'coral-framework/services/i18n';
-import CommentBox from 'talk-plugin-commentbox/CommentBox';
+import CommentBox from '../containers/CommentBox';
 import QuestionBox from '../../../components/QuestionBox';
 import { isCommentActive } from 'coral-framework/utils';
 import { Tab, TabCount, TabPane } from 'coral-ui';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
index 27d6bdde4..bbb324c22 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
@@ -1,5 +1,7 @@
 import React from 'react';
 
+// TODO: change className.
+
 const TagLabel = ({ children }) => (
   <div className="talk-plugin-tag-label">{children}</div>
 );
diff --git a/client/talk-plugin-commentbox/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
similarity index 98%
rename from client/talk-plugin-commentbox/CommentBox.js
rename to client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index 8eac1ff2f..9c04801c6 100644
--- a/client/talk-plugin-commentbox/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -6,8 +6,9 @@ import { can } from 'coral-framework/services/perms';
 
 import Slot from 'coral-framework/components/Slot';
 import { connect } from 'react-redux';
-import { CommentForm } from './CommentForm';
+import { CommentForm } from '../components/CommentForm';
 
+// TODO: change this...
 export const name = 'talk-plugin-commentbox';
 
 const notifyReasons = ['LINKS', 'TRUST'];
diff --git a/client/talk-plugin-commentbox/constants.js b/client/talk-plugin-commentbox/constants.js
deleted file mode 100644
index 4a80bfe4f..000000000
--- a/client/talk-plugin-commentbox/constants.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const ADD_TAG = 'ADD_TAG';
-export const REMOVE_TAG = 'REMOVE_TAG';
-export const CLEAR_TAGS = 'CLEAR_TAGS';
diff --git a/client/talk-plugin-commentbox/index.js b/client/talk-plugin-commentbox/index.js
deleted file mode 100644
index cbc56ade5..000000000
--- a/client/talk-plugin-commentbox/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as reducer } from './reducer';
diff --git a/client/talk-plugin-replies/index.js b/client/talk-plugin-replies/index.js
index 813d96672..f099e742b 100644
--- a/client/talk-plugin-replies/index.js
+++ b/client/talk-plugin-replies/index.js
@@ -1,4 +1 @@
-import ReplyBox from './ReplyBox';
-import ReplyButton from './ReplyButton';
-
-export { ReplyBox, ReplyButton };
+export { default as ReplyButton } from './ReplyButton';
diff --git a/plugin-api/alpha/client/actions/index.js b/plugin-api/alpha/client/actions/index.js
index 20bd2b9e3..9de7b5de3 100644
--- a/plugin-api/alpha/client/actions/index.js
+++ b/plugin-api/alpha/client/actions/index.js
@@ -1,4 +1,4 @@
-export { addTag, removeTag } from 'talk-plugin-commentbox/actions';
+export { addTag, removeTag } from 'coral-embed-stream/src/actions/commentBox';
 export {
   addCommentClassName,
   removeCommentClassName,
diff --git a/services/comments.js b/services/comments.js
index ea8f3bd96..e18e04970 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -84,7 +84,6 @@ module.exports = class CommentsService {
    * @param {String} status     the new Comment status
    */
   static async edit({ id, author_id, body, status }) {
-    console.log(status);
     const EDITABLE_STATUSES = ['NONE', 'PREMOD', 'ACCEPTED'];
 
     const query = {
@@ -210,7 +209,6 @@ module.exports = class CommentsService {
 
     await events.emitAsync(COMMENTS_EDIT, originalComment, editedComment);
 
-    console.log(editedComment);
     return editedComment;
   }