diff --git a/src/core/client/stream/components/App.spec.tsx b/src/core/client/stream/components/App.spec.tsx
index d7dfdc3a7..dcd979099 100644
--- a/src/core/client/stream/components/App.spec.tsx
+++ b/src/core/client/stream/components/App.spec.tsx
@@ -5,17 +5,9 @@ import { PropTypesOf } from "talk-framework/types";
 
 import App from "./App";
 
-it("renders stream", () => {
+it("renders comments", () => {
   const props: PropTypesOf<typeof App> = {
-    showPermalinkView: false,
-  };
-  const wrapper = shallow(<App {...props} />);
-  expect(wrapper).toMatchSnapshot();
-});
-
-it("renders permalink view", () => {
-  const props: PropTypesOf<typeof App> = {
-    showPermalinkView: true,
+    activeTab: "COMMENTS",
   };
   const wrapper = shallow(<App {...props} />);
   expect(wrapper).toMatchSnapshot();
diff --git a/src/core/client/stream/components/App.tsx b/src/core/client/stream/components/App.tsx
index b7d2d09d9..421e6af9c 100644
--- a/src/core/client/stream/components/App.tsx
+++ b/src/core/client/stream/components/App.tsx
@@ -3,20 +3,22 @@ import { StatelessComponent } from "react";
 
 import { Flex } from "talk-ui/components";
 
-import PermalinkViewQuery from "../queries/PermalinkViewQuery";
-import StreamQuery from "../queries/StreamQuery";
+import CommentsPaneContainer from "../tabs/comments/containers/CommentsPaneContainer";
 import * as styles from "./App.css";
 
 export interface AppProps {
-  showPermalinkView: boolean;
+  activeTab: "COMMENTS" | "%future added value";
 }
 
 const App: StatelessComponent<AppProps> = props => {
-  const view = props.showPermalinkView ? (
-    <PermalinkViewQuery />
-  ) : (
-    <StreamQuery />
-  );
+  let view: React.ReactElement<any>;
+  switch (props.activeTab) {
+    case "COMMENTS":
+      view = <CommentsPaneContainer />;
+      break;
+    default:
+      throw new Error(`Unknown tab ${props.activeTab}`);
+  }
   return (
     <Flex justifyContent="center" className={styles.root}>
       {view}
diff --git a/src/core/client/stream/components/Comment/HTMLContent.css b/src/core/client/stream/components/HTMLContent.css
similarity index 100%
rename from src/core/client/stream/components/Comment/HTMLContent.css
rename to src/core/client/stream/components/HTMLContent.css
diff --git a/src/core/client/stream/components/Comment/HTMLContent.spec.tsx b/src/core/client/stream/components/HTMLContent.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/HTMLContent.spec.tsx
rename to src/core/client/stream/components/HTMLContent.spec.tsx
diff --git a/src/core/client/stream/components/Comment/HTMLContent.tsx b/src/core/client/stream/components/HTMLContent.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/HTMLContent.tsx
rename to src/core/client/stream/components/HTMLContent.tsx
diff --git a/src/core/client/stream/components/Comment/Timestamp.css b/src/core/client/stream/components/Timestamp.css
similarity index 100%
rename from src/core/client/stream/components/Comment/Timestamp.css
rename to src/core/client/stream/components/Timestamp.css
diff --git a/src/core/client/stream/components/Comment/Timestamp.spec.tsx b/src/core/client/stream/components/Timestamp.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/Timestamp.spec.tsx
rename to src/core/client/stream/components/Timestamp.spec.tsx
diff --git a/src/core/client/stream/components/Comment/Timestamp.tsx b/src/core/client/stream/components/Timestamp.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/Timestamp.tsx
rename to src/core/client/stream/components/Timestamp.tsx
diff --git a/src/core/client/stream/components/UserBoxAuthenticated.tsx b/src/core/client/stream/components/UserBoxAuthenticated.tsx
index 94ed90ac6..68c7fba00 100644
--- a/src/core/client/stream/components/UserBoxAuthenticated.tsx
+++ b/src/core/client/stream/components/UserBoxAuthenticated.tsx
@@ -20,7 +20,7 @@ const UserBoxAuthenticated: StatelessComponent<
   return (
     <Flex itemGutter="half" wrap>
       <Localized
-        id="comments-userBoxAuthenticated-signedInAs"
+        id="general-userBoxAuthenticated-signedInAs"
         username={<Username />}
       >
         <Typography variant="bodyCopy" container="div">
@@ -28,7 +28,7 @@ const UserBoxAuthenticated: StatelessComponent<
         </Typography>
       </Localized>
       <Localized
-        id="comments-userBoxAuthenticated-notYou"
+        id="general-userBoxAuthenticated-notYou"
         button={
           <Button
             color="primary"
diff --git a/src/core/client/stream/components/UserBoxUnauthenticated.tsx b/src/core/client/stream/components/UserBoxUnauthenticated.tsx
index 8eec09e9e..44c9cd246 100644
--- a/src/core/client/stream/components/UserBoxUnauthenticated.tsx
+++ b/src/core/client/stream/components/UserBoxUnauthenticated.tsx
@@ -17,7 +17,7 @@ const UserBoxUnauthenticated: StatelessComponent<
   return (
     <Flex itemGutter alignItems="center">
       <MatchMedia gteWidth="sm">
-        <Localized id="comments-userBoxUnauthenticated-joinTheConversation">
+        <Localized id="general-userBoxUnauthenticated-joinTheConversation">
           <Typography
             className={styles.joinText}
             variant="bodyCopyBold"
@@ -30,7 +30,7 @@ const UserBoxUnauthenticated: StatelessComponent<
           |
         </Typography>
       </MatchMedia>
-      <Localized id="comments-userBoxUnauthenticated-signIn">
+      <Localized id="general-userBoxUnauthenticated-signIn">
         <Button
           color="primary"
           size="small"
@@ -40,7 +40,7 @@ const UserBoxUnauthenticated: StatelessComponent<
           Sign in
         </Button>
       </Localized>
-      <Localized id="comments-userBoxUnauthenticated-register">
+      <Localized id="general-userBoxUnauthenticated-register">
         <Button
           color="primary"
           size="small"
diff --git a/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
index ccb926aaf..d42a5a3d0 100644
--- a/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
@@ -1,19 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders permalink view 1`] = `
+exports[`renders comments 1`] = `
 <withPropsOnChange(Flex)
   className="App-root"
   justifyContent="center"
 >
-  <withContext(withLocalStateContainer(PermalinkViewQuery)) />
-</withPropsOnChange(Flex)>
-`;
-
-exports[`renders stream 1`] = `
-<withPropsOnChange(Flex)
-  className="App-root"
-  justifyContent="center"
->
-  <withContext(withLocalStateContainer(StreamQuery)) />
+  <withContext(withLocalStateContainer(CommentsPaneContainer)) />
 </withPropsOnChange(Flex)>
 `;
diff --git a/src/core/client/stream/components/Comment/__snapshots__/HTMLContent.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/HTMLContent.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/HTMLContent.spec.tsx.snap
rename to src/core/client/stream/components/__snapshots__/HTMLContent.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/__snapshots__/Timestamp.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/Timestamp.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/Timestamp.spec.tsx.snap
rename to src/core/client/stream/components/__snapshots__/Timestamp.spec.tsx.snap
diff --git a/src/core/client/stream/components/__snapshots__/UserBoxAuthenticated.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/UserBoxAuthenticated.spec.tsx.snap
index 80f20f2b3..0899da755 100644
--- a/src/core/client/stream/components/__snapshots__/UserBoxAuthenticated.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/UserBoxAuthenticated.spec.tsx.snap
@@ -6,7 +6,7 @@ exports[`renders correctly 1`] = `
   wrap={true}
 >
   <Localized
-    id="comments-userBoxAuthenticated-signedInAs"
+    id="general-userBoxAuthenticated-signedInAs"
     username={<Username />}
   >
     <withPropsOnChange(Typography)
@@ -25,7 +25,7 @@ exports[`renders correctly 1`] = `
         variant="underlined"
       />
     }
-    id="comments-userBoxAuthenticated-notYou"
+    id="general-userBoxAuthenticated-notYou"
   >
     <withPropsOnChange(Typography)
       container={[Function]}
diff --git a/src/core/client/stream/components/__snapshots__/UserBoxUnauthenticated.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/UserBoxUnauthenticated.spec.tsx.snap
index 492657d72..13857622c 100644
--- a/src/core/client/stream/components/__snapshots__/UserBoxUnauthenticated.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/UserBoxUnauthenticated.spec.tsx.snap
@@ -9,7 +9,7 @@ exports[`renders correctly 1`] = `
     gteWidth="sm"
   >
     <Localized
-      id="comments-userBoxUnauthenticated-joinTheConversation"
+      id="general-userBoxUnauthenticated-joinTheConversation"
     >
       <withPropsOnChange(Typography)
         className="UserBoxUnauthenticated-joinText"
@@ -27,7 +27,7 @@ exports[`renders correctly 1`] = `
     </withPropsOnChange(Typography)>
   </MatchMediaWithContext>
   <Localized
-    id="comments-userBoxUnauthenticated-signIn"
+    id="general-userBoxUnauthenticated-signIn"
   >
     <withPropsOnChange(Button)
       color="primary"
@@ -39,7 +39,7 @@ exports[`renders correctly 1`] = `
     </withPropsOnChange(Button)>
   </Localized>
   <Localized
-    id="comments-userBoxUnauthenticated-register"
+    id="general-userBoxUnauthenticated-register"
   >
     <withPropsOnChange(Button)
       color="primary"
diff --git a/src/core/client/stream/containers/AppContainer.tsx b/src/core/client/stream/containers/AppContainer.tsx
index 533e8e37f..011a0bee8 100644
--- a/src/core/client/stream/containers/AppContainer.tsx
+++ b/src/core/client/stream/containers/AppContainer.tsx
@@ -11,15 +11,15 @@ interface InnerProps {
 }
 
 const AppContainer: StatelessComponent<InnerProps> = ({
-  local: { commentID },
+  local: { activeTab },
 }) => {
-  return <App showPermalinkView={!!commentID} />;
+  return <App activeTab={activeTab} />;
 };
 
 const enhanced = withLocalStateContainer(
   graphql`
     fragment AppContainerLocal on Local {
-      commentID
+      activeTab
     }
   `
 )(AppContainer);
diff --git a/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap b/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap
index c8dda11c7..b7fe1473c 100644
--- a/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap
+++ b/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap
@@ -18,7 +18,8 @@ exports[`init local state 1`] = `
     },
     \\"authPopup\\": {
       \\"__ref\\": \\"client:root.local.authPopup\\"
-    }
+    },
+    \\"activeTab\\": \\"COMMENTS\\"
   },
   \\"client:root.local.network\\": {
     \\"__id\\": \\"client:root.local.network\\",
diff --git a/src/core/client/stream/local/initLocalState.ts b/src/core/client/stream/local/initLocalState.ts
index 5b127755d..b2f09b110 100644
--- a/src/core/client/stream/local/initLocalState.ts
+++ b/src/core/client/stream/local/initLocalState.ts
@@ -75,5 +75,8 @@ export default async function initLocalState(
     authPopupRecord.setValue(false, "focus");
     authPopupRecord.setValue("", "href");
     localRecord.setLinkedRecord(authPopupRecord, "authPopup");
+
+    // Set active tab
+    localRecord.setValue("COMMENTS", "activeTab");
   });
 }
diff --git a/src/core/client/stream/local/local.graphql b/src/core/client/stream/local/local.graphql
index 37615ec9d..62e52d4e8 100644
--- a/src/core/client/stream/local/local.graphql
+++ b/src/core/client/stream/local/local.graphql
@@ -9,6 +9,10 @@ enum View {
   FORGOT_PASSWORD
 }
 
+enum Tab {
+  COMMENTS
+}
+
 type AuthPopup {
   open: Boolean!
   focus: Boolean!
@@ -26,6 +30,7 @@ type Local {
   commentID: String
   authPopup: AuthPopup!
   authToken: String
+  activeTab: Tab!
 }
 
 extend type Query {
diff --git a/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts b/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts
new file mode 100644
index 000000000..d91b8aa68
--- /dev/null
+++ b/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts
@@ -0,0 +1,21 @@
+import { Environment, RecordSource } from "relay-runtime";
+
+import { LOCAL_ID } from "talk-framework/lib/relay";
+import { createRelayEnvironment } from "talk-framework/testHelpers";
+
+import { commit } from "./SetActiveTabMutation";
+
+let environment: Environment;
+const source: RecordSource = new RecordSource();
+
+beforeAll(() => {
+  environment = createRelayEnvironment({
+    source,
+  });
+});
+
+it("Sets activeTab", () => {
+  const tab = "COMMENTS";
+  commit(environment, { tab });
+  expect(source.get(LOCAL_ID)!.activeTab).toEqual(tab);
+});
diff --git a/src/core/client/stream/mutations/SetActiveTabMutation.ts b/src/core/client/stream/mutations/SetActiveTabMutation.ts
new file mode 100644
index 000000000..8c930dd0c
--- /dev/null
+++ b/src/core/client/stream/mutations/SetActiveTabMutation.ts
@@ -0,0 +1,24 @@
+import { commitLocalUpdate, Environment } from "relay-runtime";
+
+import { createMutationContainer, LOCAL_ID } from "talk-framework/lib/relay";
+
+export interface SetActiveTabInput {
+  tab: "COMMENTS";
+}
+
+export type SetActiveTabMutation = (input: SetActiveTabInput) => Promise<void>;
+
+export async function commit(
+  environment: Environment,
+  input: SetActiveTabInput
+) {
+  return commitLocalUpdate(environment, store => {
+    const record = store.get(LOCAL_ID)!;
+    record.setValue(input.tab, "activeTab");
+  });
+}
+
+export const withSetActiveTabMutation = createMutationContainer(
+  "setActiveTab",
+  commit
+);
diff --git a/src/core/client/stream/mutations/index.ts b/src/core/client/stream/mutations/index.ts
index 6c920dfea..5b39e4e78 100644
--- a/src/core/client/stream/mutations/index.ts
+++ b/src/core/client/stream/mutations/index.ts
@@ -26,3 +26,7 @@ export {
   withSetAuthPopupStateMutation,
   SetAuthPopupStateMutation,
 } from "./SetAuthPopupStateMutation";
+export {
+  withSetActiveTabMutation,
+  SetActiveTabMutation,
+} from "./SetActiveTabMutation";
diff --git a/src/core/client/stream/components/Comment/Comment.css b/src/core/client/stream/tabs/comments/components/Comment/Comment.css
similarity index 100%
rename from src/core/client/stream/components/Comment/Comment.css
rename to src/core/client/stream/tabs/comments/components/Comment/Comment.css
diff --git a/src/core/client/stream/components/Comment/Comment.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/Comment.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/Comment.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/Comment.spec.tsx
diff --git a/src/core/client/stream/components/Comment/Comment.tsx b/src/core/client/stream/tabs/comments/components/Comment/Comment.tsx
similarity index 92%
rename from src/core/client/stream/components/Comment/Comment.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/Comment.tsx
index dcf77308e..aee9d5740 100644
--- a/src/core/client/stream/components/Comment/Comment.tsx
+++ b/src/core/client/stream/tabs/comments/components/Comment/Comment.tsx
@@ -1,11 +1,11 @@
 import React, { StatelessComponent } from "react";
 
+import HTMLContent from "talk-stream/components/HTMLContent";
+import Timestamp from "talk-stream/components/Timestamp";
 import { Flex } from "talk-ui/components";
 
 import * as styles from "./Comment.css";
 import EditedMarker from "./EditedMarker";
-import HTMLContent from "./HTMLContent";
-import Timestamp from "./Timestamp";
 import TopBarLeft from "./TopBarLeft";
 import Username from "./Username";
 
diff --git a/src/core/client/stream/components/Comment/EditedMarker.css b/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.css
similarity index 100%
rename from src/core/client/stream/components/Comment/EditedMarker.css
rename to src/core/client/stream/tabs/comments/components/Comment/EditedMarker.css
diff --git a/src/core/client/stream/components/Comment/EditedMarker.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/EditedMarker.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/EditedMarker.spec.tsx
diff --git a/src/core/client/stream/components/Comment/EditedMarker.tsx b/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/EditedMarker.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/EditedMarker.tsx
diff --git a/src/core/client/stream/components/Comment/IndentedComment.css b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.css
similarity index 100%
rename from src/core/client/stream/components/Comment/IndentedComment.css
rename to src/core/client/stream/tabs/comments/components/Comment/IndentedComment.css
diff --git a/src/core/client/stream/components/Comment/IndentedComment.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/IndentedComment.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/IndentedComment.spec.tsx
diff --git a/src/core/client/stream/components/Comment/IndentedComment.tsx b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/IndentedComment.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/IndentedComment.tsx
diff --git a/src/core/client/stream/components/Comment/ReplyButton.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/ReplyButton.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/ReplyButton.spec.tsx
diff --git a/src/core/client/stream/components/Comment/ReplyButton.tsx b/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/ReplyButton.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/ReplyButton.tsx
diff --git a/src/core/client/stream/components/Comment/TopBarLeft.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/TopBarLeft.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.spec.tsx
diff --git a/src/core/client/stream/components/Comment/TopBarLeft.tsx b/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/TopBarLeft.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.tsx
diff --git a/src/core/client/stream/components/Comment/Username.css b/src/core/client/stream/tabs/comments/components/Comment/Username.css
similarity index 100%
rename from src/core/client/stream/components/Comment/Username.css
rename to src/core/client/stream/tabs/comments/components/Comment/Username.css
diff --git a/src/core/client/stream/components/Comment/Username.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/Username.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/Username.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/Username.spec.tsx
diff --git a/src/core/client/stream/components/Comment/Username.tsx b/src/core/client/stream/tabs/comments/components/Comment/Username.tsx
similarity index 100%
rename from src/core/client/stream/components/Comment/Username.tsx
rename to src/core/client/stream/tabs/comments/components/Comment/Username.tsx
diff --git a/src/core/client/stream/components/Comment/__snapshots__/Comment.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/Comment/__snapshots__/Comment.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/Comment.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/Comment/__snapshots__/Comment.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/__snapshots__/EditedMarker.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/Comment/__snapshots__/EditedMarker.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/EditedMarker.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/Comment/__snapshots__/EditedMarker.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/__snapshots__/IndentedComment.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/Comment/__snapshots__/IndentedComment.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/IndentedComment.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/Comment/__snapshots__/IndentedComment.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/__snapshots__/ReplyButton.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/Comment/__snapshots__/ReplyButton.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/ReplyButton.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/Comment/__snapshots__/ReplyButton.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/__snapshots__/TopBarLeft.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/Comment/__snapshots__/TopBarLeft.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/TopBarLeft.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/Comment/__snapshots__/TopBarLeft.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/__snapshots__/Username.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/Comment/__snapshots__/Username.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/Comment/__snapshots__/Username.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/Comment/__snapshots__/Username.spec.tsx.snap
diff --git a/src/core/client/stream/components/Comment/index.ts b/src/core/client/stream/tabs/comments/components/Comment/index.ts
similarity index 77%
rename from src/core/client/stream/components/Comment/index.ts
rename to src/core/client/stream/tabs/comments/components/Comment/index.ts
index 56c2da651..e89d4b958 100644
--- a/src/core/client/stream/components/Comment/index.ts
+++ b/src/core/client/stream/tabs/comments/components/Comment/index.ts
@@ -1,4 +1,3 @@
 export { default, default as IndentedComment } from "./IndentedComment";
 export { default as TopBarLeft } from "./TopBarLeft";
 export { default as Username } from "./Username";
-export { default as Timestamp } from "./Timestamp";
diff --git a/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx b/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx
new file mode 100644
index 000000000..cd04ecd31
--- /dev/null
+++ b/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx
@@ -0,0 +1,22 @@
+import { shallow } from "enzyme";
+import React from "react";
+
+import { PropTypesOf } from "talk-framework/types";
+
+import CommentsPane from "./CommentsPane";
+
+it("renders stream", () => {
+  const props: PropTypesOf<typeof CommentsPane> = {
+    showPermalinkView: false,
+  };
+  const wrapper = shallow(<CommentsPane {...props} />);
+  expect(wrapper).toMatchSnapshot();
+});
+
+it("renders permalink view", () => {
+  const props: PropTypesOf<typeof CommentsPane> = {
+    showPermalinkView: true,
+  };
+  const wrapper = shallow(<CommentsPane {...props} />);
+  expect(wrapper).toMatchSnapshot();
+});
diff --git a/src/core/client/stream/tabs/comments/components/CommentsPane.tsx b/src/core/client/stream/tabs/comments/components/CommentsPane.tsx
new file mode 100644
index 000000000..3bb4bc167
--- /dev/null
+++ b/src/core/client/stream/tabs/comments/components/CommentsPane.tsx
@@ -0,0 +1,15 @@
+import * as React from "react";
+import { StatelessComponent } from "react";
+
+import PermalinkViewQuery from "../queries/PermalinkViewQuery";
+import StreamQuery from "../queries/StreamQuery";
+
+export interface CommentsPaneProps {
+  showPermalinkView: boolean;
+}
+
+const CommentsPane: StatelessComponent<CommentsPaneProps> = props => {
+  return props.showPermalinkView ? <PermalinkViewQuery /> : <StreamQuery />;
+};
+
+export default CommentsPane;
diff --git a/src/core/client/stream/components/EditCommentForm.tsx b/src/core/client/stream/tabs/comments/components/EditCommentForm.tsx
similarity index 98%
rename from src/core/client/stream/components/EditCommentForm.tsx
rename to src/core/client/stream/tabs/comments/components/EditCommentForm.tsx
index d7d79ddd8..69176c2b7 100644
--- a/src/core/client/stream/components/EditCommentForm.tsx
+++ b/src/core/client/stream/tabs/comments/components/EditCommentForm.tsx
@@ -10,6 +10,7 @@ import { Field, Form } from "react-final-form";
 
 import { OnSubmit } from "talk-framework/lib/form";
 import { required } from "talk-framework/lib/validation";
+import Timestamp from "talk-stream/components/Timestamp";
 import {
   AriaInfo,
   Button,
@@ -22,7 +23,7 @@ import {
   ValidationMessage,
 } from "talk-ui/components";
 
-import { Timestamp, TopBarLeft, Username } from "./Comment";
+import { TopBarLeft, Username } from "./Comment";
 import RTE from "./RTE";
 
 interface FormProps {
diff --git a/src/core/client/stream/components/Indent.css b/src/core/client/stream/tabs/comments/components/Indent.css
similarity index 100%
rename from src/core/client/stream/components/Indent.css
rename to src/core/client/stream/tabs/comments/components/Indent.css
diff --git a/src/core/client/stream/components/Indent.spec.tsx b/src/core/client/stream/tabs/comments/components/Indent.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Indent.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Indent.spec.tsx
diff --git a/src/core/client/stream/components/Indent.tsx b/src/core/client/stream/tabs/comments/components/Indent.tsx
similarity index 100%
rename from src/core/client/stream/components/Indent.tsx
rename to src/core/client/stream/tabs/comments/components/Indent.tsx
diff --git a/src/core/client/stream/components/PermalinkButton/PermalinkButton.css b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.css
similarity index 100%
rename from src/core/client/stream/components/PermalinkButton/PermalinkButton.css
rename to src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.css
diff --git a/src/core/client/stream/components/PermalinkButton/PermalinkButton.tsx b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.tsx
similarity index 100%
rename from src/core/client/stream/components/PermalinkButton/PermalinkButton.tsx
rename to src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.tsx
diff --git a/src/core/client/stream/components/PermalinkButton/PermalinkPopover.css b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.css
similarity index 100%
rename from src/core/client/stream/components/PermalinkButton/PermalinkPopover.css
rename to src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.css
diff --git a/src/core/client/stream/components/PermalinkButton/PermalinkPopover.tsx b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.tsx
similarity index 100%
rename from src/core/client/stream/components/PermalinkButton/PermalinkPopover.tsx
rename to src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.tsx
diff --git a/src/core/client/stream/components/PermalinkButton/index.ts b/src/core/client/stream/tabs/comments/components/PermalinkButton/index.ts
similarity index 100%
rename from src/core/client/stream/components/PermalinkButton/index.ts
rename to src/core/client/stream/tabs/comments/components/PermalinkButton/index.ts
diff --git a/src/core/client/stream/components/PermalinkView.css b/src/core/client/stream/tabs/comments/components/PermalinkView.css
similarity index 100%
rename from src/core/client/stream/components/PermalinkView.css
rename to src/core/client/stream/tabs/comments/components/PermalinkView.css
diff --git a/src/core/client/stream/components/PermalinkView.tsx b/src/core/client/stream/tabs/comments/components/PermalinkView.tsx
similarity index 100%
rename from src/core/client/stream/components/PermalinkView.tsx
rename to src/core/client/stream/tabs/comments/components/PermalinkView.tsx
diff --git a/src/core/client/stream/components/PostCommentForm.css b/src/core/client/stream/tabs/comments/components/PostCommentForm.css
similarity index 100%
rename from src/core/client/stream/components/PostCommentForm.css
rename to src/core/client/stream/tabs/comments/components/PostCommentForm.css
diff --git a/src/core/client/stream/components/PostCommentForm.tsx b/src/core/client/stream/tabs/comments/components/PostCommentForm.tsx
similarity index 100%
rename from src/core/client/stream/components/PostCommentForm.tsx
rename to src/core/client/stream/tabs/comments/components/PostCommentForm.tsx
diff --git a/src/core/client/stream/components/PostCommentFormFake.css b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.css
similarity index 100%
rename from src/core/client/stream/components/PostCommentFormFake.css
rename to src/core/client/stream/tabs/comments/components/PostCommentFormFake.css
diff --git a/src/core/client/stream/components/PostCommentFormFake.spec.tsx b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/PostCommentFormFake.spec.tsx
rename to src/core/client/stream/tabs/comments/components/PostCommentFormFake.spec.tsx
diff --git a/src/core/client/stream/components/PostCommentFormFake.tsx b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.tsx
similarity index 100%
rename from src/core/client/stream/components/PostCommentFormFake.tsx
rename to src/core/client/stream/tabs/comments/components/PostCommentFormFake.tsx
diff --git a/src/core/client/stream/components/PoweredBy.spec.tsx b/src/core/client/stream/tabs/comments/components/PoweredBy.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/PoweredBy.spec.tsx
rename to src/core/client/stream/tabs/comments/components/PoweredBy.spec.tsx
diff --git a/src/core/client/stream/components/PoweredBy.tsx b/src/core/client/stream/tabs/comments/components/PoweredBy.tsx
similarity index 100%
rename from src/core/client/stream/components/PoweredBy.tsx
rename to src/core/client/stream/tabs/comments/components/PoweredBy.tsx
diff --git a/src/core/client/stream/components/RTE.css b/src/core/client/stream/tabs/comments/components/RTE.css
similarity index 100%
rename from src/core/client/stream/components/RTE.css
rename to src/core/client/stream/tabs/comments/components/RTE.css
diff --git a/src/core/client/stream/components/RTE.spec.tsx b/src/core/client/stream/tabs/comments/components/RTE.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/RTE.spec.tsx
rename to src/core/client/stream/tabs/comments/components/RTE.spec.tsx
diff --git a/src/core/client/stream/components/RTE.tsx b/src/core/client/stream/tabs/comments/components/RTE.tsx
similarity index 100%
rename from src/core/client/stream/components/RTE.tsx
rename to src/core/client/stream/tabs/comments/components/RTE.tsx
diff --git a/src/core/client/stream/components/ReplyCommentForm.tsx b/src/core/client/stream/tabs/comments/components/ReplyCommentForm.tsx
similarity index 100%
rename from src/core/client/stream/components/ReplyCommentForm.tsx
rename to src/core/client/stream/tabs/comments/components/ReplyCommentForm.tsx
diff --git a/src/core/client/stream/components/ReplyList.spec.tsx b/src/core/client/stream/tabs/comments/components/ReplyList.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/ReplyList.spec.tsx
rename to src/core/client/stream/tabs/comments/components/ReplyList.spec.tsx
diff --git a/src/core/client/stream/components/ReplyList.tsx b/src/core/client/stream/tabs/comments/components/ReplyList.tsx
similarity index 100%
rename from src/core/client/stream/components/ReplyList.tsx
rename to src/core/client/stream/tabs/comments/components/ReplyList.tsx
diff --git a/src/core/client/stream/components/Stream.css b/src/core/client/stream/tabs/comments/components/Stream.css
similarity index 100%
rename from src/core/client/stream/components/Stream.css
rename to src/core/client/stream/tabs/comments/components/Stream.css
diff --git a/src/core/client/stream/components/Stream.spec.tsx b/src/core/client/stream/tabs/comments/components/Stream.spec.tsx
similarity index 100%
rename from src/core/client/stream/components/Stream.spec.tsx
rename to src/core/client/stream/tabs/comments/components/Stream.spec.tsx
diff --git a/src/core/client/stream/components/Stream.tsx b/src/core/client/stream/tabs/comments/components/Stream.tsx
similarity index 97%
rename from src/core/client/stream/components/Stream.tsx
rename to src/core/client/stream/tabs/comments/components/Stream.tsx
index 1bed822ea..52c08e645 100644
--- a/src/core/client/stream/components/Stream.tsx
+++ b/src/core/client/stream/tabs/comments/components/Stream.tsx
@@ -3,12 +3,12 @@ import * as React from "react";
 import { StatelessComponent } from "react";
 
 import { PropTypesOf } from "talk-framework/types";
+import UserBoxContainer from "talk-stream/containers/UserBoxContainer";
 import { Button, HorizontalGutter } from "talk-ui/components";
 
 import CommentContainer from "../containers/CommentContainer";
 import PostCommentFormContainer from "../containers/PostCommentFormContainer";
 import ReplyListContainer from "../containers/ReplyListContainer";
-import UserBoxContainer from "../containers/UserBoxContainer";
 import PostCommentFormFake from "./PostCommentFormFake";
 import * as styles from "./Stream.css";
 
diff --git a/src/core/client/stream/tabs/comments/components/__snapshots__/CommentsPane.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/CommentsPane.spec.tsx.snap
new file mode 100644
index 000000000..2207f2403
--- /dev/null
+++ b/src/core/client/stream/tabs/comments/components/__snapshots__/CommentsPane.spec.tsx.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders permalink view 1`] = `<withContext(withLocalStateContainer(PermalinkViewQuery)) />`;
+
+exports[`renders stream 1`] = `<withContext(withLocalStateContainer(StreamQuery)) />`;
diff --git a/src/core/client/stream/components/__snapshots__/Indent.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/Indent.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/__snapshots__/Indent.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/__snapshots__/Indent.spec.tsx.snap
diff --git a/src/core/client/stream/components/__snapshots__/PostCommentFormFake.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/PostCommentFormFake.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/__snapshots__/PostCommentFormFake.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/__snapshots__/PostCommentFormFake.spec.tsx.snap
diff --git a/src/core/client/stream/components/__snapshots__/PoweredBy.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/PoweredBy.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/__snapshots__/PoweredBy.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/__snapshots__/PoweredBy.spec.tsx.snap
diff --git a/src/core/client/stream/components/__snapshots__/RTE.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/RTE.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/__snapshots__/RTE.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/__snapshots__/RTE.spec.tsx.snap
diff --git a/src/core/client/stream/components/__snapshots__/ReplyList.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/ReplyList.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/__snapshots__/ReplyList.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/__snapshots__/ReplyList.spec.tsx.snap
diff --git a/src/core/client/stream/components/__snapshots__/Stream.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/Stream.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/components/__snapshots__/Stream.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/components/__snapshots__/Stream.spec.tsx.snap
diff --git a/src/core/client/stream/containers/CommentContainer.spec.tsx b/src/core/client/stream/tabs/comments/containers/CommentContainer.spec.tsx
similarity index 100%
rename from src/core/client/stream/containers/CommentContainer.spec.tsx
rename to src/core/client/stream/tabs/comments/containers/CommentContainer.spec.tsx
diff --git a/src/core/client/stream/containers/CommentContainer.tsx b/src/core/client/stream/tabs/comments/containers/CommentContainer.tsx
similarity index 100%
rename from src/core/client/stream/containers/CommentContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/CommentContainer.tsx
diff --git a/src/core/client/stream/tabs/comments/containers/CommentsPaneContainer.tsx b/src/core/client/stream/tabs/comments/containers/CommentsPaneContainer.tsx
new file mode 100644
index 000000000..c058adc02
--- /dev/null
+++ b/src/core/client/stream/tabs/comments/containers/CommentsPaneContainer.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+import { StatelessComponent } from "react";
+
+import { graphql, withLocalStateContainer } from "talk-framework/lib/relay";
+import { CommentsPaneContainerLocal as Local } from "talk-stream/__generated__/CommentsPaneContainerLocal.graphql";
+
+import CommentsPane from "../components/CommentsPane";
+
+interface InnerProps {
+  local: Local;
+}
+
+const CommentsPaneContainer: StatelessComponent<InnerProps> = ({
+  local: { commentID },
+}) => {
+  return <CommentsPane showPermalinkView={!!commentID} />;
+};
+
+const enhanced = withLocalStateContainer(
+  graphql`
+    fragment CommentsPaneContainerLocal on Local {
+      commentID
+    }
+  `
+)(CommentsPaneContainer);
+
+export default enhanced;
diff --git a/src/core/client/stream/containers/EditCommentFormContainer.tsx b/src/core/client/stream/tabs/comments/containers/EditCommentFormContainer.tsx
similarity index 97%
rename from src/core/client/stream/containers/EditCommentFormContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/EditCommentFormContainer.tsx
index 9dee698d3..68e0d0644 100644
--- a/src/core/client/stream/containers/EditCommentFormContainer.tsx
+++ b/src/core/client/stream/tabs/comments/containers/EditCommentFormContainer.tsx
@@ -9,11 +9,14 @@ import { withFragmentContainer } from "talk-framework/lib/relay";
 import { PropTypesOf } from "talk-framework/types";
 
 import { EditCommentFormContainer_comment as CommentData } from "talk-stream/__generated__/EditCommentFormContainer_comment.graphql";
+import {
+  EditCommentMutation,
+  withEditCommentMutation,
+} from "talk-stream/mutations";
 
 import EditCommentForm, {
   EditCommentFormProps,
 } from "../components/EditCommentForm";
-import { EditCommentMutation, withEditCommentMutation } from "../mutations";
 
 interface InnerProps {
   editComment: EditCommentMutation;
diff --git a/src/core/client/stream/containers/PermalinkButtonContainer.tsx b/src/core/client/stream/tabs/comments/containers/PermalinkButtonContainer.tsx
similarity index 100%
rename from src/core/client/stream/containers/PermalinkButtonContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/PermalinkButtonContainer.tsx
diff --git a/src/core/client/stream/containers/PermalinkViewContainer.tsx b/src/core/client/stream/tabs/comments/containers/PermalinkViewContainer.tsx
similarity index 100%
rename from src/core/client/stream/containers/PermalinkViewContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/PermalinkViewContainer.tsx
diff --git a/src/core/client/stream/containers/PostCommentFormContainer.spec.tsx b/src/core/client/stream/tabs/comments/containers/PostCommentFormContainer.spec.tsx
similarity index 100%
rename from src/core/client/stream/containers/PostCommentFormContainer.spec.tsx
rename to src/core/client/stream/tabs/comments/containers/PostCommentFormContainer.spec.tsx
diff --git a/src/core/client/stream/containers/PostCommentFormContainer.tsx b/src/core/client/stream/tabs/comments/containers/PostCommentFormContainer.tsx
similarity index 96%
rename from src/core/client/stream/containers/PostCommentFormContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/PostCommentFormContainer.tsx
index 882a3a07c..17e5f65c5 100644
--- a/src/core/client/stream/containers/PostCommentFormContainer.tsx
+++ b/src/core/client/stream/tabs/comments/containers/PostCommentFormContainer.tsx
@@ -5,10 +5,13 @@ import { BadUserInputError } from "talk-framework/lib/errors";
 import { PromisifiedStorage } from "talk-framework/lib/storage";
 import { PropTypesOf } from "talk-framework/types";
 
+import {
+  CreateCommentMutation,
+  withCreateCommentMutation,
+} from "talk-stream/mutations";
 import PostCommentForm, {
   PostCommentFormProps,
 } from "../components/PostCommentForm";
-import { CreateCommentMutation, withCreateCommentMutation } from "../mutations";
 
 interface InnerProps {
   createComment: CreateCommentMutation;
diff --git a/src/core/client/stream/containers/ReplyCommentFormContainer.spec.tsx b/src/core/client/stream/tabs/comments/containers/ReplyCommentFormContainer.spec.tsx
similarity index 100%
rename from src/core/client/stream/containers/ReplyCommentFormContainer.spec.tsx
rename to src/core/client/stream/tabs/comments/containers/ReplyCommentFormContainer.spec.tsx
diff --git a/src/core/client/stream/containers/ReplyCommentFormContainer.tsx b/src/core/client/stream/tabs/comments/containers/ReplyCommentFormContainer.tsx
similarity index 97%
rename from src/core/client/stream/containers/ReplyCommentFormContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/ReplyCommentFormContainer.tsx
index 3c0379e30..6a724b82e 100644
--- a/src/core/client/stream/containers/ReplyCommentFormContainer.tsx
+++ b/src/core/client/stream/tabs/comments/containers/ReplyCommentFormContainer.tsx
@@ -9,11 +9,14 @@ import { PromisifiedStorage } from "talk-framework/lib/storage";
 import { PropTypesOf } from "talk-framework/types";
 import { ReplyCommentFormContainer_asset as AssetData } from "talk-stream/__generated__/ReplyCommentFormContainer_asset.graphql";
 import { ReplyCommentFormContainer_comment as CommentData } from "talk-stream/__generated__/ReplyCommentFormContainer_comment.graphql";
+import {
+  CreateCommentMutation,
+  withCreateCommentMutation,
+} from "talk-stream/mutations";
 
 import ReplyCommentForm, {
   ReplyCommentFormProps,
 } from "../components/ReplyCommentForm";
-import { CreateCommentMutation, withCreateCommentMutation } from "../mutations";
 
 interface InnerProps {
   createComment: CreateCommentMutation;
diff --git a/src/core/client/stream/containers/ReplyListContainer.spec.tsx b/src/core/client/stream/tabs/comments/containers/ReplyListContainer.spec.tsx
similarity index 100%
rename from src/core/client/stream/containers/ReplyListContainer.spec.tsx
rename to src/core/client/stream/tabs/comments/containers/ReplyListContainer.spec.tsx
diff --git a/src/core/client/stream/containers/ReplyListContainer.tsx b/src/core/client/stream/tabs/comments/containers/ReplyListContainer.tsx
similarity index 100%
rename from src/core/client/stream/containers/ReplyListContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/ReplyListContainer.tsx
diff --git a/src/core/client/stream/containers/StreamContainer.spec.tsx b/src/core/client/stream/tabs/comments/containers/StreamContainer.spec.tsx
similarity index 100%
rename from src/core/client/stream/containers/StreamContainer.spec.tsx
rename to src/core/client/stream/tabs/comments/containers/StreamContainer.spec.tsx
diff --git a/src/core/client/stream/containers/StreamContainer.tsx b/src/core/client/stream/tabs/comments/containers/StreamContainer.tsx
similarity index 100%
rename from src/core/client/stream/containers/StreamContainer.tsx
rename to src/core/client/stream/tabs/comments/containers/StreamContainer.tsx
diff --git a/src/core/client/stream/containers/__snapshots__/CommentContainer.spec.tsx.snap b/src/core/client/stream/tabs/comments/containers/__snapshots__/CommentContainer.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/containers/__snapshots__/CommentContainer.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/containers/__snapshots__/CommentContainer.spec.tsx.snap
diff --git a/src/core/client/stream/containers/__snapshots__/PostCommentFormContainer.spec.tsx.snap b/src/core/client/stream/tabs/comments/containers/__snapshots__/PostCommentFormContainer.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/containers/__snapshots__/PostCommentFormContainer.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/containers/__snapshots__/PostCommentFormContainer.spec.tsx.snap
diff --git a/src/core/client/stream/containers/__snapshots__/ReplyCommentFormContainer.spec.tsx.snap b/src/core/client/stream/tabs/comments/containers/__snapshots__/ReplyCommentFormContainer.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/containers/__snapshots__/ReplyCommentFormContainer.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/containers/__snapshots__/ReplyCommentFormContainer.spec.tsx.snap
diff --git a/src/core/client/stream/containers/__snapshots__/ReplyListContainer.spec.tsx.snap b/src/core/client/stream/tabs/comments/containers/__snapshots__/ReplyListContainer.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/containers/__snapshots__/ReplyListContainer.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/containers/__snapshots__/ReplyListContainer.spec.tsx.snap
diff --git a/src/core/client/stream/containers/__snapshots__/StreamContainer.spec.tsx.snap b/src/core/client/stream/tabs/comments/containers/__snapshots__/StreamContainer.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/containers/__snapshots__/StreamContainer.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/containers/__snapshots__/StreamContainer.spec.tsx.snap
diff --git a/src/core/client/stream/queries/PermalinkViewQuery.spec.tsx b/src/core/client/stream/tabs/comments/queries/PermalinkViewQuery.spec.tsx
similarity index 100%
rename from src/core/client/stream/queries/PermalinkViewQuery.spec.tsx
rename to src/core/client/stream/tabs/comments/queries/PermalinkViewQuery.spec.tsx
diff --git a/src/core/client/stream/queries/PermalinkViewQuery.tsx b/src/core/client/stream/tabs/comments/queries/PermalinkViewQuery.tsx
similarity index 100%
rename from src/core/client/stream/queries/PermalinkViewQuery.tsx
rename to src/core/client/stream/tabs/comments/queries/PermalinkViewQuery.tsx
diff --git a/src/core/client/stream/queries/StreamQuery.spec.tsx b/src/core/client/stream/tabs/comments/queries/StreamQuery.spec.tsx
similarity index 100%
rename from src/core/client/stream/queries/StreamQuery.spec.tsx
rename to src/core/client/stream/tabs/comments/queries/StreamQuery.spec.tsx
diff --git a/src/core/client/stream/queries/StreamQuery.tsx b/src/core/client/stream/tabs/comments/queries/StreamQuery.tsx
similarity index 100%
rename from src/core/client/stream/queries/StreamQuery.tsx
rename to src/core/client/stream/tabs/comments/queries/StreamQuery.tsx
diff --git a/src/core/client/stream/queries/__snapshots__/PermalinkViewQuery.spec.tsx.snap b/src/core/client/stream/tabs/comments/queries/__snapshots__/PermalinkViewQuery.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/queries/__snapshots__/PermalinkViewQuery.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/queries/__snapshots__/PermalinkViewQuery.spec.tsx.snap
diff --git a/src/core/client/stream/queries/__snapshots__/StreamQuery.spec.tsx.snap b/src/core/client/stream/tabs/comments/queries/__snapshots__/StreamQuery.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/queries/__snapshots__/StreamQuery.spec.tsx.snap
rename to src/core/client/stream/tabs/comments/queries/__snapshots__/StreamQuery.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/editComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/editComment.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/loadMore.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/permalinkView.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/postComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/postComment.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/postReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/postReply.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/renderReplies.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/renderStream.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
diff --git a/src/core/client/stream/test/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
similarity index 100%
rename from src/core/client/stream/test/__snapshots__/showAllReplies.spec.tsx.snap
rename to src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
diff --git a/src/core/client/stream/test/comments/create.ts b/src/core/client/stream/test/comments/create.ts
new file mode 100644
index 000000000..090a3e3f1
--- /dev/null
+++ b/src/core/client/stream/test/comments/create.ts
@@ -0,0 +1,13 @@
+import createTopLevel, { CreateParams } from "../create";
+
+export default function create(params: CreateParams) {
+  return createTopLevel({
+    ...params,
+    initLocalState: (localRecord, source, environment) => {
+      if (params.initLocalState) {
+        localRecord.setValue("COMMENTS", "activeTab");
+        params.initLocalState(localRecord, source, environment);
+      }
+    },
+  });
+}
diff --git a/src/core/client/stream/test/editComment.spec.tsx b/src/core/client/stream/test/comments/editComment.spec.tsx
similarity index 98%
rename from src/core/client/stream/test/editComment.spec.tsx
rename to src/core/client/stream/test/comments/editComment.spec.tsx
index a562c3b38..733f30eb2 100644
--- a/src/core/client/stream/test/editComment.spec.tsx
+++ b/src/core/client/stream/test/comments/editComment.spec.tsx
@@ -3,8 +3,8 @@ import timekeeper from "timekeeper";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, users } from "../fixtures";
 import create from "./create";
-import { assets, users } from "./fixtures";
 
 function createTestRenderer() {
   const resolvers = {
diff --git a/src/core/client/stream/test/loadMore.spec.tsx b/src/core/client/stream/test/comments/loadMore.spec.tsx
similarity index 97%
rename from src/core/client/stream/test/loadMore.spec.tsx
rename to src/core/client/stream/test/comments/loadMore.spec.tsx
index ea72b5510..404d3c702 100644
--- a/src/core/client/stream/test/loadMore.spec.tsx
+++ b/src/core/client/stream/test/comments/loadMore.spec.tsx
@@ -3,8 +3,8 @@ import { ReactTestRenderer } from "react-test-renderer";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, comments } from "../fixtures";
 import create from "./create";
-import { assets, comments } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/permalinkView.spec.tsx b/src/core/client/stream/test/comments/permalinkView.spec.tsx
similarity index 97%
rename from src/core/client/stream/test/permalinkView.spec.tsx
rename to src/core/client/stream/test/comments/permalinkView.spec.tsx
index 438ca2cea..0bbe3e260 100644
--- a/src/core/client/stream/test/permalinkView.spec.tsx
+++ b/src/core/client/stream/test/comments/permalinkView.spec.tsx
@@ -4,8 +4,8 @@ import sinon from "sinon";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, comments } from "../fixtures";
 import create from "./create";
-import { assets, comments } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/permalinkViewAssetNotFound.spec.tsx b/src/core/client/stream/test/comments/permalinkViewAssetNotFound.spec.tsx
similarity index 100%
rename from src/core/client/stream/test/permalinkViewAssetNotFound.spec.tsx
rename to src/core/client/stream/test/comments/permalinkViewAssetNotFound.spec.tsx
diff --git a/src/core/client/stream/test/permalinkViewCommentNotFound.spec.tsx b/src/core/client/stream/test/comments/permalinkViewCommentNotFound.spec.tsx
similarity index 97%
rename from src/core/client/stream/test/permalinkViewCommentNotFound.spec.tsx
rename to src/core/client/stream/test/comments/permalinkViewCommentNotFound.spec.tsx
index 6a7279669..9c4517351 100644
--- a/src/core/client/stream/test/permalinkViewCommentNotFound.spec.tsx
+++ b/src/core/client/stream/test/comments/permalinkViewCommentNotFound.spec.tsx
@@ -4,8 +4,8 @@ import sinon from "sinon";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, comments } from "../fixtures";
 import create from "./create";
-import { assets, comments } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/postComment.spec.tsx b/src/core/client/stream/test/comments/postComment.spec.tsx
similarity index 98%
rename from src/core/client/stream/test/postComment.spec.tsx
rename to src/core/client/stream/test/comments/postComment.spec.tsx
index 8703cc757..01f296ffc 100644
--- a/src/core/client/stream/test/postComment.spec.tsx
+++ b/src/core/client/stream/test/comments/postComment.spec.tsx
@@ -4,8 +4,8 @@ import timekeeper from "timekeeper";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, users } from "../fixtures";
 import create from "./create";
-import { assets, users } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/postReply.spec.tsx b/src/core/client/stream/test/comments/postReply.spec.tsx
similarity index 98%
rename from src/core/client/stream/test/postReply.spec.tsx
rename to src/core/client/stream/test/comments/postReply.spec.tsx
index b0f8239a0..6f75b57a8 100644
--- a/src/core/client/stream/test/postReply.spec.tsx
+++ b/src/core/client/stream/test/comments/postReply.spec.tsx
@@ -4,8 +4,8 @@ import timekeeper from "timekeeper";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, users } from "../fixtures";
 import create from "./create";
-import { assets, users } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/renderReplies.spec.tsx b/src/core/client/stream/test/comments/renderReplies.spec.tsx
similarity index 94%
rename from src/core/client/stream/test/renderReplies.spec.tsx
rename to src/core/client/stream/test/comments/renderReplies.spec.tsx
index b508d78d8..3c361740d 100644
--- a/src/core/client/stream/test/renderReplies.spec.tsx
+++ b/src/core/client/stream/test/comments/renderReplies.spec.tsx
@@ -3,8 +3,8 @@ import { ReactTestRenderer } from "react-test-renderer";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assetWithReplies } from "../fixtures";
 import create from "./create";
-import { assetWithReplies } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/renderStream.spec.tsx b/src/core/client/stream/test/comments/renderStream.spec.tsx
similarity index 95%
rename from src/core/client/stream/test/renderStream.spec.tsx
rename to src/core/client/stream/test/comments/renderStream.spec.tsx
index 131bb678c..2778acb02 100644
--- a/src/core/client/stream/test/renderStream.spec.tsx
+++ b/src/core/client/stream/test/comments/renderStream.spec.tsx
@@ -3,8 +3,8 @@ import { ReactTestRenderer } from "react-test-renderer";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets } from "../fixtures";
 import create from "./create";
-import { assets } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/showAllReplies.spec.tsx b/src/core/client/stream/test/comments/showAllReplies.spec.tsx
similarity index 98%
rename from src/core/client/stream/test/showAllReplies.spec.tsx
rename to src/core/client/stream/test/comments/showAllReplies.spec.tsx
index 52d302e55..547ac7b33 100644
--- a/src/core/client/stream/test/showAllReplies.spec.tsx
+++ b/src/core/client/stream/test/comments/showAllReplies.spec.tsx
@@ -4,8 +4,8 @@ import sinon from "sinon";
 import { timeout } from "talk-common/utils";
 import { createSinonStub } from "talk-framework/testHelpers";
 
+import { assets, comments } from "../fixtures";
 import create from "./create";
-import { assets, comments } from "./fixtures";
 
 let testRenderer: ReactTestRenderer;
 beforeEach(() => {
diff --git a/src/core/client/stream/test/create.tsx b/src/core/client/stream/test/create.tsx
index 2eecbc5a1..f105162c4 100644
--- a/src/core/client/stream/test/create.tsx
+++ b/src/core/client/stream/test/create.tsx
@@ -16,7 +16,7 @@ import createEnvironment from "./createEnvironment";
 import createFluentBundle from "./createFluentBundle";
 import createNodeMock from "./createNodeMock";
 
-interface CreateParams {
+export interface CreateParams {
   logNetwork?: boolean;
   resolvers: IResolvers<any, any>;
   initLocalState?: (
diff --git a/src/core/client/ui/components/index.ts b/src/core/client/ui/components/index.ts
index 7f88b7fab..ac049f299 100644
--- a/src/core/client/ui/components/index.ts
+++ b/src/core/client/ui/components/index.ts
@@ -20,6 +20,5 @@ export { default as Spinner } from "./Spinner";
 export { default as HorizontalGutter } from "./HorizontalGutter";
 export { default as Icon } from "./Icon";
 export { default as AriaInfo } from "./AriaInfo";
-export { default as Message } from "./Message";
 export { Tab, TabBar, TabContent, TabPane } from "./Tabs";
 export { default as Message, MessageIcon } from "./Message";
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl
index d939806a7..1a2b81f5f 100644
--- a/src/locales/en-US/stream.ftl
+++ b/src/locales/en-US/stream.ftl
@@ -1,5 +1,17 @@
 ### Localization for Embed Stream
 
+## General
+
+general-userBoxUnauthenticated-joinTheConversation = Join the conversation
+general-userBoxUnauthenticated-signIn = Sign in
+general-userBoxUnauthenticated-register = Register
+
+general-userBoxAuthenticated-signedInAs =
+  Signed in as <username></username>.
+
+general-userBoxAuthenticated-notYou =
+  Not you? <button>Sign Out</button>
+
 ## Comments Tab
 
 comments-streamQuery-assetNotFound = Asset not found
@@ -14,16 +26,6 @@ comments-permalinkPopover-copied = Copied
 comments-permalinkView-showAllComments = Show all comments
 comments-permalinkView-commentNotFound = Comment not found
 
-comments-userBoxUnauthenticated-joinTheConversation = Join the conversation
-comments-userBoxUnauthenticated-signIn = Sign in
-comments-userBoxUnauthenticated-register = Register
-
-comments-userBoxAuthenticated-signedInAs =
-  Signed in as <username></username>.
-
-comments-userBoxAuthenticated-notYou =
-  Not you? <button>Sign Out</button>
-
 comments-rte-bold =
   .title = Bold