diff --git a/client/coral-embed-stream/src/components/ChangeUsername.css b/client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.css
similarity index 100%
rename from client/coral-embed-stream/src/components/ChangeUsername.css
rename to client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.css
diff --git a/client/coral-embed-stream/src/components/ChangeUsername.js b/client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.js
similarity index 100%
rename from client/coral-embed-stream/src/components/ChangeUsername.js
rename to client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.js
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 16eb7433c..36a4666aa 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {StreamError} from './StreamError';
 import Comment from '../containers/Comment';
 import BannedAccount from '../../../components/BannedAccount';
-import ChangeUsername from '../../../containers/ChangeUsername';
+import ChangeUsername from '../containers/ChangeUsername';
 import Slot from 'coral-framework/components/Slot';
 import InfoBox from 'talk-plugin-infobox/InfoBox';
 import {can} from 'coral-framework/services/perms';
diff --git a/client/coral-embed-stream/src/containers/ChangeUsername.js b/client/coral-embed-stream/src/tabs/stream/containers/ChangeUsername.js
similarity index 100%
rename from client/coral-embed-stream/src/containers/ChangeUsername.js
rename to client/coral-embed-stream/src/tabs/stream/containers/ChangeUsername.js