diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index b2fe6b6a0..575805047 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -6,7 +6,7 @@ import {
 } from '../../actions/timelines';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnSettingsContainer from './containers/column_settings_container';
-import Timeline from '../../components/timeline';
+import Timeline from '../timeline';
 
 const messages = defineMessages({
   title: { id: 'column.community', defaultMessage: 'Local timeline' },
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index b3170c7a3..11a026bed 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -5,7 +5,7 @@ import {
   expandHashtagTimeline,
 } from '../../actions/timelines';
 import { FormattedMessage } from 'react-intl';
-import Timeline from '../../components/timeline';
+import Timeline from '../timeline';
 
 export default class HashtagTimeline extends React.PureComponent {
 
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index 54b86fa32..bc8c70199 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -4,7 +4,7 @@ import { expandHomeTimeline } from '../../actions/timelines';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnSettingsContainer from './containers/column_settings_container';
-import Timeline from '../../components/timeline';
+import Timeline from '../timeline';
 import Link from 'react-router-dom/Link';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index 86b544b06..3374edf22 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -6,7 +6,7 @@ import {
 } from '../../actions/timelines';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnSettingsContainer from './containers/column_settings_container';
-import Timeline from '../../components/timeline';
+import Timeline from '../timeline';
 
 const messages = defineMessages({
   title: { id: 'column.public', defaultMessage: 'Federated timeline' },
diff --git a/app/javascript/mastodon/components/timeline.js b/app/javascript/mastodon/features/timeline/index.js
similarity index 92%
rename from app/javascript/mastodon/components/timeline.js
rename to app/javascript/mastodon/features/timeline/index.js
index 192f246f5..0fb0424a6 100644
--- a/app/javascript/mastodon/components/timeline.js
+++ b/app/javascript/mastodon/features/timeline/index.js
@@ -1,17 +1,17 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import StatusListContainer from '../features/ui/containers/status_list_container';
-import Column from './column';
-import ColumnHeader from './column_header';
+import StatusListContainer from '../ui/containers/status_list_container';
+import Column from '../../components/column';
+import ColumnHeader from '../../components/column_header';
 import {
   updateTimeline,
   deleteFromTimelines,
   connectTimeline,
   disconnectTimeline,
-} from '../actions/timelines';
-import { addColumn, removeColumn, moveColumn } from '../actions/columns';
-import createStream from '../stream';
+} from '../../actions/timelines';
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import createStream from '../../stream';
 
 const mapStateToProps = (state, ownprops) => ({
   streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']),