diff --git a/src/core/client/stream/components/Comment.spec.tsx b/src/core/client/stream/components/Comment/Comment.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment.spec.tsx
rename to src/core/client/stream/components/Comment/Comment.spec.tsx
diff --git a/src/core/client/stream/components/Comment.tsx b/src/core/client/stream/components/Comment/Comment.tsx
similarity index 72%
rename from src/core/client/stream/components/Comment.tsx
rename to src/core/client/stream/components/Comment/Comment.tsx
index ab9c0348e..f923e4149 100644
--- a/src/core/client/stream/components/Comment.tsx
+++ b/src/core/client/stream/components/Comment/Comment.tsx
@@ -3,8 +3,8 @@ import { StatelessComponent } from "react";
 
 import { Typography } from "talk-ui/components";
 
-import CommentTimestamp from "./CommentTimestamp";
-import CommentTopBar from "./CommentTopBar";
+import Timestamp from "./Timestamp";
+import TopBar from "./TopBar";
 import Username from "./Username";
 
 export interface CommentProps {
@@ -18,10 +18,10 @@ export interface CommentProps {
 const Comment: StatelessComponent<CommentProps> = props => {
   return (
     <div role="article">
-      <CommentTopBar>
+      <TopBar>
         {props.author && <Username>{props.author.username}</Username>}
-        <CommentTimestamp>{props.createdAt}</CommentTimestamp>
-      </CommentTopBar>
+        <Timestamp>{props.createdAt}</Timestamp>
+      </TopBar>
       <Typography>{props.body}</Typography>
     </div>
   );
diff --git a/src/core/client/stream/components/CommentTimestamp.css b/src/core/client/stream/components/Comment/Timestamp.css
similarity index 100%
rename from src/core/client/stream/components/CommentTimestamp.css
rename to src/core/client/stream/components/Comment/Timestamp.css
diff --git a/src/core/client/stream/components/CommentTimestamp.tsx b/src/core/client/stream/components/Comment/Timestamp.tsx
similarity index 51%
rename from src/core/client/stream/components/CommentTimestamp.tsx
rename to src/core/client/stream/components/Comment/Timestamp.tsx
index bd4ddef17..e6228416f 100644
--- a/src/core/client/stream/components/CommentTimestamp.tsx
+++ b/src/core/client/stream/components/Comment/Timestamp.tsx
@@ -3,14 +3,14 @@ import { StatelessComponent } from "react";
 
 import { RelativeTime } from "talk-ui/components";
 
-import * as styles from "./CommentTimestamp.css";
+import * as styles from "./Timestamp.css";
 
-export interface CommentTimestampProps {
+export interface TimestampProps {
   children: string;
 }
 
-const CommentTimestamp: StatelessComponent<CommentTimestampProps> = props => (
+const Timestamp: StatelessComponent<TimestampProps> = props => (
   <RelativeTime className={styles.root} date={props.children} />
 );
 
-export default CommentTimestamp;
+export default Timestamp;
diff --git a/src/core/client/stream/components/CommentTopBar.css b/src/core/client/stream/components/Comment/TopBar.css
similarity index 100%
rename from src/core/client/stream/components/CommentTopBar.css
rename to src/core/client/stream/components/Comment/TopBar.css
diff --git a/src/core/client/stream/components/CommentTopBar.tsx b/src/core/client/stream/components/Comment/TopBar.tsx
similarity index 76%
rename from src/core/client/stream/components/CommentTopBar.tsx
rename to src/core/client/stream/components/Comment/TopBar.tsx
index 84915ef4c..2dfe6419d 100644
--- a/src/core/client/stream/components/CommentTopBar.tsx
+++ b/src/core/client/stream/components/Comment/TopBar.tsx
@@ -4,14 +4,14 @@ import { StatelessComponent } from "react";
 
 import { Flex, MatchMedia } from "talk-ui/components";
 
-import * as styles from "./CommentTopBar.css";
+import * as styles from "./TopBar.css";
 
-export interface CommentTopBarProps {
+export interface TopBarProps {
   className?: string;
   children: React.ReactNode;
 }
 
-const CommentTopBar: StatelessComponent<CommentTopBarProps> = props => {
+const TopBar: StatelessComponent<TopBarProps> = props => {
   const rootClassName = cn(styles.root, props.className);
   return (
     <MatchMedia minWidth="xs">
@@ -29,4 +29,4 @@ const CommentTopBar: StatelessComponent<CommentTopBarProps> = props => {
   );
 };
 
-export default CommentTopBar;
+export default TopBar;
diff --git a/src/core/client/stream/components/Username.css b/src/core/client/stream/components/Comment/Username.css
similarity index 100%
rename from src/core/client/stream/components/Username.css
rename to src/core/client/stream/components/Comment/Username.css
diff --git a/src/core/client/stream/components/Username.spec.tsx b/src/core/client/stream/components/Comment/Username.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Username.spec.tsx
rename to src/core/client/stream/components/Comment/Username.spec.tsx
diff --git a/src/core/client/stream/components/Username.tsx b/src/core/client/stream/components/Comment/Username.tsx
similarity index 100%
rename from src/core/client/stream/components/Username.tsx
rename to src/core/client/stream/components/Comment/Username.tsx
diff --git a/src/core/client/stream/components/Comment/index.ts b/src/core/client/stream/components/Comment/index.ts
new file mode 100644
index 000000000..173033df9
--- /dev/null
+++ b/src/core/client/stream/components/Comment/index.ts
@@ -0,0 +1 @@
+export { default, default as Comment, CommentProps } from "./Comment";